add open_in option to coder_app

coder · Dec 4, 2024 · 6ca152d · 6ca152d
1 parent c9dbd6f
commit 6ca152d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/provider/app.go b/provider/app.go
@@ -223,6 +223,28 @@ func appResource() *schema.Resource {
 				ForceNew:    true,
 				Optional:    true,
 			},
+			"open_in": {
+				Type: schema.TypeString,
+				Description: "Determines where the app will be opened. Valid values are `\"tab\"`, `\"window\"`, and `\"slim-window\" (default)`. " +
+					"`\"tab\"` opens in a new tab in the same browser window. `\"window\"` opens a fresh browser window with navigation options. " +
+					"`\"slim-window\"` opens a fresh browser window with slim navigation options.",
+				ForceNew: true,
+				Optional: true,
+				Default:  "slim-window",
+				ValidateDiagFunc: func(val interface{}, c cty.Path) diag.Diagnostics {
+					valStr, ok := val.(string)
+					if !ok {
+						return diag.Errorf("expected string, got %T", val)
+					}
+
+					switch valStr {
+					case "tab", "window", "slim-window":
+						return nil
+					}
+
+					return diag.Errorf(`invalid "coder_app" open_in value, must be one of "tab", "window", "slim-window": %q`, valStr)
+				},
+			},
 		},
 	}
 }
diff --git a/provider/app_test.go b/provider/app_test.go
@@ -42,6 +42,7 @@ func TestApp(t *testing.T) {
 					}
 					order = 4
 					hidden = false
+					open_in = "slim-window"
 				}
 				`,
 				Check: func(state *terraform.State) error {
@@ -64,6 +65,7 @@ func TestApp(t *testing.T) {
 						"healthcheck.0.threshold",
 						"order",
 						"hidden",
+						"open_in",
 					} {
 						value := resource.Primary.Attributes[key]
 						t.Logf("%q = %q", key, value)
@@ -98,6 +100,7 @@ func TestApp(t *testing.T) {
 				display_name = "Testing"
 				url = "https://google.com"
 				external = true
+				open_in = "slim-window"
 			}
 			`,
 			external: true,
@@ -116,6 +119,7 @@ func TestApp(t *testing.T) {
 				url = "https://google.com"
 				external = true
 				subdomain = true
+				open_in = "slim-window"
 			}
 			`,
 			expectError: regexp.MustCompile("conflicts with subdomain"),
@@ -209,6 +213,7 @@ func TestApp(t *testing.T) {
 						interval = 5
 						threshold = 6
 					}
+					open_in = "slim-window"
 				}
 				`, sharingLine)
 
@@ -248,6 +253,7 @@ func TestApp(t *testing.T) {
 			name   string
 			config string
 			hidden bool
+			openIn string
 		}{{
 			name: "Is Hidden",
 			config: `
@@ -263,9 +269,11 @@ func TestApp(t *testing.T) {
 				url = "https://google.com"
 				external = true
 				hidden = true
+				open_in = "slim-window"
 			}
 			`,
 			hidden: true,
+			openIn: "slim-window",
 		}, {
 			name: "Is Not Hidden",
 			config: `
@@ -281,9 +289,11 @@ func TestApp(t *testing.T) {
 				url = "https://google.com"
 				external = true
 				hidden = false
+				open_in = "window"
 			}
 			`,
 			hidden: false,
+			openIn: "window",
 		}}
 		for _, tc := range cases {
 			tc := tc
@@ -300,6 +310,7 @@ func TestApp(t *testing.T) {
 							resource := state.Modules[0].Resources["coder_app.test"]
 							require.NotNil(t, resource)
 							require.Equal(t, strconv.FormatBool(tc.hidden), resource.Primary.Attributes["hidden"])
+							require.Equal(t, tc.openIn, resource.Primary.Attributes["open_in"])
 							return nil
 						},
 						ExpectError: nil,