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

Add IAM_OWNER if its firstOrg admin

Browse Source 
[ZITADOPER-5]
This commit is contained in:
Haim Kortovich
2024-07-24 14:14:18 -05:00
parent 6f6fddaa5f
commit 0348cd6036
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,6 +159,12 @@ func (wr *wrappedOrganizationReconciler) reconcileInitialAdmin(ctx context.Conte
} }
} }
ctx = middleware.SetOrgID(ctx, wr.organization.Status.OrgId) ctx = middleware.SetOrgID(ctx, wr.organization.Status.OrgId)
roles := []string{
"ORG_OWNER",
}
if wr.organization.Name == zitadelCluster.Spec.FirstOrgName {
roles = append(roles, "IAM_OWNER")
}
var userid string var userid string
if adminUser == nil { if adminUser == nil {
resp, err := ztdClient.AddHumanUser(ctx, &pb.AddHumanUserRequest{ resp, err := ztdClient.AddHumanUser(ctx, &pb.AddHumanUserRequest{
@@ -179,9 +185,7 @@ func (wr *wrappedOrganizationReconciler) reconcileInitialAdmin(ctx context.Conte
{ {
if _, err := ztdClient.AddOrgMember(ctx, &pb.AddOrgMemberRequest{ if _, err := ztdClient.AddOrgMember(ctx, &pb.AddOrgMemberRequest{
UserId: userid, UserId: userid,
Roles: []string{ Roles: roles,
"ORG_OWNER",
},
}); err != nil { }); err != nil {
if !strings.Contains(err.Error(), "Errors.Org.Member.RolesNotChanged") { if !strings.Contains(err.Error(), "Errors.Org.Member.RolesNotChanged") {
return fmt.Errorf("Error adding org member: %v", err) return fmt.Errorf("Error adding org member: %v", err)
@@ -195,9 +199,7 @@ func (wr *wrappedOrganizationReconciler) reconcileInitialAdmin(ctx context.Conte
{ {
if _, err := ztdClient.UpdateOrgMember(ctx, &pb.UpdateOrgMemberRequest{ if _, err := ztdClient.UpdateOrgMember(ctx, &pb.UpdateOrgMemberRequest{
UserId: userid, UserId: userid,
Roles: []string{ Roles: roles,
"ORG_OWNER",
},
}); err != nil { }); err != nil {
if !strings.Contains(err.Error(), "Errors.Org.Member.RolesNotChanged") { if !strings.Contains(err.Error(), "Errors.Org.Member.RolesNotChanged") {
return fmt.Errorf("Error updating org member: %v", err) return fmt.Errorf("Error updating org member: %v", err)