feat: add workspaceId to Environment schema and update related components

Author: jsbroks

apps/workspace-engine/oapi/openapi.json

@@ -538,13 +538,17 @@
                },
                "resourceSelector": {
                   "$ref": "#/components/schemas/Selector"
+               },
+               "workspaceId": {
+                  "type": "string"
                }
             },
             "required": [
                "id",
                "name",
                "createdAt",
-               "metadata"
+               "metadata",
+               "workspaceId"
             ],
             "type": "object"
          },

apps/workspace-engine/oapi/spec/schemas/environments.jsonnet

@@ -3,14 +3,15 @@ local openapi = import '../lib/openapi.libsonnet';
 {
   Environment: {
     type: 'object',
-    required: ['id', 'name', 'createdAt', 'metadata'],
+    required: ['id', 'name', 'createdAt', 'metadata', 'workspaceId'],
     properties: {
       id: { type: 'string' },
       name: { type: 'string' },
       description: { type: 'string' },
       resourceSelector: openapi.schemaRef('Selector'),
       createdAt: { type: 'string', format: 'date-time' },
       metadata: { type: 'object', additionalProperties: { type: 'string' } },
+      workspaceId: { type: 'string' },
     },
   },
 

…ollers/desiredrelease/convert/convert.go apps/workspace-engine/pkg/db/convert.goapps/workspace-engine/svc/controllers/desiredrelease/convert/convert.go renamed to apps/workspace-engine/pkg/db/convert.go apps/workspace-engine/svc/controllers/desiredrelease/convert/convert.go renamed to apps/workspace-engine/pkg/db/convert.go

@@ -1,15 +1,14 @@
-package convert
+package db
 
 import (
 	"encoding/json"
 
-	"workspace-engine/pkg/db"
 	"workspace-engine/pkg/oapi"
 
 	"github.com/google/uuid"
 )
 
-func Deployment(row db.Deployment) *oapi.Deployment {
+func ToOapiDeployment(row Deployment) *oapi.Deployment {
 	d := &oapi.Deployment{
 		Id:             row.ID.String(),
 		Name:           row.Name,
@@ -26,7 +25,7 @@ func Deployment(row db.Deployment) *oapi.Deployment {
 	return d
 }
 
-func Environment(row db.Environment) *oapi.Environment {
+func ToOapiEnvironment(row Environment) *oapi.Environment {
 	e := &oapi.Environment{
 		Id:       row.ID.String(),
 		Name:     row.Name,
@@ -41,7 +40,7 @@ func Environment(row db.Environment) *oapi.Environment {
 	return e
 }
 
-func Resource(row db.GetResourceByIDRow) *oapi.Resource {
+func ToOapiResource(row GetResourceByIDRow) *oapi.Resource {
 	r := &oapi.Resource{
 		Id:          row.ID.String(),
 		Name:        row.Name,
@@ -70,7 +69,7 @@ func Resource(row db.GetResourceByIDRow) *oapi.Resource {
 	return r
 }
 
-func Policy(row db.Policy) *oapi.Policy {
+func ToOapiPolicy(row Policy) *oapi.Policy {
 	p := &oapi.Policy{
 		Id:          row.ID.String(),
 		Name:        row.Name,
@@ -89,7 +88,7 @@ func Policy(row db.Policy) *oapi.Policy {
 	return p
 }
 
-func UserApprovalRecord(row db.UserApprovalRecord) *oapi.UserApprovalRecord {
+func ToOapiUserApprovalRecord(row UserApprovalRecord) *oapi.UserApprovalRecord {
 	r := &oapi.UserApprovalRecord{
 		VersionId:     row.VersionID.String(),
 		UserId:        row.UserID.String(),
@@ -105,7 +104,7 @@ func UserApprovalRecord(row db.UserApprovalRecord) *oapi.UserApprovalRecord {
 	return r
 }
 
-func PolicySkip(row db.PolicySkip) *oapi.PolicySkip {
+func ToOapiPolicySkip(row PolicySkip) *oapi.PolicySkip {
 	s := &oapi.PolicySkip{
 		Id:        row.ID.String(),
 		CreatedBy: row.CreatedBy,
@@ -131,7 +130,7 @@ func PolicySkip(row db.PolicySkip) *oapi.PolicySkip {
 	return s
 }
 
-func DeploymentVariable(row db.DeploymentVariable) oapi.DeploymentVariable {
+func ToOapiDeploymentVariable(row DeploymentVariable) oapi.DeploymentVariable {
 	v := oapi.DeploymentVariable{
 		Id:           row.ID.String(),
 		DeploymentId: row.DeploymentID.String(),
@@ -149,7 +148,7 @@ func DeploymentVariable(row db.DeploymentVariable) oapi.DeploymentVariable {
 	return v
 }
 
-func DeploymentVariableValue(row db.DeploymentVariableValue) oapi.DeploymentVariableValue {
+func ToOapiDeploymentVariableValue(row DeploymentVariableValue) oapi.DeploymentVariableValue {
 	v := oapi.DeploymentVariableValue{
 		Id:                   row.ID.String(),
 		DeploymentVariableId: row.DeploymentVariableID.String(),
@@ -167,7 +166,7 @@ func DeploymentVariableValue(row db.DeploymentVariableValue) oapi.DeploymentVari
 	return v
 }
 
-func ResourceVariable(row db.ResourceVariable) oapi.ResourceVariable {
+func ToOapiResourceVariable(row ResourceVariable) oapi.ResourceVariable {
 	v := oapi.ResourceVariable{
 		ResourceId: row.ResourceID.String(),
 		Key:        row.Key,
@@ -178,7 +177,37 @@ func ResourceVariable(row db.ResourceVariable) oapi.ResourceVariable {
 	return v
 }
 
-func DeploymentVersion(row db.DeploymentVersion) *oapi.DeploymentVersion {
+func ToOapiSystem(row System) *oapi.System {
+	s := &oapi.System{
+		Id:          row.ID.String(),
+		Name:        row.Name,
+		WorkspaceId: row.WorkspaceID.String(),
+	}
+	if row.Description != "" {
+		s.Description = &row.Description
+	}
+	return s
+}
+
+func ToOapiRelease(row Release) *oapi.Release {
+	var createdAt string
+	if row.CreatedAt.Valid {
+		createdAt = row.CreatedAt.Time.Format("2006-01-02T15:04:05Z07:00")
+	}
+	return &oapi.Release{
+		Id:        row.ID,
+		CreatedAt: createdAt,
+		ReleaseTarget: oapi.ReleaseTarget{
+			ResourceId:    row.ResourceID.String(),
+			EnvironmentId: row.EnvironmentID.String(),
+			DeploymentId:  row.DeploymentID.String(),
+		},
+		EncryptedVariables: []string{},
+		Variables:          map[string]oapi.LiteralValue{},
+	}
+}
+
+func ToOapiDeploymentVersion(row DeploymentVersion) *oapi.DeploymentVersion {
 	v := &oapi.DeploymentVersion{
 		Id:             row.ID.String(),
 		Name:           row.Name,
@@ -197,3 +226,60 @@ func DeploymentVersion(row db.DeploymentVersion) *oapi.DeploymentVersion {
 	}
 	return v
 }
+
+func ToOapiJob(row ListJobsByReleaseIDRow) *oapi.Job {
+	j := &oapi.Job{
+		Id:        row.ID.String(),
+		Status:    oapi.JobStatus(row.Status),
+		ReleaseId: row.ReleaseID.String(),
+	}
+	if row.CreatedAt.Valid {
+		j.CreatedAt = row.CreatedAt.Time
+	}
+	if row.CompletedAt.Valid {
+		t := row.CompletedAt.Time
+		j.CompletedAt = &t
+	}
+	if row.StartedAt.Valid {
+		t := row.StartedAt.Time
+		j.StartedAt = &t
+	}
+	if row.UpdatedAt.Valid {
+		j.UpdatedAt = row.UpdatedAt.Time
+	}
+	if row.ExternalID.Valid {
+		j.ExternalId = &row.ExternalID.String
+	}
+	if row.Message.Valid {
+		j.Message = &row.Message.String
+	}
+	if row.JobAgentID.Valid {
+		j.JobAgentId = uuid.UUID(row.JobAgentID.Bytes).String()
+	}
+	if len(row.JobAgentConfig) > 0 {
+		var cfg oapi.JobAgentConfig
+		if err := json.Unmarshal(row.JobAgentConfig, &cfg); err == nil {
+			j.JobAgentConfig = cfg
+		}
+	}
+	j.Metadata = parseJobMetadata(row.Metadata)
+	return j
+}
+
+func parseJobMetadata(raw []byte) map[string]string {
+	if len(raw) == 0 {
+		return map[string]string{}
+	}
+	var items []struct {
+		Key   string `json:"key"`
+		Value string `json:"value"`
+	}
+	if err := json.Unmarshal(raw, &items); err != nil {
+		return map[string]string{}
+	}
+	result := make(map[string]string, len(items))
+	for _, item := range items {
+		result[item.Key] = item.Value
+	}
+	return result
+}

apps/workspace-engine/pkg/oapi/oapi.gen.go

@@ -0,0 +1,49 @@
+package store
+
+import (
+	"context"
+	"fmt"
+	"workspace-engine/pkg/db"
+	"workspace-engine/pkg/oapi"
+	legacystore "workspace-engine/pkg/workspace/store"
+
+	"github.com/google/uuid"
+)
+
+type DeploymentGetter interface {
+	GetDeployment(ctx context.Context, deploymentID string) (*oapi.Deployment, error)
+}
+
+var _ DeploymentGetter = (*PostgresDeploymentGetter)(nil)
+
+type PostgresDeploymentGetter struct {
+	queries *db.Queries
+}
+
+func NewPostgresDeploymentGetter(queries *db.Queries) *PostgresDeploymentGetter {
+	return &PostgresDeploymentGetter{queries: queries}
+}
+
+func (g *PostgresDeploymentGetter) GetDeployment(ctx context.Context, deploymentID string) (*oapi.Deployment, error) {
+	deployment, err := g.queries.GetDeploymentByID(ctx, uuid.MustParse(deploymentID))
+	if err != nil {
+		return nil, err
+	}
+	return db.ToOapiDeployment(deployment), nil
+}
+
+type StoreDeploymentGetter struct {
+	store *legacystore.Store
+}
+
+func NewStoreDeploymentGetter(store *legacystore.Store) *StoreDeploymentGetter {
+	return &StoreDeploymentGetter{store: store}
+}
+
+func (s *StoreDeploymentGetter) GetDeployment(ctx context.Context, deploymentID string) (*oapi.Deployment, error) {
+	deployment, ok := s.store.Deployments.Get(deploymentID)
+	if !ok {
+		return nil, fmt.Errorf("deployment not found")
+	}
+	return deployment, nil
+}

apps/workspace-engine/pkg/store/deployment.go

@@ -0,0 +1,71 @@
+package store
+
+import (
+	"context"
+	"fmt"
+	"workspace-engine/pkg/db"
+	"workspace-engine/pkg/oapi"
+	legacystore "workspace-engine/pkg/workspace/store"
+
+	"github.com/google/uuid"
+)
+
+type EnvironmentGetter interface {
+	GetEnvironment(ctx context.Context, environmentID string) (*oapi.Environment, error)
+	GetAllEnvironments(ctx context.Context, workspaceID string) (map[string]*oapi.Environment, error)
+}
+
+var _ EnvironmentGetter = (*PostgresEnvironmentGetter)(nil)
+
+type PostgresEnvironmentGetter struct {
+	queries *db.Queries
+}
+
+func NewPostgresEnvironmentGetter(queries *db.Queries) *PostgresEnvironmentGetter {
+	return &PostgresEnvironmentGetter{queries: queries}
+}
+
+func (g *PostgresEnvironmentGetter) GetEnvironment(ctx context.Context, environmentID string) (*oapi.Environment, error) {
+	env, err := g.queries.GetEnvironmentByID(ctx, uuid.MustParse(environmentID))
+	if err != nil {
+		return nil, err
+	}
+	return db.ToOapiEnvironment(env), nil
+}
+
+func (g *PostgresEnvironmentGetter) GetAllEnvironments(ctx context.Context, workspaceID string) (map[string]*oapi.Environment, error) {
+	envs, err := g.queries.ListEnvironmentsByWorkspaceID(ctx, db.ListEnvironmentsByWorkspaceIDParams{
+		WorkspaceID: uuid.MustParse(workspaceID),
+	})
+	if err != nil {
+		return nil, err
+	}
+	result := make(map[string]*oapi.Environment, len(envs))
+	for _, env := range envs {
+		result[env.ID.String()] = db.ToOapiEnvironment(env)
+	}
+	return result, nil
+}
+
+var _ EnvironmentGetter = (*StoreEnvironmentGetter)(nil)
+
+type StoreEnvironmentGetter struct {
+	store *legacystore.Store
+}
+
+func NewStoreEnvironmentGetter(store *legacystore.Store) EnvironmentGetter {
+	return &StoreEnvironmentGetter{store: store}
+}
+
+func (s *StoreEnvironmentGetter) GetEnvironment(ctx context.Context, environmentID string) (*oapi.Environment, error) {
+	env, ok := s.store.Environments.Get(environmentID)
+	if !ok {
+		return nil, fmt.Errorf("environment not found")
+	}
+	return env, nil
+}
+
+func (s *StoreEnvironmentGetter) GetAllEnvironments(ctx context.Context, _ string) (map[string]*oapi.Environment, error) {
+	envs := s.store.Environments.Items()
+	return envs, nil
+}