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

Reformat project creation

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

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

@@ -123,12 +123,8 @@ func (wr *wrappedProjectReconciler) reconcileProject(ctx context.Context, ztdCli
return err return err
} }
if wr.project.Status.ProjectId != "" { if wr.project.Status.ProjectId != "" {
_, err := ztdClient.GetProjectByID(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.GetProjectByIDRequest{Id: wr.project.Status.ProjectId}) p, err := ztdClient.GetProjectByID(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.GetProjectByIDRequest{Id: wr.project.Status.ProjectId})
if err != nil { if p != nil {
if !strings.Contains(err.Error(), "not found") {
return fmt.Errorf("Error getting Project: %v", err)
}
} else {
_, err := ztdClient.UpdateProject(middleware.SetOrgID(ctx, org.Status.OrgId), _, err := ztdClient.UpdateProject(middleware.SetOrgID(ctx, org.Status.OrgId),
&pb.UpdateProjectRequest{ &pb.UpdateProjectRequest{
Id: wr.project.Status.ProjectId, Id: wr.project.Status.ProjectId,
@@ -145,7 +141,11 @@ func (wr *wrappedProjectReconciler) reconcileProject(ctx context.Context, ztdCli
} }
return nil return nil
} }
if err != nil {
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{
Name: wr.project.Name, Name: wr.project.Name,