From 800eeca7ba39b9a708b4cdb15bdff63b230f23f7 Mon Sep 17 00:00:00 2001 From: Fabi <38692350+fgerschwiler@users.noreply.github.com> Date: Thu, 1 Apr 2021 10:14:07 +0200 Subject: [PATCH] fix: setup (#1515) * fix: setup uniqueness * fix: setup step done --- internal/command/setup.go | 3 +++ internal/repository/iam/events_step.go | 1 + 2 files changed, 4 insertions(+) diff --git a/internal/command/setup.go b/internal/command/setup.go index 7c829d672c..9989b713fb 100644 --- a/internal/command/setup.go +++ b/internal/command/setup.go @@ -93,6 +93,9 @@ func (c *Commands) setup(ctx context.Context, step Step, iamAggregateProvider fu events = append(events, iam_repo.NewSetupStepDoneEvent(ctx, iamAgg, step.Step())) _, err = c.eventstore.PushEvents(ctx, events...) + if caos_errs.IsErrorAlreadyExists(err) { + logging.LogWithFields("SETUP-4M9gsf", "step", step.Step()).WithError(err).Info("setup step already done") + } if err != nil { return caos_errs.ThrowPreconditionFailedf(nil, "EVENT-dbG31", "Setup %v failed", step.Step()) } diff --git a/internal/repository/iam/events_step.go b/internal/repository/iam/events_step.go index 0d505bdd9b..4705a5c762 100644 --- a/internal/repository/iam/events_step.go +++ b/internal/repository/iam/events_step.go @@ -82,6 +82,7 @@ func NewSetupStepDoneEvent( SetupDoneEventType, ), Step: step, + Done: true, } }