order by name

mafredri · mafredri · commit 8ef85c8aea17 · 2025-12-12T09:56:48.000Z
diff --git a/cli/templatepush_test.go b/cli/templatepush_test.go
@@ -546,10 +546,8 @@ func TestTemplatePush(t *testing.T) {
 					require.NoError(t, tt.setupDaemon(setupCtx, store, owner, wantTags, now))
 
 					ctx := testutil.Context(t, testutil.WaitMedium)
-					cancelCtx, cancel := context.WithCancel(ctx)
-					defer cancel()
-					inv = inv.WithContext(cancelCtx)
-					w := clitest.StartWithWaiter(t, inv)
+					inv = inv.WithContext(ctx)
+					clitest.Start(t, inv) // Only used for output, disregard exit status.
 
 					require.Eventually(t, func() bool {
 						jobs, err := store.GetProvisionerJobsCreatedAfter(ctx, time.Time{})
@@ -565,9 +563,6 @@ func TestTemplatePush(t *testing.T) {
 					if tt.expectOutput != "" {
 						pty.ExpectMatchContext(ctx, tt.expectOutput)
 					}
-
-					cancel()
-					_ = w.Wait()
 				})
 			}
 		})
@@ -1106,21 +1101,22 @@ func TestTemplatePush(t *testing.T) {
 			pty.ExpectMatchContext(ctx, "Upload")
 			pty.WriteLine("yes")
 
-			pty.ExpectMatchContext(ctx, "var.string_var")
-			pty.ExpectMatchContext(ctx, "Enter value:")
-			pty.WriteLine("test-string")
+			// Variables are prompted in alphabetical order.
+			// Boolean variable automatically selects the first option ("true")
+			pty.ExpectMatchContext(ctx, "var.bool_var")
 
 			pty.ExpectMatchContext(ctx, "var.number_var")
 			pty.ExpectMatchContext(ctx, "Enter value:")
 			pty.WriteLine("42")
 
-			// Boolean variable automatically selects the first option ("true")
-			pty.ExpectMatchContext(ctx, "var.bool_var")
-
 			pty.ExpectMatchContext(ctx, "var.sensitive_var")
 			pty.ExpectMatchContext(ctx, "Enter value:")
 			pty.WriteLine("secret-value")
 
+			pty.ExpectMatchContext(ctx, "var.string_var")
+			pty.ExpectMatchContext(ctx, "Enter value:")
+			pty.WriteLine("test-string")
+
 			w.RequireSuccess()
 		})
 
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templateversionvariables.sql b/coderd/database/queries/templateversionvariables.sql
@@ -23,4 +23,4 @@ VALUES
     ) RETURNING *;
 
 -- name: GetTemplateVersionVariables :many
-SELECT * FROM template_version_variables WHERE template_version_id = $1;
+SELECT * FROM template_version_variables WHERE template_version_id = $1 ORDER BY name;
