Merge pull request #293 from nalind/process-targets

NewStages(): resolve stage names using ARGs

Author: openshift-merge-bot[bot]

builder.go

@@ -300,9 +300,25 @@ func NewStages(node *parser.Node, b *Builder) (Stages, error) {
 		if len(name) == 0 {
 			name = strconv.Itoa(i)
 		}
+		filteredUserArgs := make(map[string]string)
+		for k, v := range b.UserArgs {
+			for _, a := range b.GlobalAllowedArgs {
+				if a == k {
+					filteredUserArgs[k] = v
+				}
+			}
+		}
+		userArgs := envMapAsSlice(filteredUserArgs)
+		userArgs = mergeEnv(envMapAsSlice(b.BuiltinArgDefaults), userArgs)
+		userArgs = mergeEnv(envMapAsSlice(builtinArgDefaults), userArgs)
+		userArgs = mergeEnv(envMapAsSlice(b.HeadingArgs), userArgs)
+		processedName, err := ProcessWord(name, userArgs)
+		if err != nil {
+			return nil, err
+		}
 		stages = append(stages, Stage{
 			Position: i,
-			Name:     name,
+			Name:     processedName,
 			Builder:  b.builderForStage(headingArgs),
 			Node:     root,
 		})

builder_test.go

@@ -81,8 +81,8 @@ func TestByTarget(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(stages) != 3 {
-		t.Fatalf("expected 3 stages, got %d", len(stages))
+	if len(stages) != 4 {
+		t.Fatalf("expected 4 stages, got %d", len(stages))
 	}
 	t.Logf("stages: %#v", stages)
 
@@ -123,6 +123,25 @@ func TestByTarget(t *testing.T) {
 	}
 	t.Logf("stages4: %#v", stages4)
 	assert.Equal(t, stages4, stages2)
+
+	stages5, found := stages.ByTarget("mytarget3")
+	if !found {
+		t.Fatal("Fifth target not found")
+	}
+	if len(stages5) != 1 {
+		t.Fatalf("expected 1 stages, got %d", len(stages5))
+	}
+	t.Logf("stages5: %#v", stages5)
+
+	stages6, found := stages.ByTarget("3")
+	if !found {
+		t.Fatal("Sixth target not found")
+	}
+	if len(stages6) != 1 {
+		t.Fatalf("expected 1 stages, got %d", len(stages4))
+	}
+	t.Logf("stages6: %#v", stages6)
+	assert.Equal(t, stages6, stages5)
 }
 
 func TestThroughTarget(t *testing.T) {
@@ -134,8 +153,8 @@ func TestThroughTarget(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(stages) != 3 {
-		t.Fatalf("expected 3 stages, got %d", len(stages))
+	if len(stages) != 4 {
+		t.Fatalf("expected 4 stages, got %d", len(stages))
 	}
 	t.Logf("stages: %#v", stages)
 
@@ -176,6 +195,25 @@ func TestThroughTarget(t *testing.T) {
 	}
 	t.Logf("stages4: %#v", stages4)
 	assert.Equal(t, stages4, stages2)
+
+	stages5, found := stages.ThroughTarget("mytarget3")
+	if !found {
+		t.Fatal("Fifth target not found")
+	}
+	if len(stages5) != 4 {
+		t.Fatalf("expected 4 stages, got %d", len(stages5))
+	}
+	t.Logf("stages5: %#v", stages5)
+
+	stages6, found := stages.ThroughTarget("3")
+	if !found {
+		t.Fatal("Sixth target not found")
+	}
+	if len(stages6) != 4 {
+		t.Fatalf("expected 4 stages, got %d", len(stages4))
+	}
+	t.Logf("stages6: %#v", stages6)
+	assert.Equal(t, stages6, stages5)
 }
 
 func TestMultiStageParse(t *testing.T) {

dockerclient/testdata/Dockerfile.target

@@ -1,3 +1,5 @@
+ARG TARGET3=mytarget3
+
 FROM ubuntu:latest
 RUN touch /1
 
@@ -6,3 +8,6 @@ RUN touch /2
 
 FROM busybox:latest AS mytarget2 
 RUN touch /3
+
+FROM busybox:latest AS ${TARGET3}
+RUN touch /4