Appeasing the linter

dannykopping · dannykopping · commit c5c74d11aa37 · 2024-11-27T12:00:05.000Z
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -618,6 +618,7 @@ func WorkspaceApp(t testing.TB, db database.Store, orig database.WorkspaceApp) d
 		Health:               takeFirst(orig.Health, database.WorkspaceAppHealthHealthy),
 		DisplayOrder:         takeFirst(orig.DisplayOrder, 1),
 		Hidden:               orig.Hidden,
+		CORSBehavior:         takeFirst(orig.CORSBehavior, database.AppCorsBehaviorSimple),
 	})
 	require.NoError(t, err, "insert app")
 	return resource
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -8154,6 +8154,10 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 		arg.SharingLevel = database.AppSharingLevelOwner
 	}
 
+	if arg.CORSBehavior == "" {
+		arg.CORSBehavior = database.AppCorsBehaviorSimple
+	}
+
 	// nolint:gosimple
 	workspaceApp := database.WorkspaceApp{
 		ID:                   arg.ID,
diff --git a/coderd/workspaceapps/apptest/setup.go b/coderd/workspaceapps/apptest/setup.go
@@ -32,11 +32,12 @@ import (
 )
 
 const (
-	proxyTestAgentName                        = "agent-name"
-	proxyTestAppNameFake                      = "test-app-fake"
-	proxyTestAppNameOwner                     = "test-app-owner"
-	proxyTestAppNameAuthenticated             = "test-app-authenticated"
-	proxyTestAppNamePublic                    = "test-app-public"
+	proxyTestAgentName            = "agent-name"
+	proxyTestAppNameFake          = "test-app-fake"
+	proxyTestAppNameOwner         = "test-app-owner"
+	proxyTestAppNameAuthenticated = "test-app-authenticated"
+	proxyTestAppNamePublic        = "test-app-public"
+	// nolint:gosec // Not a secret
 	proxyTestAppNameAuthenticatedCORSPassthru = "test-app-authenticated-cors-passthru"
 	proxyTestAppNamePublicCORSPassthru        = "test-app-public-cors-passthru"
 	proxyTestAppNameAuthenticatedCORSDefault  = "test-app-authenticated-cors-default"
diff --git a/coderd/workspaceapps/db_test.go b/coderd/workspaceapps/db_test.go
@@ -280,11 +280,12 @@ func Test_ResolveRequest(t *testing.T) {
 						RegisteredClaims: jwtutils.RegisteredClaims{
 							Expiry: jwt.NewNumericDate(token.Expiry.Time()),
 						},
-						Request:     req,
-						UserID:      me.ID,
-						WorkspaceID: workspace.ID,
-						AgentID:     agentID,
-						AppURL:      appURL,
+						Request:      req,
+						UserID:       me.ID,
+						WorkspaceID:  workspace.ID,
+						AgentID:      agentID,
+						AppURL:       appURL,
+						CORSBehavior: token.CORSBehavior,
 					}, token)
 					require.NotZero(t, token.Expiry)
 					require.WithinDuration(t, time.Now().Add(workspaceapps.DefaultTokenExpiry), token.Expiry.Time(), time.Minute)
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -439,7 +439,7 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
 				corsBehavior = proto.AppCORSBehavior_PASSTHRU
 			default:
 				corsBehavior = proto.AppCORSBehavior_SIMPLE
-				logger.Debug(ctx, "CORS behavior not set, defaulting to 'simple'")
+				logger.Debug(ctx, "cors_behavior not set, defaulting to 'simple'", slog.F("address", convertAddressToLabel(resource.Address)))
 			}
 
 			for _, agents := range resourceAgents {
diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go
diff --git a/provisionersdk/proto/provisioner_drpc.pb.go b/provisionersdk/proto/provisioner_drpc.pb.go

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s`
`439`	`439`	`corsBehavior = proto.AppCORSBehavior_PASSTHRU`
`440`	`440`	`default:`
`441`	`441`	`corsBehavior = proto.AppCORSBehavior_SIMPLE`
`442`		`- logger.Debug(ctx, "CORS behavior not set, defaulting to 'simple'")`
	`442`	`+ logger.Debug(ctx, "cors_behavior not set, defaulting to 'simple'", slog.F("address", convertAddressToLabel(resource.Address)))`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`for _, agents := range resourceAgents {`