Merge remote-tracking branch 'origin/main' into stevenmasley/cors

coder · Emyrk · Nov 21, 2024 · Nov 26, 2024 · Nov 27, 2024 · Nov 27, 2024
commit 5e1c6eb83b17e4038a1096afad6c8767fe1aa987
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -3996,6 +3996,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
 			ID:           uuid.New(),
 			Health:       database.WorkspaceAppHealthDisabled,
 			SharingLevel: database.AppSharingLevelOwner,
+			OpenIn:       database.WorkspaceAppOpenInSlimWindow,
 			CORSBehavior: database.AppCorsBehaviorSimple,
 		}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
 	}))

diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -722,6 +722,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,
+		OpenIn:               takeFirst(orig.OpenIn, database.WorkspaceAppOpenInSlimWindow),
 		CORSBehavior:         takeFirst(orig.CORSBehavior, database.AppCorsBehaviorSimple),
 	})
 	require.NoError(t, err, "insert app")

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -9697,6 +9697,10 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 		arg.SharingLevel = database.AppSharingLevelOwner
 	}
 
+	if arg.OpenIn == "" {
+		arg.OpenIn = database.WorkspaceAppOpenInSlimWindow
+	}
+
 	if arg.CORSBehavior == "" {
 		arg.CORSBehavior = database.AppCorsBehaviorSimple
 	}
@@ -9720,6 +9724,7 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 		Health:               arg.Health,
 		Hidden:               arg.Hidden,
 		DisplayOrder:         arg.DisplayOrder,
+		OpenIn:               arg.OpenIn,
 		CORSBehavior:         arg.CORSBehavior,
 	}
 	q.workspaceApps = append(q.workspaceApps, workspaceApp)

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/...0278_workspace_app_cors_behavior.down.sql → ...0318_workspace_app_cors_behavior.down.sql b/...0278_workspace_app_cors_behavior.down.sql → ...0318_workspace_app_cors_behavior.down.sql
diff --git a/...000278_workspace_app_cors_behavior.up.sql → ...000318_workspace_app_cors_behavior.up.sql b/...000278_workspace_app_cors_behavior.up.sql → ...000318_workspace_app_cors_behavior.up.sql
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceapps.sql b/coderd/database/queries/workspaceapps.sql
@@ -24,7 +24,7 @@ INSERT INTO
         external,
         subdomain,
         sharing_level,
-        cors_behavior,
+		cors_behavior,
         healthcheck_url,
         healthcheck_interval,
         healthcheck_threshold,
@@ -34,7 +34,7 @@ INSERT INTO
         open_in
     )
 VALUES
-    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18) RETURNING *;
+    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19) RETURNING *;
 
 -- name: UpdateWorkspaceAppHealthByID :exec
 UPDATE

diff --git a/coderd/database/sqlc.yaml b/coderd/database/sqlc.yaml
@@ -146,6 +146,7 @@ sql:
           login_type_oauth2_provider_app: LoginTypeOAuth2ProviderApp
           crypto_key_feature_workspace_apps_api_key: CryptoKeyFeatureWorkspaceAppsAPIKey
           crypto_key_feature_oidc_convert: CryptoKeyFeatureOIDCConvert
+          stale_interval_ms: StaleIntervalMS
           app_cors_behavior: AppCORSBehavior
           cors_behavior: CORSBehavior
 rules:

diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -2217,6 +2217,14 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 				sharingLevel = database.AppSharingLevelPublic
 			}
 
+			openIn := database.WorkspaceAppOpenInSlimWindow
+			switch app.OpenIn {
+			case sdkproto.AppOpenIn_TAB:
+				openIn = database.WorkspaceAppOpenInTab
+			case sdkproto.AppOpenIn_SLIM_WINDOW:
+				openIn = database.WorkspaceAppOpenInSlimWindow
+			}
+
 			var corsBehavior database.AppCORSBehavior
 			switch app.CorsBehavior {
 			case sdkproto.AppCORSBehavior_PASSTHRU:
@@ -2243,7 +2251,6 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 				External:             app.External,
 				Subdomain:            app.Subdomain,
 				SharingLevel:         sharingLevel,
-				CORSBehavior:         corsBehavior,
 				HealthcheckUrl:       app.Healthcheck.Url,
 				HealthcheckInterval:  app.Healthcheck.Interval,
 				HealthcheckThreshold: app.Healthcheck.Threshold,
@@ -2252,6 +2259,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 				DisplayOrder: int32(app.Order),
 				Hidden:       app.Hidden,
 				OpenIn:       openIn,
+				CORSBehavior: corsBehavior,
 			})
 			if err != nil {
 				return xerrors.Errorf("insert app: %w", err)

diff --git a/coderd/workspaceapps/db.go b/coderd/workspaceapps/db.go
@@ -18,7 +18,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"cdr.dev/slog"
-
+	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/cryptokeys"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
@@ -144,6 +144,8 @@ func (p *DBTokenProvider) Issue(ctx context.Context, rw http.ResponseWriter, r *
 		return nil, "", false
 	}
 
+	aReq.dbReq = dbReq // Update audit request.
+
 	token.UserID = dbReq.User.ID
 	token.WorkspaceID = dbReq.Workspace.ID
 	token.AgentID = dbReq.Agent.ID