Merge branch 'master' into new-eventstore

# Conflicts:
#	go.mod
#	internal/admin/repository/eventsourcing/eventstore/iam.go
#	internal/authz/repository/eventsourcing/repository.go
#	internal/eventstore/eventstore.go
#	internal/setup/config.go
#	pkg/grpc/management/mock/management.proto.mock.go
This commit is contained in:
Livio Amstutz
2021-01-05 09:27:42 +01:00
283 changed files with 7264 additions and 2500 deletions

View File

@@ -14,6 +14,7 @@ type IAMSetUp struct {
//Step6 *Step6
//Step7 *Step7
//Step8 *Step8
//Step9 *Step9
}
func (setup *IAMSetUp) steps(currentDone iam_model.Step) ([]stepV2, error) {
@@ -29,6 +30,7 @@ func (setup *IAMSetUp) steps(currentDone iam_model.Step) ([]stepV2, error) {
//setup.Step6,
//setup.Step7,
//setup.Step8,
//setup.Step9,
} {
if step.step() <= currentDone {
continue