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

Fix case where key already exists

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-15 17:05:10 -05:00
parent 148d48e742
commit 3795cbdca4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,7 +198,7 @@ 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{ appKey, 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,
@@ -208,6 +208,9 @@ func (wr *wrappedAPIAppReconciler) reconcileKeys(ctx context.Context, ztdClient
return fmt.Errorf("Could not get key: %v", err) return fmt.Errorf("Could not get key: %v", err)
} }
} }
if appKey.Key != nil {
return nil
}
} }
resp, err := ztdClient.AddAppKey(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.AddAppKeyRequest{ resp, err := ztdClient.AddAppKey(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.AddAppKeyRequest{
ProjectId: project.Status.ProjectId, ProjectId: project.Status.ProjectId,
@@ -231,7 +234,7 @@ func (wr *wrappedAPIAppReconciler) reconcileKeys(ctx context.Context, ztdClient
return fmt.Errorf("error building Secret: %v", err) return fmt.Errorf("error building Secret: %v", err)
} }
if err := wr.Create(ctx, secret); err != nil { if err := wr.Create(ctx, secret); err != nil {
return fmt.Errorf("error creating Client-secret Secret: %v", err) return fmt.Errorf("error creating private-key Secret: %v", err)
} }
patch := ctrlClient.MergeFrom(wr.APIApp.DeepCopy()) patch := ctrlClient.MergeFrom(wr.APIApp.DeepCopy())
wr.APIApp.Status.KeyId = resp.Id wr.APIApp.Status.KeyId = resp.Id