Sep 13, 2022 · Sep 12, 2022 · Sep 12, 2022 · Sep 12, 2022 · Sep 12, 2022 · Sep 12, 2022
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
 Type:       arg.Type,
 Name:       arg.Name,
 Hide:       arg.Hide,
 Icon:       arg.Icon,
 }
 q.provisionerJobResources = append(q.provisionerJobResources, resource)
 return resource, nil
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000049_workspace_resource_icon.down.sql b/coderd/database/migrations/000049_workspace_resource_icon.down.sql
 ALTER TABLE workspace_resources
    DROP COLUMN icon;
diff --git a/coderd/database/migrations/000049_workspace_resource_icon.up.sql b/coderd/database/migrations/000049_workspace_resource_icon.up.sql
 ALTER TABLE workspace_resources
    ADD COLUMN icon VARCHAR(256) NOT NULL DEFAULT ''
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

 -- name: InsertWorkspaceResource :one
 INSERT INTO
 workspace_resources (id, created_at, job_id, transition, type, name, hide)
 workspace_resources (id, created_at, job_id, transition, type, name, hide, icon)
 VALUES
 ($1, $2, $3, $4, $5, $6, $7) RETURNING *;
 ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING *;

 -- name: GetWorkspaceResourceMetadataByResourceID :many
 SELECT
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
 Type:       protoResource.Type,
 Name:       protoResource.Name,
 Hide:       protoResource.Hide,
 Icon:       protoResource.Icon,
 })
 if err != nil {
 return xerrors.Errorf("insert provisioner job resource %q: %w", protoResource.Name, err)
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
 Type:       resource.Type,
 Name:       resource.Name,
 Hide:       resource.Hide,
 Icon:       resource.Icon,
 Agents:     agents,
 Metadata:   convertedMetadata,
 }
diff --git a/coderd/workspaceresources_test.go b/coderd/workspaceresources_test.go
 Resources: []*proto.Resource{{
 Name: "beta",
 Type: "example",
 Icon: "/icon/server.svg",
 Agents: []*proto.Agent{{
 Id:   "something",
 Name: "b",
 resource, err := client.WorkspaceResource(ctx, resources[1].ID)
 require.NoError(t, err)
 require.Len(t, resource.Agents, 2)
 // Ensureit's sorted alphabetically!
 // Ensureagents are sorted alphabetically!
 require.Equal(t, "a", resource.Agents[0].Name)
 require.Equal(t, "b", resource.Agents[1].Name)
 // Ensure Icon is present
 require.Equal(t, "/icon/server.svg", resources[1].Icon)
 })

 t.Run("Apps", func(t *testing.T) {
diff --git a/codersdk/workspaceresources.go b/codersdk/workspaceresources.go
 Type       string                      `json:"type"`
 Name       string                      `json:"name"`
 Hide       bool                        `json:"hide"`
 Icon       string                      `json:"icon"`
 Agents     []WorkspaceAgent            `json:"agents,omitempty"`
 Metadata   []WorkspaceResourceMetadata `json:"metadata,omitempty"`
 }
diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
  }
 }
diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
  }
 }
diff --git a/examples/templates/azure-linux/main.tf b/examples/templates/azure-linux/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    azurerm = {
      source  = "hashicorp/azurerm"
diff --git a/examples/templates/do-linux/main.tf b/examples/templates/do-linux/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    digitalocean = {
      source  = "digitalocean/digitalocean"
diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    docker = {
      source  = "kreuzwerker/docker"
diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    docker = {
      source  = "kreuzwerker/docker"
diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    docker = {
      source  = "kreuzwerker/docker"
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    docker = {
      source  = "kreuzwerker/docker"
diff --git a/examples/templates/ecs-container/main.tf b/examples/templates/ecs-container/main.tf
    }
    coder = {
      source  = "coder/coder"
      version = "~>0.4.9"
      version = "0.4.11"
    }
  }
 }
diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    google = {
      source  = "hashicorp/google"
diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    google = {
      source  = "hashicorp/google"
diff --git a/examples/templates/gcp-windows/main.tf b/examples/templates/gcp-windows/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    google = {
      source  = "hashicorp/google"
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.9"
      version = "0.4.11"
    }
    kubernetes = {
      source  = "hashicorp/kubernetes"
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
 type metadataAttributes struct {
 ResourceID string         `mapstructure:"resource_id"`
 Hide       bool           `mapstructure:"hide"`
 Icon       string         `mapstructure:"icon"`
 Items      []metadataItem `mapstructure:"item"`
 }

 // Associate metadata blocks with resources.
 resourceMetadata := map[string][]*proto.Resource_Metadata{}
 resourceHidden := map[string]bool{}
 resourceIcon := map[string]string{}
 for _, resource := range tfResourceByLabel {
 if resource.Type != "coder_metadata" {
 continue
 }

 resourceHidden[targetLabel] = attrs.Hide
 resourceIcon[targetLabel] = attrs.Icon
 for _, item := range attrs.Items {
 resourceMetadata[targetLabel] = append(resourceMetadata[targetLabel],
 &proto.Resource_Metadata{
 Type:     resource.Type,
 Agents:   agents,
 Hide:     resourceHidden[label],
 Icon:     resourceIcon[label],
 Metadata: resourceMetadata[label],
 })
 }
diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go
 Name: "about",
 Type: "null_resource",
 Hide: true,
 Icon: "/icon/server.svg",
 Metadata: []*proto.Resource_Metadata{{
 Key:   "hello",
 Value: "world",
diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tf b/provisioner/terraform/testdata/calling-module/calling-module.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.10"
      version = "0.4.11"
    }
  }
 }
diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json
diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json
diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf
  required_providers {
    coder = {
      source  = "coder/coder"
      version = "0.4.10"
      version = "0.4.11"
    }
  }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1801,6 +1801,7 @@ func (q *fakeQuerier) InsertWorkspaceResource(_ context.Context, arg database.In
		Type: arg.Type,
		Name: arg.Name,
		Hide: arg.Hide,
		Icon: arg.Icon,
		}
		q.provisionerJobResources = append(q.provisionerJobResources, resource)
		return resource, nil
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE workspace_resources
		DROP COLUMN icon;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE workspace_resources
		ADD COLUMN icon VARCHAR(256) NOT NULL DEFAULT ''
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,9 +19,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)
		workspace_resources (id, created_at, job_id, transition, type, name, hide, icon)
		VALUES
		($1, $2, $3, $4, $5, $6, $7) RETURNING *;
		($1, $2, $3, $4, $5, $6, $7, $8) RETURNING *;

		-- name: GetWorkspaceResourceMetadataByResourceID :many
		SELECT
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -753,6 +753,7 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
		Type: protoResource.Type,
		Name: protoResource.Name,
		Hide: protoResource.Hide,
		Icon: protoResource.Icon,
		})
		if err != nil {
		return xerrors.Errorf("insert provisioner job resource %q: %w", protoResource.Name, err)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -707,6 +707,7 @@ func convertWorkspaceResource(resource database.WorkspaceResource, agents []code
		Type: resource.Type,
		Name: resource.Name,
		Hide: resource.Hide,
		Icon: resource.Icon,
		Agents: agents,
		Metadata: convertedMetadata,
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,6 +27,7 @@ func TestWorkspaceResource(t *testing.T) {
		Resources: []*proto.Resource{{
		Name: "beta",
		Type: "example",
		Icon: "/icon/server.svg",
		Agents: []*proto.Agent{{
		Id: "something",
		Name: "b",
Expand DownExpand Up		@@ -60,9 +61,11 @@ func TestWorkspaceResource(t *testing.T) {
		resource, err := client.WorkspaceResource(ctx, resources[1].ID)
		require.NoError(t, err)
		require.Len(t, resource.Agents, 2)
		// Ensureit's sorted alphabetically!
		// Ensureagents are sorted alphabetically!
		require.Equal(t, "a", resource.Agents[0].Name)
		require.Equal(t, "b", resource.Agents[1].Name)
		// Ensure Icon is present
		require.Equal(t, "/icon/server.svg", resources[1].Icon)
		})

		t.Run("Apps", func(t *testing.T) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,6 +26,7 @@ type WorkspaceResource struct {
		Type string `json:"type"`
		Name string `json:"name"`
		Hide bool `json:"hide"`
		Icon string `json:"icon"`
		Agents []WorkspaceAgent `json:"agents,omitempty"`
		Metadata []WorkspaceResourceMetadata `json:"metadata,omitempty"`
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,7 @@ terraform {
		required_providers {
		coder = {
		source = "coder/coder"
		version = "0.4.9"
		version = "0.4.11"
		}
		}
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,7 +3,7 @@ terraform {
		required_providers {
		coder = {
		source = "coder/coder"
		version = "0.4.9"
		version = "0.4.11"
		}
		docker = {
		source = "kreuzwerker/docker"
Expand Down