Address PR comments

mtojek · mtojek · commit ff827351e613 · 2024-06-04T13:32:43.000+02:00
diff --git a/cli/templatepush.go b/cli/templatepush.go
@@ -107,6 +107,7 @@ func (r *RootCmd) templatePush() *serpent.Command {
 					return err
 				}
 				tags = templateVersion.Job.Tags
+				inv.Logger.Info(inv.Context(), "Reusing existing provisioner tags", "tags", tags)
 			}
 
 			userVariableValues, err := ParseUserVariableValues(
diff --git a/cli/templatepush_test.go b/cli/templatepush_test.go
@@ -465,10 +465,10 @@ func TestTemplatePush(t *testing.T) {
 			require.NoError(t, <-execDone)
 
 			// Verify template version tags
-			template, err := client.Template(context.TODO(), template.ID)
+			template, err := client.Template(context.Background(), template.ID)
 			require.NoError(t, err)
 
-			templateVersion, err = client.TemplateVersion(context.TODO(), template.ActiveVersionID)
+			templateVersion, err = client.TemplateVersion(context.Background(), template.ActiveVersionID)
 			require.NoError(t, err)
 			require.EqualValues(t, map[string]string{"foobar": "foobaz", "owner": "", "scope": "organization"}, templateVersion.Job.Tags)
 		})
@@ -523,10 +523,10 @@ func TestTemplatePush(t *testing.T) {
 			require.NoError(t, <-execDone)
 
 			// Verify template version tags
-			template, err := client.Template(context.TODO(), template.ID)
+			template, err := client.Template(context.Background(), template.ID)
 			require.NoError(t, err)
 
-			templateVersion, err = client.TemplateVersion(context.TODO(), template.ActiveVersionID)
+			templateVersion, err = client.TemplateVersion(context.Background(), template.ActiveVersionID)
 			require.NoError(t, err)
 			require.EqualValues(t, map[string]string{"docker": "true", "owner": "", "scope": "organization"}, templateVersion.Job.Tags)
 		})
diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go
@@ -728,7 +728,7 @@ func TestWorkspaceDeleteSuspendedUser(t *testing.T) {
 					validateCalls++
 					if userSuspended {
 						// Simulate the user being suspended from the IDP too.
-						return "", http.StatusForbidden, xerrors.New("user is suspended")
+						return "", http.StatusForbidden, fmt.Errorf("user is suspended")
 					}
 					return "OK", 0, nil
 				},

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ func (r RootCmd) templatePush() serpent.Command {`
`107`	`107`	`return err`
`108`	`108`	`}`
`109`	`109`	`tags = templateVersion.Job.Tags`
	`110`	`+ inv.Logger.Info(inv.Context(), "Reusing existing provisioner tags", "tags", tags)`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`userVariableValues, err := ParseUserVariableValues(`
Original file line number	Diff line number	Diff line change
`@@ -728,7 +728,7 @@ func TestWorkspaceDeleteSuspendedUser(t *testing.T) {`
`728`	`728`	`validateCalls++`
`729`	`729`	`if userSuspended {`
`730`	`730`	`// Simulate the user being suspended from the IDP too.`
`731`		`- return "", http.StatusForbidden, xerrors.New("user is suspended")`
	`731`	`+ return "", http.StatusForbidden, fmt.Errorf("user is suspended")`
`732`	`732`	`}`
`733`	`733`	`return "OK", 0, nil`
`734`	`734`	`},`