Fix to avoid Triggers Runtime to override back to default with empty value {}

Author: sandrogattuso

client/pipeline.go

@@ -35,24 +35,24 @@ type SpecTemplate struct {
 }
 
 type Trigger struct {
-	Name                         string             `json:"name,omitempty"`
-	Description                  string             `json:"description,omitempty"`
-	Type                         string             `json:"type,omitempty"`
-	Repo                         string             `json:"repo,omitempty"`
-	Events                       []string           `json:"events,omitempty"`
-	BranchRegex                  string             `json:"branchRegex,omitempty"`
-	BranchRegexInput             string             `json:"branchRegexInput,omitempty"`
-	PullRequestTargetBranchRegex string             `json:"pullRequestTargetBranchRegex,omitempty"`
-	CommentRegex                 string             `json:"commentRegex,omitempty"`
-	ModifiedFilesGlob            string             `json:"modifiedFilesGlob,omitempty"`
-	Provider                     string             `json:"provider,omitempty"`
-	Disabled                     bool               `json:"disabled,omitempty"`
-	PullRequestAllowForkEvents   bool               `json:"pullRequestAllowForkEvents,omitempty"`
-	CommitStatusTitle            string             `json:"commitStatusTitle,omitempty"`
-	Context                      string             `json:"context,omitempty"`
-	Contexts                     []string           `json:"contexts,omitempty"`
-	RuntimeEnvironment           RuntimeEnvironment `json:"runtimeEnvironment,omitempty"`
-	Variables                    []Variable         `json:"variables,omitempty"`
+	Name                         string              `json:"name,omitempty"`
+	Description                  string              `json:"description,omitempty"`
+	Type                         string              `json:"type,omitempty"`
+	Repo                         string              `json:"repo,omitempty"`
+	Events                       []string            `json:"events,omitempty"`
+	BranchRegex                  string              `json:"branchRegex,omitempty"`
+	BranchRegexInput             string              `json:"branchRegexInput,omitempty"`
+	PullRequestTargetBranchRegex string              `json:"pullRequestTargetBranchRegex,omitempty"`
+	CommentRegex                 string              `json:"commentRegex,omitempty"`
+	ModifiedFilesGlob            string              `json:"modifiedFilesGlob,omitempty"`
+	Provider                     string              `json:"provider,omitempty"`
+	Disabled                     bool                `json:"disabled,omitempty"`
+	PullRequestAllowForkEvents   bool                `json:"pullRequestAllowForkEvents,omitempty"`
+	CommitStatusTitle            string              `json:"commitStatusTitle,omitempty"`
+	Context                      string              `json:"context,omitempty"`
+	Contexts                     []string            `json:"contexts,omitempty"`
+	RuntimeEnvironment           *RuntimeEnvironment `json:"runtimeEnvironment,omitempty"`
+	Variables                    []Variable          `json:"variables,omitempty"`
 }
 
 type RuntimeEnvironment struct {

codefresh/resource_pipeline.go

@@ -444,8 +444,8 @@ func flattenTriggers(triggers []cfClient.Trigger) []map[string]interface{} {
 		m["type"] = trigger.Type
 		m["events"] = trigger.Events
 		m["variables"] = convertVariables(trigger.Variables)
-		if trigger.RuntimeEnvironment != (cfClient.RuntimeEnvironment{}) {
-			m["runtime_environment"] = flattenSpecRuntimeEnvironment(trigger.RuntimeEnvironment)
+		if trigger.RuntimeEnvironment != nil {
+			m["runtime_environment"] = flattenSpecRuntimeEnvironment(*trigger.RuntimeEnvironment)
 		}
 		res[i] = m
 	}
@@ -534,7 +534,7 @@ func mapResourceToPipeline(d *schema.ResourceData) *cfClient.Pipeline {
 				CPU:         d.Get(fmt.Sprintf("spec.0.trigger.%v.runtime_environment.0.cpu", idx)).(string),
 				DindStorage: d.Get(fmt.Sprintf("spec.0.trigger.%v.runtime_environment.0.dind_storage", idx)).(string),
 			}
-			codefreshTrigger.RuntimeEnvironment = triggerRuntime
+			codefreshTrigger.RuntimeEnvironment = &triggerRuntime
 		}
 		pipeline.Spec.Triggers = append(pipeline.Spec.Triggers, codefreshTrigger)
 	}