Skip to content

Commit a72df08

Browse files
committed
skip db deploy if not database in mu.yml
1 parent f82c6d2 commit a72df08

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

workflows/database_common.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,9 @@ func (workflow *databaseWorkflow) databaseInput(ctx *common.Context, serviceName
3535
return nil
3636
}
3737
}
38+
39+
func (workflow *databaseWorkflow) hasDatabase() Conditional {
40+
return func() bool {
41+
return workflow.databaseName != ""
42+
}
43+
}

workflows/database_upsert.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@ func NewDatabaseUpserter(ctx *common.Context, environmentName string) Executor {
2323

2424
return newPipelineExecutor(
2525
workflow.databaseInput(ctx, "", environmentName),
26-
workflow.databaseEnvironmentLoader(ctx.Config.Namespace, environmentName, ctx.StackManager, ecsImportParams, ctx.ElbManager),
27-
workflow.databaseRolesetUpserter(ctx.RolesetManager, ctx.RolesetManager, environmentName),
28-
workflow.databaseMasterPassword(ctx.Config.Namespace, &ctx.Config.Service, &ecsImportParams, environmentName, ctx.ParamManager, cliExtension),
29-
workflow.databaseDeployer(ctx.Config.Namespace, &ctx.Config.Service, ecsImportParams, environmentName, ctx.StackManager, ctx.StackManager, ctx.RdsManager),
26+
newConditionalExecutor(workflow.hasDatabase(),
27+
newPipelineExecutor(
28+
workflow.databaseEnvironmentLoader(ctx.Config.Namespace, environmentName, ctx.StackManager, ecsImportParams, ctx.ElbManager),
29+
workflow.databaseRolesetUpserter(ctx.RolesetManager, ctx.RolesetManager, environmentName),
30+
workflow.databaseMasterPassword(ctx.Config.Namespace, &ctx.Config.Service, &ecsImportParams, environmentName, ctx.ParamManager, cliExtension),
31+
workflow.databaseDeployer(ctx.Config.Namespace, &ctx.Config.Service, ecsImportParams, environmentName, ctx.StackManager, ctx.StackManager, ctx.RdsManager),
32+
),
33+
nil),
3034
)
3135
}
3236

workflows/pipeline_upsert.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ func NewPipelineUpserter(ctx *common.Context, tokenProvider func(bool) string) E
2828
return newPipelineExecutor(
2929
workflow.serviceFinder("", ctx),
3030
workflow.pipelineToken(ctx.Config.Namespace, tokenProvider, ctx.StackManager, stackParams),
31-
workflow.pipelineBucket(ctx.Config.Namespace, stackParams, ctx.StackManager, ctx.StackManager),
32-
workflow.codedeployBucket(ctx.Config.Namespace, &ctx.Config.Service, ctx.StackManager, ctx.StackManager),
31+
newParallelExecutor(
32+
workflow.pipelineBucket(ctx.Config.Namespace, stackParams, ctx.StackManager, ctx.StackManager),
33+
workflow.codedeployBucket(ctx.Config.Namespace, &ctx.Config.Service, ctx.StackManager, ctx.StackManager),
34+
),
3335
workflow.pipelineRolesetUpserter(ctx.RolesetManager, ctx.RolesetManager, stackParams),
3436
workflow.pipelineUpserter(ctx.Config.Namespace, ctx.StackManager, ctx.StackManager, stackParams),
3537
workflow.pipelineNotifyUpserter(ctx.Config.Namespace, &ctx.Config.Service.Pipeline, ctx.SubscriptionManager))

0 commit comments

Comments
 (0)