Fix up

Author: easyCZ

components/usage/pkg/db/dbtest/workspace_instance.go

@@ -6,7 +6,6 @@ package dbtest
 
 import (
 	"database/sql"
-	"fmt"
 	"github.com/gitpod-io/gitpod/usage/pkg/db"
 	"github.com/google/uuid"
 	"testing"
@@ -60,7 +59,7 @@ func NewWorkspaceInstance(t *testing.T, instance db.WorkspaceInstance) db.Worksp
 		status = instance.Status
 	}
 
-	attributionID := fmt.Sprintf("user:%s", uuid.New().String())
+	attributionID := db.NewAttributionID("user", uuid.New().String())
 	if instance.UsageAttributionID != "" {
 		attributionID = instance.UsageAttributionID
 	}

components/usage/pkg/db/workspace_instance.go

@@ -90,6 +90,10 @@ func ListWorkspaceInstancesInRange(ctx context.Context, conn *gorm.DB, from, to
 	return instances, nil
 }
 
+func NewAttributionID(entity, identifier string) AttributionID {
+	return AttributionID(fmt.Sprintf("%s:%s", entity, identifier))
+}
+
 // AttributionID consists of an entity, and an identifier in the form:
 // <entity>:<identifier>, e.g. team:a7dcf253-f05e-4dcf-9a47-cf8fccc74717
 type AttributionID string