coder
diff --git a/‎provisioner/terraform/resources.go
Lines changed: 4 additions & 4 deletions b/‎provisioner/terraform/resources.go
Lines changed: 4 additions & 4 deletions
diff --git a/‎provisioner/terraform/resources_test.go
Lines changed: 50 additions & 0 deletions b/‎provisioner/terraform/resources_test.go
Lines changed: 50 additions & 0 deletions
diff --git a/‎provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf
Lines changed: 48 additions & 0 deletions b/‎provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf
Lines changed: 48 additions & 0 deletions
diff --git a/‎provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.dot
Lines changed: 31 additions & 0 deletions b/‎provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.dot
Lines changed: 31 additions & 0 deletions
@@ -463,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{
@@ -751,12 +751,12 @@ func convertAddressToLabel(address string) string {
 }
 
 func dependsOnAgent(graph *gographviz.Graph, agent *proto.Agent, appAgentID string, resource *tfjson.StateResource) bool {
-	// Plan: we need to find if there is edge between the agent and the app.
+	// Plan: we need to find if there is edge between the agent and the resource.
 	if agent.Id == "" && appAgentID == "" {
-		appNodeSuffix := fmt.Sprintf(`] coder_app.%s (expand)"`, resource.Name)
+		appNodeSuffix := 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_app depends on coder_agent.
+		// 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 {
 
@@ -269,6 +269,56 @@ func TestConvertResources(t *testing.T) {
 				}},
 			}},
 		},
+		"multiple-agents-multiple-envs": {
+			resources: []*proto.Resource{{
+				Name: "dev1",
+				Type: "null_resource",
+				Agents: []*proto.Agent{{
+					Name:            "dev1",
+					OperatingSystem: "linux",
+					Architecture:    "amd64",
+					ExtraEnvs: []*proto.Env{
+						{
+							Name:  "ENV_1",
+							Value: "Env 1",
+						},
+						{
+							Name:  "ENV_2",
+							Value: "Env 2",
+						},
+					},
+					Auth:                     &proto.Agent_Token{},
+					ConnectionTimeoutSeconds: 120,
+					DisplayApps:              &displayApps,
+				}},
+			}, {
+				Name: "dev2",
+				Type: "null_resource",
+				Agents: []*proto.Agent{{
+					Name:            "dev2",
+					OperatingSystem: "linux",
+					Architecture:    "amd64",
+					ExtraEnvs: []*proto.Env{
+						{
+							Name:  "ENV_3",
+							Value: "Env 3",
+						},
+					},
+					Auth:                     &proto.Agent_Token{},
+					ConnectionTimeoutSeconds: 120,
+					DisplayApps:              &displayApps,
+				}},
+			}, {
+				Name: "env1",
+				Type: "coder_env",
+			}, {
+				Name: "env2",
+				Type: "coder_env",
+			}, {
+				Name: "env3",
+				Type: "coder_env",
+			}},
+		},
 		// Tests fetching metadata about workspace resources.
 		"resource-metadata": {
 			resources: []*proto.Resource{{
 
@@ -0,0 +1,48 @@
+terraform {
+  required_providers {
+    coder = {
+      source  = "coder/coder"
+      version = "0.22.0"
+    }
+  }
+}
+
+resource "coder_agent" "dev1" {
+  os   = "linux"
+  arch = "amd64"
+}
+
+resource "coder_agent" "dev2" {
+  os   = "linux"
+  arch = "amd64"
+}
+
+resource "coder_env" "env1" {
+  agent_id = coder_agent.dev1.id
+  name     = "ENV_1"
+  value    = "Env 1"
+}
+
+resource "coder_env" "env2" {
+  agent_id = coder_agent.dev1.id
+  name     = "ENV_2"
+  value    = "Env 2"
+}
+
+resource "coder_env" "env3" {
+  agent_id = coder_agent.dev2.id
+  name     = "ENV_3"
+  value    = "Env 3"
+}
+
+resource "null_resource" "dev1" {
+  depends_on = [
+    coder_agent.dev1
+  ]
+}
+
+resource "null_resource" "dev2" {
+  depends_on = [
+    coder_agent.dev2
+  ]
+}