opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove reliance of relative_path on subdomains (#4390)

Browse Source 
This broke all relative path applications.
This commit is contained in:
Kyle Carberry
2022-10-06 09:30:10 -05:00
committed by GitHub
parent d275331c13
commit 0ebcb7de55
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
provisioner/terraform/resources.go
+7 -15
View File
@@ -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"`
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"`
Healthcheck []appHealthcheckAttributes `mapstructure:"healthcheck"`
AgentID string `mapstructure:"agent_id"`
Name string `mapstructure:"name"`
Icon string `mapstructure:"icon"`
URL string `mapstructure:"url"`
Command string `mapstructure:"command"`
Subdomain bool `mapstructure:"subdomain"`
Healthcheck []appHealthcheckAttributes `mapstructure:"healthcheck"`
}
// A mapping of attributes on the "healthcheck" resource.
@@ -238,12 +235,7 @@ func ConvertResources(module *tfjson.StateModule, rawGraph string) ([]*proto.Res
}
}
// Default attrs.RelativePath to true if unspecified in Terraform.
subdomain := attrs.Subdomain
if attrs.RelativePath != nil {
subdomain = !*attrs.RelativePath
}
for _, agents := range resourceAgents {
for _, agent := range agents {
// Find agents with the matching ID and associate them!