opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-21 20:51:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(coderd): remove the window option in open_in (#16104)

Browse Source 
As we worked on adding a `open_in` parameter for workspace_apps - we
initially created three options :
- window
- slim_window
- tab

After further investigation, `window` should not be used and has to be
removed.

ℹ️ I decided to remove the option instead of deprecating it as we've not
created any release nor documented the feature. Can be discussed.
This commit is contained in:
Vincent Vielle
2025-01-15 15:26:31 +01:00
committed by GitHub
parent b4fde801f5
commit a160e8f06c
12 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/apidoc/docs.go
Generated
-2
View File
@@ -15346,12 +15346,10 @@ const docTemplate = `{
"type": "string",
"enum": [
"slim-window",
"window",
"tab"
],
"x-enum-varnames": [
"WorkspaceAppOpenInSlimWindow",
"WorkspaceAppOpenInWindow",
"WorkspaceAppOpenInTab"
]
},
coderd/apidoc/swagger.json
Generated
+1 -2
View File
@@ -13964,10 +13964,9 @@
},
"codersdk.WorkspaceAppOpenIn": {
"type": "string",
"enum": ["slim-window", "window", "tab"],
"enum": ["slim-window", "tab"],
"x-enum-varnames": [
"WorkspaceAppOpenInSlimWindow",
"WorkspaceAppOpenInWindow",
"WorkspaceAppOpenInTab"
]
},
coderd/provisionerdserver/provisionerdserver.go
+2 -2
View File
@@ -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{
codersdk/workspaceapps.go
-2
View File
@@ -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: {},
}
docs/reference/api/builds.md
Generated
-2
View File
@@ -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` |
docs/reference/api/schemas.md
Generated
-1
View File
@@ -7652,7 +7652,6 @@ If the schedule is empty, the user will be updated to use the default schedule.|
| Value |
|---------------|
| `slim-window` |
| `window` |
| `tab` |
## codersdk.WorkspaceAppSharingLevel
docs/reference/api/templates.md
Generated
-2
View File
@@ -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` |
provisioner/terraform/resources.go
-2
View File
@@ -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
}
provisionersdk/proto/provisioner.pb.go
Generated
+20 -19
View File
@@ -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 (
provisionersdk/proto/provisioner.proto
+1 -1
View File
@@ -164,7 +164,7 @@ message Script {
}
enum AppOpenIn {
WINDOW = 0;
WINDOW = 0 [deprecated = true];
SLIM_WINDOW = 1;
TAB = 2;
}
site/e2e/provisionerGenerated.ts
Generated
+1
View File
@@ -23,6 +23,7 @@ export enum AppSharingLevel {
}
export enum AppOpenIn {
/** @deprecated */
WINDOW = 0,
SLIM_WINDOW = 1,
TAB = 2,
site/src/api/typesGenerated.ts
Generated
+2 -6
View File
@@ -3018,13 +3018,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";