synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(provisioner): handle multiple agents, apps, scripts and envs (#13741)

Browse Source
This commit is contained in:
Marcin Tojek
2024-07-03 14:55:28 +02:00
committed by GitHub
parent f6639b788f
commit 07d41716ad
17 changed files with 2786 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
provisioner/terraform/resources.go
View File

@ -427,9 +427,11 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
for _, agents := range resourceAgents {
for _, agent := range agents {
// Find agents with the matching ID and associate them!
if agent.Id != attrs.AgentID {
if !dependsOnAgent(graph, agent, attrs.AgentID, resource) {
continue
}
agent.Apps = append(agent.Apps, &proto.App{
Slug: attrs.Slug,
DisplayName: attrs.DisplayName,
@ -461,7 +463,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
for _, agents := range resourceAgents {
for _, agent := range agents {
// Find agents with the matching ID and associate them!
if agent.Id != attrs.AgentID {
if !dependsOnAgent(graph, agent, attrs.AgentID, resource) {
continue
}
agent.ExtraEnvs = append(agent.ExtraEnvs, &proto.Env{
@ -487,7 +489,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
for _, agents := range resourceAgents {
for _, agent := range agents {
// Find agents with the matching ID and associate them!
if agent.Id != attrs.AgentID {
if !dependsOnAgent(graph, agent, attrs.AgentID, resource) {
continue
}
agent.Scripts = append(agent.Scripts, &proto.Script{
@ -748,6 +750,30 @@ func convertAddressToLabel(address string) string {
return cut
}
func dependsOnAgent(graph *gographviz.Graph, agent *proto.Agent, resourceAgentID string, resource *tfjson.StateResource) bool {
// Plan: we need to find if there is edge between the agent and the resource.
if agent.Id == "" && resourceAgentID == "" {
resourceNodeSuffix := fmt.Sprintf(`] %s.%s (expand)"`, resource.Type, resource.Name)
agentNodeSuffix := fmt.Sprintf(`] coder_agent.%s (expand)"`, agent.Name)
// Traverse the graph to check if the coder_<resource_type> depends on coder_agent.
for _, dst := range graph.Edges.SrcToDsts {
for _, edges := range dst {
for _, edge := range edges {
if strings.HasSuffix(edge.Src, resourceNodeSuffix) &&
strings.HasSuffix(edge.Dst, agentNodeSuffix) {
return true
}
}
}
}
return false
}
// Provision: agent ID and child resource ID are present
return agent.Id == resourceAgentID
}
type graphResource struct {
Label string
Depth uint