Jan 3, 2025 · Dec 4, 2024 · Dec 4, 2024 · Dec 4, 2024 · Dec 17, 2024 · Dec 17, 2024
diff --git a/agent/proto/agent.pb.go b/agent/proto/agent.pb.go
diff --git a/agent/proto/agent.proto b/agent/proto/agent.proto
 }
 Health health = 12;
 bool hidden = 13;
 string open_in = 14;
 }

 message WorkspaceAgentScript {
diff --git a/coderd/agentapi/apps_test.go b/coderd/agentapi/apps_test.go
 DisplayName:    "code-server 1",
 HealthcheckUrl: "http://localhost:3000",
 Health:         database.WorkspaceAppHealthInitializing,
 OpenIn:         database.WorkspaceAppOpenInSlimWindow,
 }
 app2 = database.WorkspaceApp{
 ID:             uuid.New(),
 DisplayName:    "code-server 2",
 HealthcheckUrl: "http://localhost:3001",
 Health:         database.WorkspaceAppHealthHealthy,
 OpenIn:         database.WorkspaceAppOpenInSlimWindow,
 }
 )

 AgentID:     agent.ID,
 Slug:        "code-server-3",
 DisplayName: "code-server 3",
 OpenIn:      database.WorkspaceAppOpenInSlimWindow,
 }

 dbM := dbmock.NewMockStore(gomock.NewController(t))
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 check.Args(time.Now()).Asserts(rbac.ResourceSystem, policy.ActionRead)
 }))
 s.Run("GetWorkspaceAppsCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
 _ = dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{CreatedAt: time.Now().Add(-time.Hour)})
 _ = dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{CreatedAt: time.Now().Add(-time.Hour), OpenIn: database.WorkspaceAppOpenInSlimWindow})
 check.Args(time.Now()).Asserts(rbac.ResourceSystem, policy.ActionRead)
 }))
 s.Run("GetWorkspaceResourcesCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
 aBuild := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: aWs.ID, JobID: uuid.New()})
 aRes := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: aBuild.JobID})
 aAgt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: aRes.ID})
 a := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: aAgt.ID})
 a := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: aAgt.ID, OpenIn: database.WorkspaceAppOpenInSlimWindow})

 bWs := dbgen.Workspace(s.T(), db, database.WorkspaceTable{})
 bBuild := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: bWs.ID, JobID: uuid.New()})
 bRes := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: bBuild.JobID})
 bAgt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: bRes.ID})
 b := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: bAgt.ID})
 b := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: bAgt.ID, OpenIn: database.WorkspaceAppOpenInSlimWindow})

 check.Args([]uuid.UUID{a.AgentID, b.AgentID}).
 Asserts(rbac.ResourceSystem, policy.ActionRead).
 ID:           uuid.New(),
 Health:       database.WorkspaceAppHealthDisabled,
 SharingLevel: database.AppSharingLevelOwner,
 OpenIn:       database.WorkspaceAppOpenInSlimWindow,
 }).Asserts(rbac.ResourceSystem, policy.ActionCreate)
 }))
 s.Run("InsertWorkspaceResourceMetadata", s.Subtest(func(db database.Store, check *expects) {
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
 Health:               takeFirst(orig.Health, database.WorkspaceAppHealthHealthy),
 DisplayOrder:         takeFirst(orig.DisplayOrder, 1),
 Hidden:               orig.Hidden,
 OpenIn:               takeFirst(orig.OpenIn, database.WorkspaceAppOpenInSlimWindow),
 })
 require.NoError(t, err, "insert app")
 return resource
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 arg.SharingLevel = database.AppSharingLevelOwner
 }

 if arg.OpenIn == "" {
 arg.OpenIn = database.WorkspaceAppOpenInSlimWindow
 }

 // nolint:gosimple
 workspaceApp := database.WorkspaceApp{
 ID:                   arg.ID,
 Health:               arg.Health,
 Hidden:               arg.Hidden,
 DisplayOrder:         arg.DisplayOrder,
 OpenIn:               arg.OpenIn,
 }
 q.workspaceApps = append(q.workspaceApps, workspaceApp)
 return workspaceApp, nil
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000282_workspace_app_add_open_in.down.sql b/coderd/database/migrations/000282_workspace_app_add_open_in.down.sql
 ALTER TABLE workspace_apps DROP COLUMN open_in;

 DROP TYPE workspace_app_open_in;
diff --git a/coderd/database/migrations/000282_workspace_app_add_open_in.up.sql b/coderd/database/migrations/000282_workspace_app_add_open_in.up.sql
 CREATE TYPE workspace_app_open_in AS ENUM ('tab', 'window', 'slim-window');

 ALTER TABLE workspace_apps ADD COLUMN open_in workspace_app_open_in NOT NULL DEFAULT 'slim-window'::workspace_app_open_in;
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
        healthcheck_threshold,
        health,
        display_order,
        hidden
        hidden,
        open_in
    )
 VALUES
    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17) RETURNING *;
    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18) RETURNING *;

 -- name: UpdateWorkspaceAppHealthByID :exec
 UPDATE
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
 dur := time.Duration(protoAgent.GetConnectionTimeoutSeconds()) * time.Second
 agentTimeouts[dur] = true
 }

 err = InsertWorkspaceResource(ctx, db, job.ID, workspaceBuild.Transition, protoResource, telemetrySnapshot)
 if err != nil {
 return xerrors.Errorf("insert provisioner job: %w", err)
 sharingLevel = database.AppSharingLevelPublic
 }

 openIn := database.WorkspaceAppOpenInSlimWindow
 switch app.OpenIn {
 case sdkproto.AppOpenIn_TAB:
 openIn = database.WorkspaceAppOpenInTab
 case sdkproto.AppOpenIn_WINDOW:
 openIn = database.WorkspaceAppOpenInWindow
 }

 dbApp, err := db.InsertWorkspaceApp(ctx, database.InsertWorkspaceAppParams{
 ID:          uuid.New(),
 CreatedAt:   dbtime.Now(),
 Health:               health,
 DisplayOrder:         int32(app.Order),
 Hidden:               app.Hidden,
 OpenIn:               openIn,
 })
 if err != nil {
 return xerrors.Errorf("insert app: %w", err)
diff --git a/coderd/telemetry/telemetry_test.go b/coderd/telemetry/telemetry_test.go
 _ = dbgen.WorkspaceApp(t, db, database.WorkspaceApp{
 SharingLevel: database.AppSharingLevelOwner,
 Health:       database.WorkspaceAppHealthDisabled,
 OpenIn:       database.WorkspaceAppOpenInSlimWindow,
 })
 group := dbgen.Group(t, db, database.Group{})
 _ = dbgen.GroupMember(t, db, database.GroupMemberTable{UserID: user.ID, GroupID: group.ID})
diff --git a/codersdk/agentsdk/convert.go b/codersdk/agentsdk/convert.go
 },
 Health: health,
 Hidden: protoApp.Hidden,
 OpenIn: protoApp.OpenIn,
 }, nil
 }

 },
 Health: proto.WorkspaceApp_Health(health),
 Hidden: a.Hidden,
 OpenIn: a.OpenIn,
 }, nil
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,6 +42,7 @@ message WorkspaceApp {
		}
		Health health = 12;
		bool hidden = 13;
		string open_in = 14;
		}

		message WorkspaceAgentScript {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,6 +30,7 @@ func TestBatchUpdateAppHealths(t *testing.T) {
		DisplayName: "code-server 1",
		HealthcheckUrl: "http://localhost:3000",
		Health: database.WorkspaceAppHealthInitializing,
		OpenIn: database.WorkspaceAppOpenInSlimWindow,
		}
		app2 = database.WorkspaceApp{
		ID: uuid.New(),
Expand All		@@ -38,6 +39,7 @@ func TestBatchUpdateAppHealths(t *testing.T) {
		DisplayName: "code-server 2",
		HealthcheckUrl: "http://localhost:3001",
		Health: database.WorkspaceAppHealthHealthy,
		OpenIn: database.WorkspaceAppOpenInSlimWindow,
		}
		)

Expand DownExpand Up		@@ -163,6 +165,7 @@ func TestBatchUpdateAppHealths(t *testing.T) {
		AgentID: agent.ID,
		Slug: "code-server-3",
		DisplayName: "code-server 3",
		OpenIn: database.WorkspaceAppOpenInSlimWindow,
		}

		dbM := dbmock.NewMockStore(gomock.NewController(t))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2502,7 +2502,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
		check.Args(time.Now()).Asserts(rbac.ResourceSystem, policy.ActionRead)
		}))
		s.Run("GetWorkspaceAppsCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
		_ = dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{CreatedAt: time.Now().Add(-time.Hour)})
		_ = dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{CreatedAt: time.Now().Add(-time.Hour), OpenIn: database.WorkspaceAppOpenInSlimWindow})
		check.Args(time.Now()).Asserts(rbac.ResourceSystem, policy.ActionRead)
		}))
		s.Run("GetWorkspaceResourcesCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
Expand DownExpand Up		@@ -2551,13 +2551,13 @@ func (s *MethodTestSuite) TestSystemFunctions() {
		aBuild := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: aWs.ID, JobID: uuid.New()})
		aRes := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: aBuild.JobID})
		aAgt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: aRes.ID})
		a := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: aAgt.ID})
		a := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: aAgt.ID, OpenIn: database.WorkspaceAppOpenInSlimWindow})

		bWs := dbgen.Workspace(s.T(), db, database.WorkspaceTable{})
		bBuild := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{WorkspaceID: bWs.ID, JobID: uuid.New()})
		bRes := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: bBuild.JobID})
		bAgt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: bRes.ID})
		b := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: bAgt.ID})
		b := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: bAgt.ID, OpenIn: database.WorkspaceAppOpenInSlimWindow})

		check.Args([]uuid.UUID{a.AgentID, b.AgentID}).
		Asserts(rbac.ResourceSystem, policy.ActionRead).
Expand DownExpand Up		@@ -2611,6 +2611,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
		ID: uuid.New(),
		Health: database.WorkspaceAppHealthDisabled,
		SharingLevel: database.AppSharingLevelOwner,
		OpenIn: database.WorkspaceAppOpenInSlimWindow,
		}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
		}))
		s.Run("InsertWorkspaceResourceMetadata", s.Subtest(func(db database.Store, check *expects) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -659,6 +659,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),
		})
		require.NoError(t, err, "insert app")
		return resource
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8348,6 +8348,10 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
		arg.SharingLevel = database.AppSharingLevelOwner
		}

		if arg.OpenIn == "" {
		arg.OpenIn = database.WorkspaceAppOpenInSlimWindow
		}

		// nolint:gosimple
		workspaceApp := database.WorkspaceApp{
		ID: arg.ID,
Expand All		@@ -8367,6 +8371,7 @@ func (q *FakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
		Health: arg.Health,
		Hidden: arg.Hidden,
		DisplayOrder: arg.DisplayOrder,
		OpenIn: arg.OpenIn,
		}
		q.workspaceApps = append(q.workspaceApps, workspaceApp)
		return workspaceApp, nil
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ALTER TABLE workspace_apps DROP COLUMN open_in;

		DROP TYPE workspace_app_open_in;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		CREATE TYPE workspace_app_open_in AS ENUM ('tab', 'window', 'slim-window');

		ALTER TABLE workspace_apps ADD COLUMN open_in workspace_app_open_in NOT NULL DEFAULT 'slim-window'::workspace_app_open_in;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,10 +29,11 @@ INSERT INTO
		healthcheck_threshold,
		health,
		display_order,
		hidden
		hidden,
		open_in
		)
		VALUES
		($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17) RETURNING *;
		($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18) RETURNING *;

		-- name: UpdateWorkspaceAppHealthByID :exec
		UPDATE
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1509,6 +1509,7 @@ func (s server) CompleteJob(ctx context.Context, completed proto.CompletedJob)
		dur := time.Duration(protoAgent.GetConnectionTimeoutSeconds()) * time.Second
		agentTimeouts[dur] = true
		}

		err = InsertWorkspaceResource(ctx, db, job.ID, workspaceBuild.Transition, protoResource, telemetrySnapshot)
		if err != nil {
		return xerrors.Errorf("insert provisioner job: %w", err)
Expand DownExpand Up		@@ -2012,6 +2013,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_WINDOW:
		openIn = database.WorkspaceAppOpenInWindow
		}

		dbApp, err := db.InsertWorkspaceApp(ctx, database.InsertWorkspaceAppParams{
		ID: uuid.New(),
		CreatedAt: dbtime.Now(),
Expand All		@@ -2036,6 +2045,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
		Health: health,
		DisplayOrder: int32(app.Order),
		Hidden: app.Hidden,
		OpenIn: openIn,
		})
		if err != nil {
		return xerrors.Errorf("insert app: %w", err)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,6 +59,7 @@ func TestTelemetry(t *testing.T) {
		_ = dbgen.WorkspaceApp(t, db, database.WorkspaceApp{
		SharingLevel: database.AppSharingLevelOwner,
		Health: database.WorkspaceAppHealthDisabled,
		OpenIn: database.WorkspaceAppOpenInSlimWindow,
		})
		group := dbgen.Group(t, db, database.Group{})
		_ = dbgen.GroupMember(t, db, database.GroupMemberTable{UserID: user.ID, GroupID: group.ID})
Expand Down