removes build references from variables names

tektoncd · Apr 30, 2019 · 14d476b · 14d476b
1 parent 28eecf2
commit 14d476b
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/pkg/apis/pipeline/v1alpha1/task_validation_test.go b/pkg/apis/pipeline/v1alpha1/task_validation_test.go
@@ -31,21 +31,21 @@ var validResource = TaskResource{
 	Type: "git",
 }
 
-var validBuildSteps = []corev1.Container{{
+var validSteps = []corev1.Container{{
 	Name:  "mystep",
 	Image: "myimage",
 }}
 
-var invalidBuildSteps = []corev1.Container{{
+var invalidSteps = []corev1.Container{{
 	Name:  "replaceImage",
 	Image: "myimage",
 }}
 
 func TestTaskSpecValidate(t *testing.T) {
 	type fields struct {
-		Inputs     *Inputs
-		Outputs    *Outputs
-		BuildSteps []corev1.Container
+		Inputs  *Inputs
+		Outputs *Outputs
+		Steps   []corev1.Container
 	}
 	tests := []struct {
 		name   string
@@ -63,15 +63,15 @@ func TestTaskSpecValidate(t *testing.T) {
 					},
 				},
 			},
-			BuildSteps: validBuildSteps,
+			Steps: validSteps,
 		},
 	}, {
 		name: "valid outputs",
 		fields: fields{
 			Outputs: &Outputs{
 				Resources: []TaskResource{validResource},
 			},
-			BuildSteps: validBuildSteps,
+			Steps: validSteps,
 		},
 	}, {
 		name: "both valid",
@@ -82,7 +82,7 @@ func TestTaskSpecValidate(t *testing.T) {
 			Outputs: &Outputs{
 				Resources: []TaskResource{validResource},
 			},
-			BuildSteps: validBuildSteps,
+			Steps: validSteps,
 		},
 	}, {
 		name: "valid template variable",
@@ -101,7 +101,7 @@ func TestTaskSpecValidate(t *testing.T) {
 			Outputs: &Outputs{
 				Resources: []TaskResource{validResource},
 			},
-			BuildSteps: []corev1.Container{{
+			Steps: []corev1.Container{{
 				Name:       "mystep",
 				Image:      "${inputs.resources.foo.url}",
 				Args:       []string{"--flag=${inputs.params.baz} && ${input.params.foo-is-baz}"},
@@ -114,7 +114,7 @@ func TestTaskSpecValidate(t *testing.T) {
 			ts := &TaskSpec{
 				Inputs:  tt.fields.Inputs,
 				Outputs: tt.fields.Outputs,
-				Steps:   tt.fields.BuildSteps,
+				Steps:   tt.fields.Steps,
 			}
 			if err := ts.Validate(context.Background()); err != nil {
 				t.Errorf("TaskSpec.Validate() = %v", err)
@@ -125,9 +125,9 @@ func TestTaskSpecValidate(t *testing.T) {
 
 func TestTaskSpecValidateError(t *testing.T) {
 	type fields struct {
-		Inputs     *Inputs
-		Outputs    *Outputs
-		BuildSteps []corev1.Container
+		Inputs  *Inputs
+		Outputs *Outputs
+		Steps   []corev1.Container
 	}
 	tests := []struct {
 		name          string
@@ -167,7 +167,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 					validResource,
 				},
 			},
-			BuildSteps: validBuildSteps,
+			Steps: validSteps,
 		},
 		expectedError: apis.FieldError{
 			Message: `invalid value: what`,
@@ -190,7 +190,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 					validResource,
 				},
 			},
-			BuildSteps: validBuildSteps,
+			Steps: validSteps,
 		},
 		expectedError: apis.FieldError{
 			Message: `invalid value: what`,
@@ -210,7 +210,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 					validResource,
 				},
 			},
-			BuildSteps: validBuildSteps,
+			Steps: validSteps,
 		},
 		expectedError: apis.FieldError{
 			Message: "expected exactly one, got both",
@@ -230,7 +230,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 					validResource,
 				},
 			},
-			BuildSteps: validBuildSteps,
+			Steps: validSteps,
 		},
 		expectedError: apis.FieldError{
 			Message: "expected exactly one, got both",
@@ -242,7 +242,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 			Inputs: &Inputs{
 				Resources: []TaskResource{validResource},
 			},
-			BuildSteps: []corev1.Container{},
+			Steps: []corev1.Container{},
 		},
 		expectedError: apis.FieldError{
 			Message: "missing field(s)",
@@ -254,7 +254,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 			Inputs: &Inputs{
 				Resources: []TaskResource{validResource},
 			},
-			BuildSteps: invalidBuildSteps,
+			Steps: invalidSteps,
 		},
 		expectedError: apis.FieldError{
 			Message: `invalid value "replaceImage"`,
@@ -264,7 +264,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 	}, {
 		name: "inexistent input param variable",
 		fields: fields{
-			BuildSteps: []corev1.Container{{
+			Steps: []corev1.Container{{
 				Name:  "mystep",
 				Image: "myimage",
 				Args:  []string{"--flag=${inputs.params.inexistent}"},
@@ -277,7 +277,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 	}, {
 		name: "inexistent input resource variable",
 		fields: fields{
-			BuildSteps: []corev1.Container{{
+			Steps: []corev1.Container{{
 				Name:  "mystep",
 				Image: "myimage:${inputs.resources.inputs}",
 			}},
@@ -289,7 +289,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 	}, {
 		name: "inexistent output param variable",
 		fields: fields{
-			BuildSteps: []corev1.Container{{
+			Steps: []corev1.Container{{
 				Name:       "mystep",
 				Image:      "myimage",
 				WorkingDir: "/foo/bar/${outputs.resources.inexistent}",
@@ -311,7 +311,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 					},
 				},
 			},
-			BuildSteps: []corev1.Container{{
+			Steps: []corev1.Container{{
 				Name:  "mystep",
 				Image: "myimage",
 				Args:  []string{"${inputs.params.foo} && ${inputs.params.inexistent}"},
@@ -327,7 +327,7 @@ func TestTaskSpecValidateError(t *testing.T) {
 			ts := &TaskSpec{
 				Inputs:  tt.fields.Inputs,
 				Outputs: tt.fields.Outputs,
-				Steps:   tt.fields.BuildSteps,
+				Steps:   tt.fields.Steps,
 			}
 			err := ts.Validate(context.Background())
 			if err == nil {