Merge pull request #513 from kube-tarian/fix-crossplane-register-error

error handling while synching crossplane project to keep crossplane p…
kube-tarian · Jun 8, 2024 · 01f66af · 01f66af
2 parents 32df6aa + 7f7fa97
commit 01f66af
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/capten/agent/internal/api/plugin_crossplane_project_apis.go b/capten/agent/internal/api/plugin_crossplane_project_apis.go
@@ -40,15 +40,6 @@ func (a *Agent) RegisterCrossplaneProject(ctx context.Context, request *captenpl
 		}, nil
 	}
 
-	crossplaneProject.Status = string(model.CrossplaneProjectConfigurationOngoing)
-	if err := a.as.UpsertCrossplaneProject(crossplaneProject); err != nil {
-		a.log.Errorf("failed to Set Cluster Gitopts Project, %v", err)
-		return &captenpluginspb.RegisterCrossplaneProjectResponse{
-			Status:        captenpluginspb.StatusCode_INTERNAL_ERROR,
-			StatusMessage: "inserting data to Crossplane db got failed",
-		}, err
-	}
-
 	if ok, err := a.isProjectRegisteredWithArgoCD(ctx, crossplaneProject.GitProjectUrl); !ok && err == nil {
 		accessToken, userID, _, _, err := a.getGitProjectCredential(ctx, crossplaneProject.GitProjectId)
 		if err != nil {
@@ -83,6 +74,15 @@ func (a *Agent) RegisterCrossplaneProject(ctx context.Context, request *captenpl
 		}, nil
 	}
 
+	crossplaneProject.Status = string(model.CrossplaneProjectConfigurationOngoing)
+	if err := a.as.UpsertCrossplaneProject(crossplaneProject); err != nil {
+		a.log.Errorf("failed to Set Cluster Gitopts Project, %v", err)
+		return &captenpluginspb.RegisterCrossplaneProjectResponse{
+			Status:        captenpluginspb.StatusCode_INTERNAL_ERROR,
+			StatusMessage: "inserting data to Crossplane db got failed",
+		}, err
+	}
+
 	a.configureCrossplaneGitRepo(crossplaneProject, providers)
 	a.log.Infof("Crossplane Git project %s registration triggerred", request.Id)
 	return &captenpluginspb.RegisterCrossplaneProjectResponse{

diff --git a/capten/common-pkg/capten-store/crossplane_project.go b/capten/common-pkg/capten-store/crossplane_project.go
@@ -86,6 +86,7 @@ func (a *Store) updateCrossplaneProject() (*model.CrossplaneProject, error) {
 				ID:             1,
 				GitProjectID:   gitProjectUUID,
 				GitProjectURL:  crosplaneGitProject.ProjectUrl,
+				Status:         string(model.CrossplaneProjectAvailable),
 				LastUpdateTime: time.Now(),
 			}
 			err = a.dbClient.Create(&project)
@@ -106,7 +107,7 @@ func (a *Store) updateCrossplaneProject() (*model.CrossplaneProject, error) {
 
 	project := CrossplaneProject{GitProjectID: gitProjectUUID,
 		GitProjectURL:  crosplaneGitProject.ProjectUrl,
-		Status:         crossplaneProject.Status,
+		Status:         string(model.CrossplaneProjectAvailable),
 		LastUpdateTime: time.Now()}
 	err = a.dbClient.Update(&project, CrossplaneProject{ID: 1})
 	if err != nil {

diff --git a/capten/common-pkg/capten-store/tekton_projects.go b/capten/common-pkg/capten-store/tekton_projects.go
@@ -85,6 +85,7 @@ func (a *Store) updateTektonProject() (*model.TektonProject, error) {
 				ID:             1,
 				GitProjectID:   gitProjectUUID,
 				GitProjectURL:  tektonGitProject.ProjectUrl,
+				Status:         string(model.TektonProjectAvailable),
 				LastUpdateTime: time.Now(),
 			}
 			err = a.dbClient.Create(&project)
@@ -104,7 +105,7 @@ func (a *Store) updateTektonProject() (*model.TektonProject, error) {
 
 	project := TektonProject{GitProjectID: gitProjectUUID,
 		GitProjectURL:  tektonGitProject.ProjectUrl,
-		Status:         tektonProject.Status,
+		Status:         string(model.TektonProjectAvailable),
 		LastUpdateTime: time.Now()}
 	err = a.dbClient.Update(&project, TektonProject{ID: 1})
 	if err != nil {