Add test for querying

kylecarbs · kylecarbs · commit 2311bd7cef34 · 2023-06-20T16:25:37.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -153,7 +153,7 @@ jobs:
 
       - name: Install sqlc
         run: |
-          curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.17.2/sqlc_1.17.2_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
+          curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.18.0/sqlc_1.18.0_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
 
       - name: go install tools
         run: |
diff --git a/cli/testdata/coder_list_--output_json.golden b/cli/testdata/coder_list_--output_json.golden
@@ -36,7 +36,7 @@
         "tags": {
           "scope": "organization"
         },
-        "queue_position": 1,
+        "queue_position": 0,
         "queue_size": 0
       },
       "reason": "initiator",
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -2060,10 +2060,13 @@ func (q *fakeQuerier) GetProvisionerJobsByIDsWithQueuePosition(_ context.Context
 	for _, job := range q.provisionerJobs {
 		for _, id := range ids {
 			if id == job.ID {
-				jobs = append(jobs, database.GetProvisionerJobsByIDsWithQueuePositionRow{
+				job := database.GetProvisionerJobsByIDsWithQueuePositionRow{
 					ProvisionerJob: job,
-					QueuePosition:  queuePosition,
-				})
+				}
+				if !job.ProvisionerJob.StartedAt.Valid {
+					job.QueuePosition = queuePosition
+				}
+				jobs = append(jobs, job)
 				break
 			}
 		}
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -5,6 +5,8 @@ package database_test
 import (
 	"context"
 	"database/sql"
+	"encoding/json"
+	"sort"
 	"testing"
 	"time"
 
@@ -314,3 +316,76 @@ func TestDefaultProxy(t *testing.T) {
 	require.NoError(t, err, "get deployment id")
 	require.Equal(t, depID, found)
 }
+
+func TestQueuePosition(t *testing.T) {
+	t.Parallel()
+
+	if testing.Short() {
+		t.SkipNow()
+	}
+	sqlDB := testSQLDB(t)
+	err := migrations.Up(sqlDB)
+	require.NoError(t, err)
+	db := database.New(sqlDB)
+	ctx := testutil.Context(t, testutil.WaitLong)
+
+	org := dbgen.Organization(t, db, database.Organization{})
+	jobCount := 10
+	jobs := []database.ProvisionerJob{}
+	jobIDs := []uuid.UUID{}
+	for i := 0; i < jobCount; i++ {
+		job := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{
+			OrganizationID: org.ID,
+			Tags:           database.StringMap{},
+		})
+		jobs = append(jobs, job)
+		jobIDs = append(jobIDs, job.ID)
+
+		// We need a slight amount of time between each insertion to ensure that
+		// the queue position is correct... it's sorted by `created_at`.
+		time.Sleep(time.Millisecond)
+	}
+
+	queued, err := db.GetProvisionerJobsByIDsWithQueuePosition(ctx, jobIDs)
+	require.NoError(t, err)
+	require.Len(t, queued, jobCount)
+	sort.Slice(queued, func(i, j int) bool {
+		return queued[i].QueuePosition < queued[j].QueuePosition
+	})
+	// Ensure that the queue positions are correct based on insertion ID!
+	for index, job := range queued {
+		require.Equal(t, job.QueuePosition, int64(index+1))
+		require.Equal(t, job.ProvisionerJob.ID, jobs[index].ID)
+	}
+
+	job, err := db.AcquireProvisionerJob(ctx, database.AcquireProvisionerJobParams{
+		StartedAt: sql.NullTime{
+			Time:  database.Now(),
+			Valid: true,
+		},
+		Types: database.AllProvisionerTypeValues(),
+		WorkerID: uuid.NullUUID{
+			UUID:  uuid.New(),
+			Valid: true,
+		},
+		Tags: json.RawMessage("{}"),
+	})
+	require.NoError(t, err)
+	require.Equal(t, jobs[0].ID, job.ID)
+
+	queued, err = db.GetProvisionerJobsByIDsWithQueuePosition(ctx, jobIDs)
+	require.NoError(t, err)
+	require.Len(t, queued, jobCount)
+	sort.Slice(queued, func(i, j int) bool {
+		return queued[i].QueuePosition < queued[j].QueuePosition
+	})
+	// Ensure that queue positions are updated now that the first job has been acquired!
+	for index, job := range queued {
+		if index == 0 {
+			require.Equal(t, job.QueuePosition, int64(0))
+			continue
+		}
+		require.Equal(t, job.QueuePosition, int64(index))
+		require.Equal(t, job.ProvisionerJob.ID, jobs[index].ID)
+	}
+}
diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
@@ -53,7 +53,7 @@ RUN mkdir --parents "$GOPATH" && \
 	# charts and values files
 	go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.5.0 && \
 	# sqlc for Go code generation
-	go install github.com/kyleconroy/sqlc/cmd/sqlc@v1.17.2 && \
+	go install github.com/kyleconroy/sqlc/cmd/sqlc@v1.18.0 && \
 	# gcr-cleaner-cli used by CI to prune unused images
 	go install github.com/sethvargo/gcr-cleaner/cmd/gcr-cleaner-cli@v0.5.1 && \
 	# ruleguard for checking custom rules, without needing to run all of
