Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,11 @@ type PersistenceStore = trace.PersistenceStore

// New creates a new release manager for a workspace.
// traceStore must not be nil - panics if not provided.
func New(store *store.Store, traceStore PersistenceStore) *Manager {
func New(store *store.Store, traceStore PersistenceStore, verificationManager *verification.Manager) *Manager {
if traceStore == nil {
panic("traceStore cannot be nil - deployment tracing is mandatory")
}

verificationManager := verification.NewManager(store)
deploymentOrch := NewDeploymentOrchestrator(store, verificationManager)
stateCache := NewStateCache(store, deploymentOrch.Planner())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"workspace-engine/pkg/oapi"
"workspace-engine/pkg/statechange"
"workspace-engine/pkg/workspace/releasemanager/trace/spanstore"
"workspace-engine/pkg/workspace/releasemanager/verification"
"workspace-engine/pkg/workspace/store"

"github.com/google/uuid"
Expand All @@ -20,7 +21,8 @@ func setupTestManager(t *testing.T) (*Manager, *store.Store) {
cs := statechange.NewChangeSet[any]()
testStore := store.New("test-workspace", cs)
traceStore := spanstore.NewInMemoryStore()
manager := New(testStore, traceStore)
verificationManager := verification.NewManager(testStore)
manager := New(testStore, traceStore, verificationManager)
return manager, testStore
}

Expand Down
24 changes: 16 additions & 8 deletions apps/workspace-engine/pkg/workspace/workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"workspace-engine/pkg/workspace/releasemanager/policy/evaluator/environmentprogression"
"workspace-engine/pkg/workspace/releasemanager/trace"
"workspace-engine/pkg/workspace/releasemanager/trace/spanstore"
"workspace-engine/pkg/workspace/releasemanager/verification"
"workspace-engine/pkg/workspace/store"
)

Expand All @@ -31,31 +32,34 @@ func New(ctx context.Context, id string, options ...WorkspaceOption) *Workspace
option(ws)
}

ws.verificationManager = verification.NewManager(s)

// Create release manager with trace store (will panic if nil)
ws.releasemanager = releasemanager.New(s, ws.traceStore)
ws.releasemanager = releasemanager.New(s, ws.traceStore, ws.verificationManager)

reconcileFn := func(ctx context.Context, targets []*oapi.ReleaseTarget) error {
return ws.releasemanager.ReconcileTargets(ctx, targets, releasemanager.WithTrigger(trace.TriggerJobSuccess))
}

ws.actionOrchestrator = action.
NewOrchestrator(s).
RegisterAction(verificationaction.NewVerificationAction(ws.releasemanager.VerificationManager())).
RegisterAction(verificationaction.NewVerificationAction(ws.verificationManager)).
RegisterAction(deploymentdependency.NewDeploymentDependencyAction(s, reconcileFn)).
RegisterAction(environmentprogression.NewEnvironmentProgressionAction(s, reconcileFn)).
RegisterAction(rollback.NewRollbackAction(s, ws.releasemanager.VerificationManager()))
RegisterAction(rollback.NewRollbackAction(s, ws.verificationManager))

return ws
}

type Workspace struct {
ID string

changeset *statechange.ChangeSet[any]
store *store.Store
releasemanager *releasemanager.Manager
traceStore releasemanager.PersistenceStore
actionOrchestrator *action.Orchestrator
changeset *statechange.ChangeSet[any]
store *store.Store
verificationManager *verification.Manager
releasemanager *releasemanager.Manager
traceStore releasemanager.PersistenceStore
actionOrchestrator *action.Orchestrator
}

func (w *Workspace) ActionOrchestrator() *action.Orchestrator {
Expand All @@ -74,6 +78,10 @@ func (w *Workspace) ReleaseManager() *releasemanager.Manager {
return w.releasemanager
}

func (w *Workspace) VerificationManager() *verification.Manager {
return w.verificationManager
}

func (w *Workspace) DeploymentVersions() *store.DeploymentVersions {
return w.store.DeploymentVersions
}
Expand Down
Loading