Remove PipelineResource in the describe command test

This patch will remove PipelineResource in task, clustertask, pipeline, pipelinerun and eventlistener describe command tests and also will remove PipelineResource occurrences in e2e test Signed-off-by: Shiv Verma <shverma@redhat.com>
tektoncd · Apr 25, 2023 · 964ae54 · 964ae54
1 parent 422eab6
commit 964ae54
Show file tree

Hide file tree

Showing 43 changed files with 20 additions and 691 deletions.
diff --git a/pkg/cmd/pipeline/describe_test.go b/pkg/cmd/pipeline/describe_test.go
@@ -319,12 +319,6 @@ func TestPipelineDescribe_with_spec_resource_param_run_v1beta1(t *testing.T) {
 						},
 					},
 				},
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
 				Params: []v1beta1.ParamSpec{
 					{
 						Name:        "pipeline-param",
@@ -433,12 +427,6 @@ func TestPipelineDescribe_with_multiple_pipelineruns_v1beta1(t *testing.T) {
 						},
 					},
 				},
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
 				Params: []v1beta1.ParamSpec{
 					{
 						Name: "pipeline-param",
@@ -653,28 +641,6 @@ func TestPipelineDescribe_with_spec_multiple_resource_param_run_v1beta1(t *testi
 						},
 					},
 				},
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-					{
-						Name: "code",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-					{
-						Name: "code-image",
-						Type: v1beta1.PipelineResourceTypeImage,
-					},
-					{
-						Name: "artifact-image",
-						Type: v1beta1.PipelineResourceTypeImage,
-					},
-					{
-						Name: "repo",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
 				Params: []v1beta1.ParamSpec{
 					{
 						Name: "pipeline-param",
@@ -796,28 +762,6 @@ func TestPipelineDescribe_with_spec_multiple_resource_param_run_output_v1beta1(t
 						},
 					},
 				},
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-					{
-						Name: "code",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-					{
-						Name: "code-image",
-						Type: v1beta1.PipelineResourceTypeImage,
-					},
-					{
-						Name: "artifact-image",
-						Type: v1beta1.PipelineResourceTypeImage,
-					},
-					{
-						Name: "repo",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
 				Params: []v1beta1.ParamSpec{
 					{
 						Name: "pipeline-param",
@@ -919,14 +863,6 @@ func TestPipelineDescribe_custom_output_v1beta1(t *testing.T) {
 				Name:      "pipeline",
 				Namespace: "ns",
 			},
-			Spec: v1beta1.PipelineSpec{
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
-			},
 		},
 	}
 	namespaces := []*corev1.Namespace{
@@ -970,12 +906,6 @@ func TestPipelineDescribe_WithoutNameIfOnlyOnePipelinePresent_v1beta1(t *testing
 				Namespace: "ns",
 			},
 			Spec: v1beta1.PipelineSpec{
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
 				Tasks: []v1beta1.PipelineTask{
 					{
 						Name: "task-1",
@@ -1031,12 +961,6 @@ func TestPipelineDescribe_with_results_v1beta1(t *testing.T) {
 				Namespace: "ns",
 			},
 			Spec: v1beta1.PipelineSpec{
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
 				Tasks: []v1beta1.PipelineTask{
 					{
 						Name: "task-1",
@@ -1116,12 +1040,6 @@ func TestPipelineDescribe_with_workspaces_v1beta1(t *testing.T) {
 				Namespace: "ns",
 			},
 			Spec: v1beta1.PipelineSpec{
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
 				Tasks: []v1beta1.PipelineTask{
 					{
 						Name: "task-1",
@@ -1249,12 +1167,6 @@ func TestPipelineDescribe_with_OptionalWorkspaces_v1beta1(t *testing.T) {
 				Namespace: "ns",
 			},
 			Spec: v1beta1.PipelineSpec{
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
 				Tasks: []v1beta1.PipelineTask{
 					{
 						Name: "task-1",

diff --git a/pkg/cmd/pipeline/export_test.go b/pkg/cmd/pipeline/export_test.go
@@ -48,12 +48,6 @@ func TestPipelineExport_v1beta1(t *testing.T) {
 				UID:          "f54b8b67-ce52-4509-8a4a-f245b093b62e",
 			},
 			Spec: v1beta1.PipelineSpec{
-				Resources: []v1beta1.PipelineDeclaredResource{
-					{
-						Name: "name",
-						Type: v1beta1.PipelineResourceTypeGit,
-					},
-				},
 				Tasks: []v1beta1.PipelineTask{
 					{
 						Name: "task-1",

diff --git a/...pipeline/testdata/TestPipelineDescribe_WithoutNameIfOnlyOnePipelinePresent_v1beta1.golden b/...pipeline/testdata/TestPipelineDescribe_WithoutNameIfOnlyOnePipelinePresent_v1beta1.golden
@@ -1,7 +1,5 @@
 Name:        pipeline
 Namespace:   ns
-Annotations:
- tekton.dev/v1beta1Resources=[{"name":"name","type":"git"}]
 
 Tasks
 

diff --git a/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_OptionalWorkspaces_v1beta1.golden b/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_OptionalWorkspaces_v1beta1.golden
@@ -1,7 +1,5 @@
 Name:        pipeline
 Namespace:   ns
-Annotations:
- tekton.dev/v1beta1Resources=[{"name":"name","type":"git"}]
 
 Results
 

diff --git a/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_multiple_pipelineruns_v1beta1.golden b/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_multiple_pipelineruns_v1beta1.golden
@@ -1,8 +1,6 @@
 Name:          pipeline
 Namespace:     ns
 Description:   a test description
-Annotations:
- tekton.dev/v1beta1Resources=[{"name":"name","type":"git"}]
 
 Params
 

diff --git a/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_results_v1beta1.golden b/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_results_v1beta1.golden
@@ -1,7 +1,5 @@
 Name:        pipeline
 Namespace:   ns
-Annotations:
- tekton.dev/v1beta1Resources=[{"name":"name","type":"git"}]
 
 Results
 

diff --git a/...testdata/TestPipelineDescribe_with_spec_multiple_resource_param_run_output_v1beta1.golden b/...testdata/TestPipelineDescribe_with_spec_multiple_resource_param_run_output_v1beta1.golden
@@ -19,17 +19,6 @@ spec:
     type: string
   - name: rev-param2
     type: array
-  resources:
-  - name: name
-    type: git
-  - name: code
-    type: git
-  - name: code-image
-    type: image
-  - name: artifact-image
-    type: image
-  - name: repo
-    type: git
   tasks:
   - name: task
     params:

diff --git a/...peline/testdata/TestPipelineDescribe_with_spec_multiple_resource_param_run_v1beta1.golden b/...peline/testdata/TestPipelineDescribe_with_spec_multiple_resource_param_run_v1beta1.golden
@@ -1,7 +1,5 @@
 Name:        pipeline
 Namespace:   ns
-Annotations:
- tekton.dev/v1beta1Resources=[{"name":"name","type":"git"},{"name":"code","type":"git"},{"name":"code-image","type":"image"},{"name":"artifact-image","type":"image"},{"name":"repo","type":"git"}]
 
 Params
 

diff --git a/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_spec_resource_param_run_v1beta1.golden b/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_spec_resource_param_run_v1beta1.golden
@@ -1,8 +1,6 @@
 Name:          pipeline
 Namespace:     ns
 Description:   a test description
-Annotations:
- tekton.dev/v1beta1Resources=[{"name":"name","type":"git"}]
 
 Params
 

diff --git a/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_workspaces_v1beta1.golden b/pkg/cmd/pipeline/testdata/TestPipelineDescribe_with_workspaces_v1beta1.golden
@@ -1,7 +1,5 @@
 Name:        pipeline
 Namespace:   ns
-Annotations:
- tekton.dev/v1beta1Resources=[{"name":"name","type":"git"}]
 
 Results
 

diff --git a/pkg/cmd/pipeline/testdata/TestPipelineExport_v1beta1.golden b/pkg/cmd/pipeline/testdata/TestPipelineExport_v1beta1.golden
@@ -5,9 +5,6 @@ metadata:
     pipeline.dev: cli
   generateName: generate-name
 spec:
-  resources:
-  - name: name
-    type: git
   results:
   - description: This is a description for result 1
     name: result-1