coder
diff --git a/‎provisioner/terraform/resources.go
Lines changed: 28 additions & 9 deletions b/‎provisioner/terraform/resources.go
Lines changed: 28 additions & 9 deletions
diff --git a/‎provisioner/terraform/resources_test.go
Lines changed: 31 additions & 0 deletions b/‎provisioner/terraform/resources_test.go
Lines changed: 31 additions & 0 deletions
diff --git a/‎provisioner/terraform/testdata/devcontainer/devcontainer.tf
Lines changed: 30 additions & 0 deletions b/‎provisioner/terraform/testdata/devcontainer/devcontainer.tf
Lines changed: 30 additions & 0 deletions
diff --git a/‎provisioner/terraform/testdata/devcontainer/devcontainer.tfplan.dot
Lines changed: 22 additions & 0 deletions b/‎provisioner/terraform/testdata/devcontainer/devcontainer.tfplan.dot
Lines changed: 22 additions & 0 deletions
@@ -57,10 +57,10 @@ type agentAttributes struct {
 	DisplayApps              []agentDisplayAppsAttributes `mapstructure:"display_apps"`
 	Order                    int64                        `mapstructure:"order"`
 	ResourcesMonitoring      []agentResourcesMonitoring   `mapstructure:"resources_monitoring"`
-	Devcontainers            []agentDevcontainer          `mapstructure:"devcontainers"`
 }
 
-type agentDevcontainer struct {
+type agentDevcontainerAttributes struct {
+	AgentID         string `mapstructure:"agent_id"`
 	WorkspaceFolder string `mapstructure:"workspace_folder"`
 	ConfigPath      string `mapstructure:"config_path"`
 }
@@ -353,13 +353,6 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
 				agent.Auth = &proto.Agent_InstanceId{}
 			}
 
-			for _, devcontainer := range attrs.Devcontainers {
-				agent.Devcontainers = append(agent.Devcontainers, &proto.Devcontainer{
-					WorkspaceFolder: devcontainer.WorkspaceFolder,
-					ConfigPath:      devcontainer.ConfigPath,
-				})
-			}
-
 			// The label is used to find the graph node!
 			agentLabel := convertAddressToLabel(tfResource.Address)
 
@@ -603,6 +596,32 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
 		}
 	}
 
+	// Associate Dev Containers with agents.
+	for _, resources := range tfResourcesByLabel {
+		for _, resource := range resources {
+			if resource.Type != "coder_devcontainer" {
+				continue
+			}
+			var attrs agentDevcontainerAttributes
+			err = mapstructure.Decode(resource.AttributeValues, &attrs)
+			if err != nil {
+				return nil, xerrors.Errorf("decode script attributes: %w", err)
+			}
+			for _, agents := range resourceAgents {
+				for _, agent := range agents {
+					// Find agents with the matching ID and associate them!
+					if !dependsOnAgent(graph, agent, attrs.AgentID, resource) {
+						continue
+					}
+					agent.Devcontainers = append(agent.Devcontainers, &proto.Devcontainer{
+						WorkspaceFolder: attrs.WorkspaceFolder,
+						ConfigPath:      attrs.ConfigPath,
+					})
+				}
+			}
+		}
+	}
+
 	// Associate metadata blocks with resources.
 	resourceMetadata := map[string][]*proto.Resource_Metadata{}
 	resourceHidden := map[string]bool{}
 
@@ -830,6 +830,34 @@ func TestConvertResources(t *testing.T) {
 				}},
 			}},
 		},
+		"devcontainer": {
+			resources: []*proto.Resource{
+				{
+					Name: "dev",
+					Type: "null_resource",
+					Agents: []*proto.Agent{{
+						Name:                     "main",
+						OperatingSystem:          "linux",
+						Architecture:             "amd64",
+						Auth:                     &proto.Agent_Token{},
+						ConnectionTimeoutSeconds: 120,
+						DisplayApps:              &displayApps,
+						ResourcesMonitoring:      &proto.ResourcesMonitoring{},
+						Devcontainers: []*proto.Devcontainer{
+							{
+								WorkspaceFolder: "/workspace1",
+							},
+							{
+								WorkspaceFolder: "/workspace2",
+								ConfigPath:      "/workspace2/.devcontainer/devcontainer.json",
+							},
+						},
+					}},
+				},
+				{Name: "dev1", Type: "coder_devcontainer"},
+				{Name: "dev2", Type: "coder_devcontainer"},
+			},
+		},
 	} {
 		folderName := folderName
 		expected := expected
@@ -1375,6 +1403,9 @@ func sortResources(resources []*proto.Resource) {
 			sort.Slice(agent.Scripts, func(i, j int) bool {
 				return agent.Scripts[i].DisplayName < agent.Scripts[j].DisplayName
 			})
+			sort.Slice(agent.Devcontainers, func(i, j int) bool {
+				return agent.Devcontainers[i].WorkspaceFolder < agent.Devcontainers[j].WorkspaceFolder
+			})
 		}
 		sort.Slice(resource.Agents, func(i, j int) bool {
 			return resource.Agents[i].Name < resource.Agents[j].Name
 
@@ -0,0 +1,30 @@
+terraform {
+  required_providers {
+    coder = {
+      source  = "coder/coder"
+      version = ">=2.0.0"
+    }
+  }
+}
+
+resource "coder_agent" "main" {
+  os   = "linux"
+  arch = "amd64"
+}
+
+resource "coder_devcontainer" "dev1" {
+  agent_id         = coder_agent.main.id
+  workspace_folder = "/workspace1"
+}
+
+resource "coder_devcontainer" "dev2" {
+  agent_id         = coder_agent.main.id
+  workspace_folder = "/workspace2"
+  config_path      = "/workspace2/.devcontainer/devcontainer.json"
+}
+
+resource "null_resource" "dev" {
+  depends_on = [
+    coder_agent.main
+  ]
+}