fix:[ASSMT-285]: Add Project Check for pipelines.go (#116)

harness · Apr 2, 2024 · 5b30b5c · 5b30b5c
1 parent 8395c52
commit 5b30b5c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/app.go b/app.go
@@ -88,19 +88,6 @@ func migrateSpinnakerApplication() error {
 	if len(pipelines) == 0 {
 		log.Info("No pipelines found to be migrated")
 		return nil
-	} else {
-		// Check if the project already exists for the given input project name in the given org
-		projects := getProjects()
-		id := findProjectIdByName(projects, migrationReq.ProjectIdentifier)
-
-		if len(id) > 0 {
-			log.Info("Project already exists with the given name")
-		} else {
-			log.Info("Creating project....")
-			if err := createAProject(migrationReq.OrgIdentifier, migrationReq.ProjectIdentifier, formatString(migrationReq.ProjectIdentifier)); err != nil {
-				log.Error(err)
-			}
-		}
 	}
 
 	payload := map[string][]map[string]interface{}{"pipelines": pipelines}

diff --git a/pipelines.go b/pipelines.go
@@ -378,6 +378,10 @@ func createSpinnakerPipelines(pipelines interface{}) (reqId string, err error) {
 		OrgIdentifier:     migrationReq.OrgIdentifier,
 		AccountIdentifier: migrationReq.Account,
 	}
+	err = CheckProjectExistsAndCreate()
+	if err != nil {
+		return "", err
+	}
 	j, err := json.MarshalIndent(pipelines, "", "  ")
 	if err != nil {
 		return "", fmt.Errorf("failed to marshal pipelines JSON: %v", err)

diff --git a/projects.go b/projects.go
@@ -340,3 +340,29 @@ func CreateProjectsUsingCSV() (err error) {
 	}
 	return
 }
+
+func CheckProjectExistsAndCreate() error {
+	if len(migrationReq.ProjectIdentifier) == 0 {
+		migrationReq.ProjectIdentifier = TextInput("Identifier for the Project - ")
+	}
+
+	log.WithFields(log.Fields{
+		"Account":           migrationReq.Account,
+		"OrgIdentifier":     migrationReq.OrgIdentifier,
+		"ProjectIdentifier": migrationReq.ProjectIdentifier,
+	}).Info("Project check details : ")
+
+	projects := getProjects()
+	id := findProjectIdByName(projects, migrationReq.ProjectIdentifier)
+
+	if len(id) > 0 {
+		log.Infof("Project with identifier %s exists", migrationReq.ProjectIdentifier)
+	} else {
+		log.Infof("Project with identifier %s does not exist", migrationReq.ProjectIdentifier)
+		if err := createAProject(migrationReq.OrgIdentifier, migrationReq.ProjectIdentifier, formatString(migrationReq.ProjectIdentifier)); err != nil {
+			log.Error(err)
+		}
+		log.Infof("Project with identifier %s created", migrationReq.ProjectIdentifier)
+	}
+	return nil
+}