Merge branch 'main' into dean/app-sharing

coder · deansheather · Oct 14, 2022 · Oct 5, 2022 · Oct 5, 2022 · Oct 5, 2022
commit 2a5bcc808351888fa1c0ec45bf8d7e196f832896
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -25,16 +25,13 @@ type agentAttributes struct {
 
 // A mapping of attributes on the "coder_app" resource.
 type agentAppAttributes struct {
-	AgentID      string `mapstructure:"agent_id"`
-	Name         string `mapstructure:"name"`
-	Icon         string `mapstructure:"icon"`
-	URL          string `mapstructure:"url"`
-	Command      string `mapstructure:"command"`
-	SharingLevel string `mapstructure:"share_level"`
-	Subdomain    bool   `mapstructure:"subdomain"`
-	// RelativePath is deprecated in favor of Subdomain. This value is a pointer
-	// because we prefer it over Subdomain it was explicitly set.
-	RelativePath *bool                      `mapstructure:"relative_path"`
+	AgentID      string                     `mapstructure:"agent_id"`
+	Name         string                     `mapstructure:"name"`
+	Icon         string                     `mapstructure:"icon"`
+	URL          string                     `mapstructure:"url"`
+	Command      string                     `mapstructure:"command"`
+	SharingLevel string                     `mapstructure:"share_level"`
+	Subdomain    bool                       `mapstructure:"subdomain"`
 	Healthcheck  []appHealthcheckAttributes `mapstructure:"healthcheck"`
 }