diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go index a8bfcb2af3b19..cf4d3f3d078cc 100644 --- a/coderd/apidoc/docs.go +++ b/coderd/apidoc/docs.go @@ -15223,12 +15223,10 @@ const docTemplate = `{ "type": "string", "enum": [ "slim-window", - "window", "tab" ], "x-enum-varnames": [ "WorkspaceAppOpenInSlimWindow", - "WorkspaceAppOpenInWindow", "WorkspaceAppOpenInTab" ] }, diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json index d7c32d8a33a52..aa88afaac327e 100644 --- a/coderd/apidoc/swagger.json +++ b/coderd/apidoc/swagger.json @@ -13853,10 +13853,9 @@ }, "codersdk.WorkspaceAppOpenIn": { "type": "string", - "enum": ["slim-window", "window", "tab"], + "enum": ["slim-window", "tab"], "x-enum-varnames": [ "WorkspaceAppOpenInSlimWindow", - "WorkspaceAppOpenInWindow", "WorkspaceAppOpenInTab" ] }, diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go index e3bbb621e57f6..ddc3ac56170cd 100644 --- a/coderd/provisionerdserver/provisionerdserver.go +++ b/coderd/provisionerdserver/provisionerdserver.go @@ -2017,8 +2017,8 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid. switch app.OpenIn { case sdkproto.AppOpenIn_TAB: openIn = database.WorkspaceAppOpenInTab - case sdkproto.AppOpenIn_WINDOW: - openIn = database.WorkspaceAppOpenInWindow + case sdkproto.AppOpenIn_SLIM_WINDOW: + openIn = database.WorkspaceAppOpenInSlimWindow } dbApp, err := db.InsertWorkspaceApp(ctx, database.InsertWorkspaceAppParams{ diff --git a/codersdk/workspaceapps.go b/codersdk/workspaceapps.go index 3b4528087800c..25e45ac5eb305 100644 --- a/codersdk/workspaceapps.go +++ b/codersdk/workspaceapps.go @@ -38,13 +38,11 @@ type WorkspaceAppOpenIn string const ( WorkspaceAppOpenInSlimWindow WorkspaceAppOpenIn = "slim-window" - WorkspaceAppOpenInWindow WorkspaceAppOpenIn = "window" WorkspaceAppOpenInTab WorkspaceAppOpenIn = "tab" ) var MapWorkspaceAppOpenIns = map[WorkspaceAppOpenIn]struct{}{ WorkspaceAppOpenInSlimWindow: {}, - WorkspaceAppOpenInWindow: {}, WorkspaceAppOpenInTab: {}, } diff --git a/docs/reference/api/builds.md b/docs/reference/api/builds.md index d9bea14e060c1..2f634badeba7c 100644 --- a/docs/reference/api/builds.md +++ b/docs/reference/api/builds.md @@ -809,7 +809,6 @@ Status Code **200** | `health` | `healthy` | | `health` | `unhealthy` | | `open_in` | `slim-window` | -| `open_in` | `window` | | `open_in` | `tab` | | `sharing_level` | `owner` | | `sharing_level` | `authenticated` | @@ -1447,7 +1446,6 @@ Status Code **200** | `health` | `healthy` | | `health` | `unhealthy` | | `open_in` | `slim-window` | -| `open_in` | `window` | | `open_in` | `tab` | | `sharing_level` | `owner` | | `sharing_level` | `authenticated` | diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md index b6874bc5b1bc9..745e4469dabd3 100644 --- a/docs/reference/api/schemas.md +++ b/docs/reference/api/schemas.md @@ -7531,7 +7531,6 @@ If the schedule is empty, the user will be updated to use the default schedule.| | Value | |---------------| | `slim-window` | -| `window` | | `tab` | ## codersdk.WorkspaceAppSharingLevel diff --git a/docs/reference/api/templates.md b/docs/reference/api/templates.md index 5af9726b83b35..46efbfc027205 100644 --- a/docs/reference/api/templates.md +++ b/docs/reference/api/templates.md @@ -2281,7 +2281,6 @@ Status Code **200** | `health` | `healthy` | | `health` | `unhealthy` | | `open_in` | `slim-window` | -| `open_in` | `window` | | `open_in` | `tab` | | `sharing_level` | `owner` | | `sharing_level` | `authenticated` | @@ -2716,7 +2715,6 @@ Status Code **200** | `health` | `healthy` | | `health` | `unhealthy` | | `open_in` | `slim-window` | -| `open_in` | `window` | | `open_in` | `tab` | | `sharing_level` | `owner` | | `sharing_level` | `authenticated` | diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go index bf668107c4b12..4a48023b7463e 100644 --- a/provisioner/terraform/resources.go +++ b/provisioner/terraform/resources.go @@ -437,8 +437,6 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s switch strings.ToLower(attrs.OpenIn) { case "slim-window": openIn = proto.AppOpenIn_SLIM_WINDOW - case "window": - openIn = proto.AppOpenIn_WINDOW case "tab": openIn = proto.AppOpenIn_TAB } diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go index f2c4b601dcf0b..992fb30acc13a 100644 --- a/provisionersdk/proto/provisioner.pb.go +++ b/provisionersdk/proto/provisioner.pb.go @@ -129,6 +129,7 @@ func (AppSharingLevel) EnumDescriptor() ([]byte, []int) { type AppOpenIn int32 const ( + // Deprecated: Marked as deprecated in provisionersdk/proto/provisioner.proto. AppOpenIn_WINDOW AppOpenIn = 0 AppOpenIn_SLIM_WINDOW AppOpenIn = 1 AppOpenIn_TAB AppOpenIn = 2 @@ -3442,25 +3443,25 @@ var file_provisionersdk_proto_provisioner_proto_rawDesc = []byte{ 0x61, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x09, 0x0a, 0x05, 0x4f, 0x57, 0x4e, 0x45, 0x52, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x55, 0x54, 0x48, 0x45, 0x4e, 0x54, 0x49, 0x43, 0x41, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x55, 0x42, 0x4c, - 0x49, 0x43, 0x10, 0x02, 0x2a, 0x31, 0x0a, 0x09, 0x41, 0x70, 0x70, 0x4f, 0x70, 0x65, 0x6e, 0x49, - 0x6e, 0x12, 0x0a, 0x0a, 0x06, 0x57, 0x49, 0x4e, 0x44, 0x4f, 0x57, 0x10, 0x00, 0x12, 0x0f, 0x0a, - 0x0b, 0x53, 0x4c, 0x49, 0x4d, 0x5f, 0x57, 0x49, 0x4e, 0x44, 0x4f, 0x57, 0x10, 0x01, 0x12, 0x07, - 0x0a, 0x03, 0x54, 0x41, 0x42, 0x10, 0x02, 0x2a, 0x37, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6b, 0x73, - 0x70, 0x61, 0x63, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x09, - 0x0a, 0x05, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x54, 0x4f, - 0x50, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x53, 0x54, 0x52, 0x4f, 0x59, 0x10, 0x02, - 0x2a, 0x35, 0x0a, 0x0b, 0x54, 0x69, 0x6d, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, - 0x0b, 0x0a, 0x07, 0x53, 0x54, 0x41, 0x52, 0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, - 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, - 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x32, 0x49, 0x0a, 0x0b, 0x50, 0x72, 0x6f, 0x76, 0x69, - 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x12, 0x3a, 0x0a, 0x07, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, - 0x6e, 0x12, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, - 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x28, 0x01, - 0x30, 0x01, 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x2f, - 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x73, 0x64, 0x6b, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x49, 0x43, 0x10, 0x02, 0x2a, 0x35, 0x0a, 0x09, 0x41, 0x70, 0x70, 0x4f, 0x70, 0x65, 0x6e, 0x49, + 0x6e, 0x12, 0x0e, 0x0a, 0x06, 0x57, 0x49, 0x4e, 0x44, 0x4f, 0x57, 0x10, 0x00, 0x1a, 0x02, 0x08, + 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x4c, 0x49, 0x4d, 0x5f, 0x57, 0x49, 0x4e, 0x44, 0x4f, 0x57, + 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x41, 0x42, 0x10, 0x02, 0x2a, 0x37, 0x0a, 0x13, 0x57, + 0x6f, 0x72, 0x6b, 0x73, 0x70, 0x61, 0x63, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x00, 0x12, 0x08, 0x0a, + 0x04, 0x53, 0x54, 0x4f, 0x50, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x53, 0x54, 0x52, + 0x4f, 0x59, 0x10, 0x02, 0x2a, 0x35, 0x0a, 0x0b, 0x54, 0x69, 0x6d, 0x69, 0x6e, 0x67, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x54, 0x41, 0x52, 0x54, 0x45, 0x44, 0x10, 0x00, + 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, + 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x32, 0x49, 0x0a, 0x0b, 0x50, + 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x12, 0x3a, 0x0a, 0x07, 0x53, 0x65, + 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, + 0x6e, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x70, 0x72, + 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x30, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, + 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x72, 0x73, + 0x64, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/provisionersdk/proto/provisioner.proto b/provisionersdk/proto/provisioner.proto index 8c34d2092ea81..6e0c44800adcf 100644 --- a/provisionersdk/proto/provisioner.proto +++ b/provisionersdk/proto/provisioner.proto @@ -164,7 +164,7 @@ message Script { } enum AppOpenIn { - WINDOW = 0; + WINDOW = 0 [deprecated = true]; SLIM_WINDOW = 1; TAB = 2; } diff --git a/site/e2e/provisionerGenerated.ts b/site/e2e/provisionerGenerated.ts index a3f64b78f0a6e..a56143f367c4a 100644 --- a/site/e2e/provisionerGenerated.ts +++ b/site/e2e/provisionerGenerated.ts @@ -23,6 +23,7 @@ export enum AppSharingLevel { } export enum AppOpenIn { + /** @deprecated */ WINDOW = 0, SLIM_WINDOW = 1, TAB = 2, diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 4956de8691ed7..5908a69c7e629 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -2982,13 +2982,9 @@ export const WorkspaceAppHealths: WorkspaceAppHealth[] = [ ]; // From codersdk/workspaceapps.go -export type WorkspaceAppOpenIn = "slim-window" | "tab" | "window"; +export type WorkspaceAppOpenIn = "slim-window" | "tab"; -export const WorkspaceAppOpenIns: WorkspaceAppOpenIn[] = [ - "slim-window", - "tab", - "window", -]; +export const WorkspaceAppOpenIns: WorkspaceAppOpenIn[] = ["slim-window", "tab"]; // From codersdk/workspaceapps.go export type WorkspaceAppSharingLevel = "authenticated" | "owner" | "public";