milindcq/gh-84: pipelineID resolution fix for multi/mixed pipeline st…

…ages (#83) * remove faulty !hasChildPipelines check * Fix logging and a mock output --------- Co-authored-by: Milind Mistry <[email protected]>
Autodesk · Aug 10, 2023 · 6d5ad24 · 6d5ad24
1 parent 567fcf5
commit 6d5ad24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkg/backend/spinnaker/backend.go b/pkg/backend/spinnaker/backend.go
@@ -249,12 +249,12 @@ func (s *SpinClient) savePipeline(pipelineJSON string) (string, *http.Response,
 			return pipelineID, nil, wrappedErr
 		}
 
-		s.log.Info("Pipeline %q not found in application %q", pipelineName, application)
+		s.log.Infof("Pipeline %q not found in application %q", pipelineName, application)
 	}
 
 	// pipeline found, let's use Spinnaker's known Pipeline ID, otherwise we'll get one created for us
 	if len(foundPipeline) > 0 {
-		s.log.Info("Pipeline %q found with ID %q", foundPipeline["name"], foundPipeline["id"], application)
+		s.log.Infof("Pipeline %q found with ID %q in application %q", foundPipeline["name"], foundPipeline["id"], application)
 
 		pipeline["id"] = foundPipeline["id"].(string)
 		pipelineID = foundPipeline["id"].(string)
@@ -748,7 +748,7 @@ func (s *SpinClient) saveNestedPipeline(stages interface{}, pipeline map[string]
 			for _, stage := range childPipelineStages.([]interface{}) {
 				innerStage := stage.(map[string]interface{})
 
-				if !hasChildPipelines && mapContainsKey(innerStage, "application") && mapContainsKey(innerStage, "pipeline") && reflect.TypeOf(innerStage["pipeline"]).Kind() == reflect.String {
+				if mapContainsKey(innerStage, "application") && mapContainsKey(innerStage, "pipeline") && reflect.TypeOf(innerStage["pipeline"]).Kind() == reflect.String {
 					if response, result := s.findAndReplacePipelineNameWithFoundID(innerStage); response {
 						stage = result
 					}

diff --git a/pkg/backend/spinnaker/backend_mocks.go b/pkg/backend/spinnaker/backend_mocks.go
@@ -29,7 +29,8 @@ func (a *MockApplicationControllerAPI) GetPipelineConfigUsingGET(ctx context.Con
 		res = map[string]interface{}{}
 	} else {
 		res = map[string]interface{}{
-			"id": "1234",
+			"name": pipelineName,
+			"id":   "1234",
 		}
 	}