Commit9164618

authored and

committed

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

This reverts commitf3fe2a0.

1 parent544ee9b commit9164618Copy full SHA for 9164618

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -357,10 +357,11 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi`
`357`	`357`	`ifresource.Type=="coder_agent"\|\|resource.Type=="coder_agent_instance" {`
`358`	`358`	`continue`
`359`	`359`	`}`
	`360`	`+resourceKey:=strings.Join([]string{resource.Type,resource.Name},".")`
`360`	`361`	`resources=append(resources,&proto.Resource{`
`361`	`362`	`Name:resource.Name,`
`362`	`363`	`Type:resource.Type,`
`363`		`-Agents:findAgents(resourceDependencies,agents,resource.Address),`
	`364`	`+Agents:findAgents(resourceDependencies,agents,resourceKey),`
`364`	`365`	`})`
`365`	`366`	`}`
`366`	`367`
`@@ -497,7 +498,8 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state`
`497`	`498`	`ifresource.Type=="coder_agent"\|\|resource.Type=="coder_agent_instance" {`
`498`	`499`	`continue`
`499`	`500`	`}`
`500`		`-resourceAgents:=findAgents(resourceDependencies,agents,resource.Address)`
	`501`	`+resourceKey:=strings.Join([]string{resource.Type,resource.Name},".")`
	`502`	`+resourceAgents:=findAgents(resourceDependencies,agents,resourceKey)`
`501`	`503`	`for_,agent:=rangeresourceAgents {`
`502`	`504`	`// Didn't use instance identity.`
`503`	`505`	`ifagent.GetToken()!="" {`

Comments

(0)