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

Fix key creation apiAPP

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-15 16:51:00 -05:00
parent 0c82e28fd2
commit 148d48e742
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal/controller/apiapp_controller.go
View File

@@ -198,14 +198,14 @@ func (wr *wrappedAPIAppReconciler) reconcileKeys(ctx context.Context, ztdClient
return err return err
} }
if wr.APIApp.Status.KeyId != "" { if wr.APIApp.Status.KeyId != "" {
_, err = ztdClient.GetAppKey(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.GetAppKeyRequest{ _, err := ztdClient.GetAppKey(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.GetAppKeyRequest{
ProjectId: project.Status.ProjectId, ProjectId: project.Status.ProjectId,
AppId: wr.APIApp.Status.AppId, AppId: wr.APIApp.Status.AppId,
KeyId: wr.APIApp.Status.KeyId, KeyId: wr.APIApp.Status.KeyId,
}) })
if err != nil { if err != nil {
if strings.Contains(err.Error(), "AlreadyExists") { if !strings.Contains(err.Error(), "not found") {
return nil return fmt.Errorf("Could not get key: %v", err)
} }
} }
} }

2
src/internal/controller/project_controller.go
View File

@@ -142,9 +142,11 @@ func (wr *wrappedProjectReconciler) reconcileProject(ctx context.Context, ztdCli
return nil return nil
} }
if err != nil { if err != nil {
if !strings.Contains(err.Error(), "not found") {
return fmt.Errorf("Error getting project: %v", err) return fmt.Errorf("Error getting project: %v", err)
} }
} }
}
resp, err := ztdClient.AddProject(middleware.SetOrgID(ctx, org.Status.OrgId), resp, err := ztdClient.AddProject(middleware.SetOrgID(ctx, org.Status.OrgId),
&pb.AddProjectRequest{ &pb.AddProjectRequest{