fix: propagation of attributes mode and fail_fast from originalYamlString

Author: sandrogattuso

client/pipeline.go

@@ -81,6 +81,7 @@ type Spec struct {
 	Steps              *Steps                   `json:"steps,omitempty"`
 	Stages             *Stages                  `json:"stages,omitempty"`
 	Mode               string                   `json:"mode,omitempty"`
+	FailFast           bool                     `json:"fail_fast,omitempty"`
 	RuntimeEnvironment RuntimeEnvironment       `json:"runtimeEnvironment,omitempty"`
 	TerminationPolicy  []map[string]interface{} `json:"terminationPolicy,omitempty"`
 }

codefresh/resource_pipeline.go

@@ -575,13 +575,7 @@ func mapResourceToPipeline(d *schema.ResourceData) *cfClient.Pipeline {
 			Context:  d.Get("spec.0.spec_template.0.context").(string),
 		}
 	} else {
-		stages, steps := extractStagesAndSteps(originalYamlString)
-		pipeline.Spec.Steps = &cfClient.Steps{
-			Steps: steps,
-		}
-		pipeline.Spec.Stages = &cfClient.Stages{
-			Stages: stages,
-		}
+		extractSpecAttributesFromOriginalYamlString(originalYamlString, pipeline)
 	}
 
 	if _, ok := d.GetOk("spec.0.runtime_environment"); ok {
@@ -659,24 +653,30 @@ func mapResourceToPipeline(d *schema.ResourceData) *cfClient.Pipeline {
 	return pipeline
 }
 
-// extractStagesAndSteps extracts the steps and stages from the original yaml string to enable propagation in the `Spec` attribute of the pipeline
+// extractSpecAttributesFromOriginalYamlString extracts the steps and stages from the original yaml string to enable propagation in the `Spec` attribute of the pipeline
 // We cannot leverage on the standard marshal/unmarshal because the steps attribute needs to maintain the order of elements
 // while by default the standard function doesn't do it because in JSON maps are unordered
-func extractStagesAndSteps(originalYamlString string) (stages, steps string) {
+func extractSpecAttributesFromOriginalYamlString(originalYamlString string, pipeline *cfClient.Pipeline) {
 	// Use mapSlice to preserve order of items from the YAML string
 	m := yaml.MapSlice{}
 	err := yaml.Unmarshal([]byte(originalYamlString), &m)
 	if err != nil {
 		log.Fatal("Unable to unmarshall original_yaml_string")
 	}
 
-	stages = "[]"
+	stages := "[]"
 	// Dynamically build JSON object for steps using String builder
 	stepsBuilder := strings.Builder{}
 	stepsBuilder.WriteString("{")
+	// Dynamically build JSON object for steps using String builder
+	hooksBuilder := strings.Builder{}
+	hooksBuilder.WriteString("{")
+
 	// Parse elements of the YAML string to extract Steps and Stages if defined
 	for _, item := range m {
-		if item.Key == "steps" {
+		key := item.Key.(string)
+		switch key {
+		case "steps":
 			switch x := item.Value.(type) {
 			default:
 				log.Fatalf("unsupported value type: %T", item.Value)
@@ -694,17 +694,28 @@ func extractStagesAndSteps(originalYamlString string) (stages, steps string) {
 					}
 				}
 			}
-		}
-		if item.Key == "stages" {
+		case "stages":
 			// For Stages we don't have ordering issue because it's a list
 			y, _ := yaml.Marshal(item.Value)
 			j2, _ := ghodss.YAMLToJSON(y)
 			stages = string(j2)
+		case "mode":
+			pipeline.Spec.Mode = item.Value.(string)
+		case "fail_fast":
+			pipeline.Spec.FailFast = item.Value.(bool)
+		default:
+			log.Printf("Unsupported entry %s", key)
 		}
 	}
 	stepsBuilder.WriteString("}")
-	steps = stepsBuilder.String()
-	return
+	steps := stepsBuilder.String()
+	pipeline.Spec.Steps = &cfClient.Steps{
+		Steps: steps,
+	}
+	pipeline.Spec.Stages = &cfClient.Stages{
+		Stages: stages,
+	}
+
 }
 
 func getSupportedTerminationPolicyAttributes(policy string) map[string]interface{} {

codefresh/resource_pipeline_test.go

@@ -165,7 +165,7 @@ func TestAccCodefreshPipeline_RuntimeEnvironment(t *testing.T) {
 func TestAccCodefreshPipeline_OriginalYamlString(t *testing.T) {
 	name := pipelineNamePrefix + acctest.RandString(10)
 	resourceName := "codefresh_pipeline.test"
-	originalYamlString := "version: \"1.0\"\nsteps:\n  test:\n    image: alpine:latest\n    commands:\n      - echo \"ACC tests\""
+	originalYamlString := "version: \"1.0\"\nfail_fast: false\nmode: parallel\nsteps:\n  test:\n    image: alpine:latest\n    commands:\n      - echo \"ACC tests\""
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },

codefresh/resource_step_types.go

@@ -382,7 +382,7 @@ func mapResourceToStepTypesVersions(d *schema.ResourceData) *cfClient.StepTypesV
 	return &stepTypesVersions
 }
 
-// extractStagesAndSteps extracts the steps and stages from the original yaml string to enable propagation in the `Spec` attribute of the pipeline
+// extractSteps extracts the steps and stages from the original yaml string to enable propagation in the `Spec` attribute of the pipeline
 // We cannot leverage on the standard marshal/unmarshal because the steps attribute needs to maintain the order of elements
 // while by default the standard function doesn't do it because in JSON maps are unordered
 func extractSteps(stepTypesYaml string) (steps *orderedmap.OrderedMap) {