[RP-1048] Make sure version & branch are overridden in inputs.

deliveroo · Apr 25, 2018 · 7fb9c45 · 7fb9c45
1 parent 159e735
commit 7fb9c45
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/cli/pipeline/pipeline_definition.go b/cli/pipeline/pipeline_definition.go
@@ -65,11 +65,19 @@ func (p *PipelineDefinitionStep) OverrideTag(tag string) {
 func (p *PipelineDefinitionStep) OverrideVersion(version string) {
 	if version != "" {
 		p.Version = version
+
+		for i := range p.Inputs {
+			p.Inputs[i].Version = version
+		}
 	}
 }
 
 func (p *PipelineDefinitionStep) OverrideBranch(branch string) {
 	if branch != "" {
 		p.Branch = branch
+
+		for i := range p.Inputs {
+			p.Inputs[i].Branch = branch
+		}
 	}
 }
diff --git a/cli/pipeline/pipeline_definition_test.go b/cli/pipeline/pipeline_definition_test.go
@@ -54,10 +54,14 @@ func TestOverrideVersion(t *testing.T) {
 		t.Errorf("Version is %s", pipeline.Steps[0].Version)
 	}
 
-	pipeline.Steps[0].OverrideVersion("foo")
+	pipeline.Steps[1].OverrideVersion("foo")
 
-	if pipeline.Steps[0].Version != "foo" {
-		t.Errorf("Version is %s", pipeline.Steps[0].Version)
+	if pipeline.Steps[1].Version != "foo" {
+		t.Errorf("Version is %s", pipeline.Steps[1].Version)
+	}
+
+	if pipeline.Steps[1].Inputs[0].Version != "foo" {
+		t.Errorf("Dependent input Version is %s", pipeline.Steps[1].Inputs[0].Version)
 	}
 }
 
@@ -74,9 +78,13 @@ func TestOverrideBranch(t *testing.T) {
 		t.Errorf("Branch is %s", pipeline.Steps[0].Branch)
 	}
 
-	pipeline.Steps[0].OverrideBranch("foo")
+	pipeline.Steps[1].OverrideBranch("foo")
 
-	if pipeline.Steps[0].Branch != "foo" {
-		t.Errorf("Branch is %s", pipeline.Steps[0].Branch)
+	if pipeline.Steps[1].Branch != "foo" {
+		t.Errorf("Branch is %s", pipeline.Steps[1].Branch)
+	}
+
+	if pipeline.Steps[1].Inputs[0].Branch != "foo" {
+		t.Errorf("Dependent input Branch is %s", pipeline.Steps[1].Inputs[0].Branch)
 	}
 }