software-engineering/zitadel-k8s-operator
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always add member instead

Browse Source 
[ZITADOPER-5]
This commit is contained in:
Haim Kortovich
2024-07-25 12:53:50 -05:00
parent 569db609ee
commit bd9705ff99
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/internal/controller/organization_controller.go
View File

@@ -199,20 +199,6 @@ func (wr *wrappedOrganizationReconciler) reconcileInitialAdmin(ctx context.Conte
} }
} }
} }
if adminClient != nil {
{
if _, err := adminClient.AddIAMMember(ctx, &adm.AddIAMMemberRequest{
UserId: userid,
Roles: []string{
"IAM_OWNER",
},
}); err != nil {
if !strings.Contains(err.Error(), "RolesNotChanged") {
return fmt.Errorf("Error adding org member: %v", err)
}
}
}
}
} else { } else {
userid = adminUser.User.Id userid = adminUser.User.Id
@@ -231,6 +217,18 @@ func (wr *wrappedOrganizationReconciler) reconcileInitialAdmin(ctx context.Conte
} }
if adminClient != nil { if adminClient != nil {
{
if _, err := adminClient.AddIAMMember(ctx, &adm.AddIAMMemberRequest{
UserId: userid,
Roles: []string{
"IAM_OWNER",
},
}); err != nil {
if !strings.Contains(err.Error(), "RolesNotChanged") || !strings.Contains(err.Error(), "AlreadyExists") {
return fmt.Errorf("Error adding org member: %v", err)
}
}
}
{ {
if _, err := adminClient.UpdateIAMMember(ctx, &adm.UpdateIAMMemberRequest{ if _, err := adminClient.UpdateIAMMember(ctx, &adm.UpdateIAMMemberRequest{
UserId: userid, UserId: userid,