coder · kylecarbs · Dec 14, 2022 · Dec 14, 2022 · Dec 14, 2022
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -2193,19 +2193,6 @@ func (q *fakeQuerier) GetWorkspaceResourceMetadataCreatedAfter(ctx context.Conte
 	return metadata, nil
 }
 
-func (q *fakeQuerier) GetWorkspaceResourceMetadataByResourceID(_ context.Context, id uuid.UUID) ([]database.WorkspaceResourceMetadatum, error) {
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-
-	metadata := make([]database.WorkspaceResourceMetadatum, 0)
-	for _, metadatum := range q.workspaceResourceMetadata {
-		if metadatum.WorkspaceResourceID == id {
-			metadata = append(metadata, metadatum)
-		}
-	}
-	return metadata, nil
-}
-
 func (q *fakeQuerier) GetWorkspaceResourceMetadataByResourceIDs(_ context.Context, ids []uuid.UUID) ([]database.WorkspaceResourceMetadatum, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
@@ -2549,19 +2536,31 @@ func (q *fakeQuerier) InsertWorkspaceResource(_ context.Context, arg database.In
 	return resource, nil
 }
 
-func (q *fakeQuerier) InsertWorkspaceResourceMetadata(_ context.Context, arg database.InsertWorkspaceResourceMetadataParams) (database.WorkspaceResourceMetadatum, error) {
+func (q *fakeQuerier) InsertWorkspaceResourceMetadata(_ context.Context, arg database.InsertWorkspaceResourceMetadataParams) ([]database.WorkspaceResourceMetadatum, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
-	//nolint:gosimple
-	metadatum := database.WorkspaceResourceMetadatum{
-		WorkspaceResourceID: arg.WorkspaceResourceID,
-		Key:                 arg.Key,
-		Value:               arg.Value,
-		Sensitive:           arg.Sensitive,
-	}
-	q.workspaceResourceMetadata = append(q.workspaceResourceMetadata, metadatum)
-	return metadatum, nil
+	metadata := make([]database.WorkspaceResourceMetadatum, 0)
+	id := int64(1)
+	if len(q.workspaceResourceMetadata) > 0 {
+		id = q.workspaceResourceMetadata[len(q.workspaceResourceMetadata)-1].ID
+	}
+	for index, key := range arg.Key {
+		id++
+		value := arg.Value[index]
+		metadata = append(metadata, database.WorkspaceResourceMetadatum{
+			ID:                  id,
+			WorkspaceResourceID: arg.WorkspaceResourceID,
+			Key:                 key,
+			Value: sql.NullString{
+				String: value,
+				Valid:  value != "",
+			},
+			Sensitive: arg.Sensitive[index],
+		})
+	}
+	q.workspaceResourceMetadata = append(q.workspaceResourceMetadata, metadata...)
+	return metadata, nil
 }
 
 func (q *fakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParams) (database.User, error) {

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000087_resource_metadata_order.down.sql b/coderd/database/migrations/000087_resource_metadata_order.down.sql
@@ -0,0 +1,4 @@
+ALTER TABLE workspace_resource_metadata DROP COLUMN id;
+ALTER TABLE workspace_resource_metadata DROP CONSTRAINT workspace_resource_metadata_name;
+ALTER TABLE workspace_resource_metadata ADD CONSTRAINT workspace_resource_metadata_pkey PRIMARY KEY (workspace_resource_id, key);
+
diff --git a/coderd/database/migrations/000087_resource_metadata_order.up.sql b/coderd/database/migrations/000087_resource_metadata_order.up.sql
@@ -0,0 +1,5 @@
+ALTER TABLE workspace_resource_metadata DROP CONSTRAINT workspace_resource_metadata_pkey;
+
+ALTER TABLE workspace_resource_metadata ADD COLUMN id BIGSERIAL PRIMARY KEY; 
+
+ALTER TABLE workspace_resource_metadata ADD CONSTRAINT workspace_resource_metadata_name UNIQUE(workspace_resource_id, key);
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.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
@@ -31,27 +31,22 @@ INSERT INTO
 VALUES
 	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING *;
 
--- name: GetWorkspaceResourceMetadataByResourceID :many
-SELECT
-	*
-FROM
-	workspace_resource_metadata
-WHERE
-	workspace_resource_id = $1;
-
 -- name: GetWorkspaceResourceMetadataByResourceIDs :many
 SELECT
 	*
 FROM
 	workspace_resource_metadata
 WHERE
-	workspace_resource_id = ANY(@ids :: uuid [ ]);
+	workspace_resource_id = ANY(@ids :: uuid [ ]) ORDER BY id ASC;
 
--- name: InsertWorkspaceResourceMetadata :one
+-- name: InsertWorkspaceResourceMetadata :many
 INSERT INTO
-	workspace_resource_metadata (workspace_resource_id, key, value, sensitive)
-VALUES
-	($1, $2, $3, $4) RETURNING *;
+	workspace_resource_metadata
+SELECT
+	@workspace_resource_id :: uuid AS workspace_resource_id,
+	unnest(@key :: text [ ]) AS key,
+	unnest(@value :: text [ ]) AS value,
+	unnest(@sensitive :: boolean [ ]) AS sensitive RETURNING *; 
 
 -- name: GetWorkspaceResourceMetadataCreatedAfter :many
 SELECT * FROM workspace_resource_metadata WHERE workspace_resource_id = ANY(

diff --git a/coderd/database/unique_constraint.go b/coderd/database/unique_constraint.go
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -966,22 +966,23 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 		}
 	}
 
+	arg := database.InsertWorkspaceResourceMetadataParams{
+		WorkspaceResourceID: resource.ID,
+		Key:                 []string{},
+		Value:               []string{},
+		Sensitive:           []bool{},
+	}
 	for _, metadatum := range protoResource.Metadata {
-		var value sql.NullString
-		if !metadatum.IsNull {
-			value.String = metadatum.Value
-			value.Valid = true
-		}
-
-		_, err := db.InsertWorkspaceResourceMetadata(ctx, database.InsertWorkspaceResourceMetadataParams{
-			WorkspaceResourceID: resource.ID,
-			Key:                 metadatum.Key,
-			Value:               value,
-			Sensitive:           metadatum.Sensitive,
-		})
-		if err != nil {
-			return xerrors.Errorf("insert metadata: %w", err)
+		if metadatum.IsNull {
+			continue
 		}
+		arg.Key = append(arg.Key, metadatum.Key)
+		arg.Value = append(arg.Value, metadatum.Value)
+		arg.Sensitive = append(arg.Sensitive, metadatum.Sensitive)
+	}
+	_, err = db.InsertWorkspaceResourceMetadata(ctx, arg)
+	if err != nil {
+		return xerrors.Errorf("insert workspace resource metadata: %w", err)
 	}
 
 	return nil