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

Use proper ctx in list user grants

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-20 18:46:09 -05:00
parent 7be04edf59
commit cec04d4703
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/internal/controller/machineuser_controller.go
View File

@@ -321,6 +321,7 @@ func (wr *wrappedMachineUserReconciler) reconcileUserGrants(ctx context.Context,
if err != nil { if err != nil {
return err return err
} }
ctx = middleware.SetOrgID(ctx, org.Status.OrgId)
existingUserGrants, err := ztdClient.ListUserGrants(ctx, &pb.ListUserGrantRequest{ existingUserGrants, err := ztdClient.ListUserGrants(ctx, &pb.ListUserGrantRequest{
Queries: []*user.UserGrantQuery{ Queries: []*user.UserGrantQuery{
{ {
@@ -335,7 +336,6 @@ func (wr *wrappedMachineUserReconciler) reconcileUserGrants(ctx context.Context,
if err != nil { if err != nil {
return fmt.Errorf("Error listing MachineUser grants: %v", err) return fmt.Errorf("Error listing MachineUser grants: %v", err)
} }
ctx = middleware.SetOrgID(ctx, org.Status.OrgId)
for _, userGrant := range wr.MachineUser.DeepCopy().Spec.UserGrants { for _, userGrant := range wr.MachineUser.DeepCopy().Spec.UserGrants {
userGrantedProject, err := wr.refResolver.ProjectRef(ctx, &userGrant.ProjectRef, wr.MachineUser.Namespace) userGrantedProject, err := wr.refResolver.ProjectRef(ctx, &userGrant.ProjectRef, wr.MachineUser.Namespace)
if err != nil { if err != nil {
@@ -373,7 +373,7 @@ func (wr *wrappedMachineUserReconciler) reconcileUserGrants(ctx context.Context,
} }
} }
if existingProjectGrant == nil { if existingProjectGrant == nil {
return fmt.Errorf("Error no project granted to user organization: %v", err) return fmt.Errorf("Error no project granted to user organization")
} }
if err = wr.PatchStatus(ctx, condition.SetPatOutOfDate); err != nil { if err = wr.PatchStatus(ctx, condition.SetPatOutOfDate); err != nil {
@@ -389,7 +389,6 @@ func (wr *wrappedMachineUserReconciler) reconcileUserGrants(ctx context.Context,
if err != nil { if err != nil {
return fmt.Errorf("Error Adding MachineUser grant: %v", err) return fmt.Errorf("Error Adding MachineUser grant: %v", err)
} }
} else { } else {
sort.Strings(existingUserGrant.RoleKeys) sort.Strings(existingUserGrant.RoleKeys)
sort.Strings(userGrant.RoleKeys) sort.Strings(userGrant.RoleKeys)