resolve conflicts with taskref now a pointer

Signed-off-by: Nader Ziada <nziada@pivotal.io>
tektoncd · Nov 29, 2018 · 3076f41 · 3076f41
1 parent a90a6e9
commit 3076f41
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/pkg/reconciler/v1alpha1/taskrun/resources/build_step_test.go b/pkg/reconciler/v1alpha1/taskrun/resources/build_step_test.go
@@ -34,7 +34,7 @@ func TestPostBuildSteps(t *testing.T) {
 			Namespace: "foo",
 		},
 		Spec: v1alpha1.TaskRunSpec{
-			TaskRef: v1alpha1.TaskRef{
+			TaskRef: &v1alpha1.TaskRef{
 				Name:       "",
 				APIVersion: "a1",
 			},
@@ -129,7 +129,7 @@ func TestPreBuildSteps(t *testing.T) {
 			Namespace: "foo",
 		},
 		Spec: v1alpha1.TaskRunSpec{
-			TaskRef: v1alpha1.TaskRef{
+			TaskRef: &v1alpha1.TaskRef{
 				Name:       "",
 				APIVersion: "a1",
 			},

diff --git a/pkg/reconciler/v1alpha1/taskrun/resources/input_resource_test.go b/pkg/reconciler/v1alpha1/taskrun/resources/input_resource_test.go
@@ -242,12 +242,13 @@ func TestAddResourceToBuild(t *testing.T) {
 				},
 			},
 			Spec: buildv1alpha1.BuildSpec{
-				Source: &buildv1alpha1.SourceSpec{
+				Sources: []buildv1alpha1.SourceSpec{{
+					Name: "the-git-with-branch",
 					Git: &buildv1alpha1.GitSourceSpec{
 						Url:      "https://github.com/grafeas/kritis",
 						Revision: "branch",
 					},
-				},
+				}},
 			},
 		},
 	}, {

diff --git a/pkg/reconciler/v1alpha1/taskrun/taskrun_test.go b/pkg/reconciler/v1alpha1/taskrun/taskrun_test.go
@@ -681,12 +681,13 @@ func TestReconcile(t *testing.T) {
 		name:    "taskrun-with-taskspec",
 		taskRun: taskruns[6],
 		wantedBuildSpec: buildv1alpha1.BuildSpec{
-			Source: &buildv1alpha1.SourceSpec{
+			Sources: []buildv1alpha1.SourceSpec{{
+				Name: "git-resource",
 				Git: &buildv1alpha1.GitSourceSpec{
 					Url:      "https://foo.git",
 					Revision: "master",
 				},
-			},
+			}},
 			Steps: []corev1.Container{
 				entrypointCopyStep,
 				{