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

Revert "fix: Use Terraform address to index resource + agent association (#1577)" (#1585)

Browse Source 
This reverts commit f3fe2a08ce.
This commit is contained in:
Cian Johnston
2022-05-19 12:18:40 +01:00
committed by GitHub
parent c034e8389e
commit 8814cb0722
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
provisioner/terraform/provision.go
+4 -2
View File
@@ -357,10 +357,11 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi
if resource.Type == "coder_agent" || resource.Type == "coder_agent_instance" {
continue
}
resourceKey := strings.Join([]string{resource.Type, resource.Name}, ".")
resources = append(resources, &proto.Resource{
Name: resource.Name,
Type: resource.Type,
Agents: findAgents(resourceDependencies, agents, resource.Address),
Agents: findAgents(resourceDependencies, agents, resourceKey),
})
}
@@ -497,7 +498,8 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state
if resource.Type == "coder_agent" || resource.Type == "coder_agent_instance" {
continue
}
resourceAgents := findAgents(resourceDependencies, agents, resource.Address)
resourceKey := strings.Join([]string{resource.Type, resource.Name}, ".")
resourceAgents := findAgents(resourceDependencies, agents, resourceKey)
for _, agent := range resourceAgents {
// Didn't use instance identity.
if agent.GetToken() != "" {