coder · kylecarbs · Nov 1, 2022 · Nov 1, 2022
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000069_resource_instance_type.down.sql b/coderd/database/migrations/000069_resource_instance_type.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE workspace_resources
+    DROP COLUMN instance_type;
diff --git a/coderd/database/migrations/000069_resource_instance_type.up.sql b/coderd/database/migrations/000069_resource_instance_type.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE workspace_resources
+    ADD COLUMN instance_type varchar(256);
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceresources.sql b/coderd/database/queries/workspaceresources.sql
@@ -27,9 +27,9 @@ SELECT * FROM workspace_resources WHERE created_at > $1;
 
 -- name: InsertWorkspaceResource :one
 INSERT INTO
-	workspace_resources (id, created_at, job_id, transition, type, name, hide, icon)
+	workspace_resources (id, created_at, job_id, transition, type, name, hide, icon, instance_type)
 VALUES
-	($1, $2, $3, $4, $5, $6, $7, $8) RETURNING *;
+	($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING *;
 
 -- name: GetWorkspaceResourceMetadataByResourceID :many
 SELECT

diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -750,6 +750,10 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 		Name:       protoResource.Name,
 		Hide:       protoResource.Hide,
 		Icon:       protoResource.Icon,
+		InstanceType: sql.NullString{
+			String: protoResource.InstanceType,
+			Valid:  protoResource.InstanceType != "",
+		},
 	})
 	if err != nil {
 		return xerrors.Errorf("insert provisioner job resource %q: %w", protoResource.Name, err)

diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -539,10 +539,11 @@ func ConvertWorkspaceApp(app database.WorkspaceApp) WorkspaceApp {
 // ConvertWorkspaceResource anonymizes a workspace resource.
 func ConvertWorkspaceResource(resource database.WorkspaceResource) WorkspaceResource {
 	return WorkspaceResource{
-		ID:         resource.ID,
-		JobID:      resource.JobID,
-		Transition: resource.Transition,
-		Type:       resource.Type,
+		ID:           resource.ID,
+		JobID:        resource.JobID,
+		Transition:   resource.Transition,
+		Type:         resource.Type,
+		InstanceType: resource.InstanceType.String,
 	}
 }
 
@@ -667,10 +668,11 @@ type User struct {
 }
 
 type WorkspaceResource struct {
-	ID         uuid.UUID                    `json:"id"`
-	JobID      uuid.UUID                    `json:"job_id"`
-	Transition database.WorkspaceTransition `json:"transition"`
-	Type       string                       `json:"type"`
+	ID           uuid.UUID                    `json:"id"`
+	JobID        uuid.UUID                    `json:"job_id"`
+	Transition   database.WorkspaceTransition `json:"transition"`
+	Type         string                       `json:"type"`
+	InstanceType string                       `json:"instance_type"`
 }
 
 type WorkspaceResourceMetadata struct {

diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -382,12 +382,13 @@ func ConvertResources(module *tfjson.StateModule, rawGraph string) ([]*proto.Res
 		}
 
 		resources = append(resources, &proto.Resource{
-			Name:     resource.Name,
-			Type:     resource.Type,
-			Agents:   agents,
-			Hide:     resourceHidden[label],
-			Icon:     resourceIcon[label],
-			Metadata: resourceMetadata[label],
+			Name:         resource.Name,
+			Type:         resource.Type,
+			Agents:       agents,
+			Hide:         resourceHidden[label],
+			Icon:         resourceIcon[label],
+			Metadata:     resourceMetadata[label],
+			InstanceType: applyInstanceType(resource),
 		})
 	}
 
@@ -405,6 +406,31 @@ type graphResource struct {
 	Depth uint
 }
 
+// applyInstanceType sets the instance type on an agent if it matches
+// one of the special resource types that we track.
+func applyInstanceType(resource *tfjson.StateResource) string {
+	key, isValid := map[string]string{
+		"google_compute_instance":         "machine_type",
+		"aws_instance":                    "instance_type",
+		"aws_spot_instance_request":       "instance_type",
+		"azurerm_linux_virtual_machine":   "size",
+		"azurerm_windows_virtual_machine": "size",
+	}[resource.Type]
+	if !isValid {
+		return ""
+	}
+
+	instanceTypeRaw, isValid := resource.AttributeValues[key]
+	if !isValid {
+		return ""
+	}
+	instanceType, isValid := instanceTypeRaw.(string)
+	if !isValid {
+		return ""
+	}
+	return instanceType
+}
+
 // applyAutomaticInstanceID checks if the resource is one of a set of *magical* IDs
 // that automatically index their identifier for automatic authentication.
 func applyAutomaticInstanceID(resource *tfjson.StateResource, agents []*proto.Agent) {

diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go
@@ -287,6 +287,58 @@ func TestAppSlugValidation(t *testing.T) {
 	require.ErrorContains(t, err, "duplicate app slug")
 }
 
+func TestInstanceTypeAssociation(t *testing.T) {
+	t.Parallel()
+	type tc struct {
+		ResourceType    string
+		InstanceTypeKey string
+	}
+	for _, tc := range []tc{{
+		ResourceType:    "google_compute_instance",
+		InstanceTypeKey: "machine_type",
+	}, {
+		ResourceType:    "aws_instance",
+		InstanceTypeKey: "instance_type",
+	}, {
+		ResourceType:    "aws_spot_instance_request",
+		InstanceTypeKey: "instance_type",
+	}, {
+		ResourceType:    "azurerm_linux_virtual_machine",
+		InstanceTypeKey: "size",
+	}, {
+		ResourceType:    "azurerm_windows_virtual_machine",
+		InstanceTypeKey: "size",
+	}} {
+		tc := tc
+		t.Run(tc.ResourceType, func(t *testing.T) {
+			t.Parallel()
+			instanceType, err := cryptorand.String(12)
+			require.NoError(t, err)
+			resources, err := terraform.ConvertResources(&tfjson.StateModule{
+				Resources: []*tfjson.StateResource{{
+					Address: tc.ResourceType + ".dev",
+					Type:    tc.ResourceType,
+					Name:    "dev",
+					Mode:    tfjson.ManagedResourceMode,
+					AttributeValues: map[string]interface{}{
+						tc.InstanceTypeKey: instanceType,
+					},
+				}},
+				// This is manually created to join the edges.
+			}, `digraph {
+	compound = "true"
+	newrank = "true"
+	subgraph "root" {
+		"[root] `+tc.ResourceType+`.dev" [label = "`+tc.ResourceType+`.dev", shape = "box"]
+	}
+}`)
+			require.NoError(t, err)
+			require.Len(t, resources, 1)
+			require.Equal(t, resources[0].GetInstanceType(), instanceType)
+		})
+	}
+}
+
 func TestInstanceIDAssociation(t *testing.T) {
 	t.Parallel()
 	type tc struct {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE workspace_resources
		DROP COLUMN instance_type;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE workspace_resources
		ADD COLUMN instance_type varchar(256);