diff --git a/go.mod b/go.mod index fd5abb77ec0..be6796fff03 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.13 require ( cloud.google.com/go v0.47.0 // indirect + cloud.google.com/go/storage v1.0.0 contrib.go.opencensus.io/exporter/stackdriver v0.12.8 // indirect github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher v0.0.0-20191203181535-308b93ad1f39 github.com/cloudevents/sdk-go/v2 v2.0.0-RC3 @@ -38,6 +39,7 @@ require ( golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect golang.org/x/tools v0.0.0-20200214144324-88be01311a71 // indirect gomodules.xyz/jsonpatch/v2 v2.1.0 + google.golang.org/api v0.15.0 google.golang.org/appengine v1.6.5 // indirect k8s.io/api v0.17.3 k8s.io/apiextensions-apiserver v0.17.3 // indirect diff --git a/pkg/apis/resource/resource.go b/pkg/apis/resource/resource.go index d633b58d507..db31523a8c8 100644 --- a/pkg/apis/resource/resource.go +++ b/pkg/apis/resource/resource.go @@ -33,20 +33,20 @@ import ( // FromType returns an instance of the correct PipelineResource object type which can be // used to add input and output containers as well as volumes to a TaskRun's pod in order to realize // a PipelineResource in a pod. -func FromType(r *resourcev1alpha1.PipelineResource, images pipeline.Images) (pipelinev1beta1.PipelineResourceInterface, error) { +func FromType(name string, r *resourcev1alpha1.PipelineResource, images pipeline.Images) (pipelinev1beta1.PipelineResourceInterface, error) { switch r.Spec.Type { case resourcev1alpha1.PipelineResourceTypeGit: - return git.NewResource(images.GitImage, r) + return git.NewResource(name, images.GitImage, r) case resourcev1alpha1.PipelineResourceTypeImage: - return image.NewResource(r) + return image.NewResource(name, r) case resourcev1alpha1.PipelineResourceTypeCluster: - return cluster.NewResource(images.KubeconfigWriterImage, r) + return cluster.NewResource(name, images.KubeconfigWriterImage, r) case resourcev1alpha1.PipelineResourceTypeStorage: - return storage.NewResource(images, r) + return storage.NewResource(name, images, r) case resourcev1alpha1.PipelineResourceTypePullRequest: - return pullrequest.NewResource(images.PRImage, r) + return pullrequest.NewResource(name, images.PRImage, r) case resourcev1alpha1.PipelineResourceTypeCloudEvent: - return cloudevent.NewResource(r) + return cloudevent.NewResource(name, r) } return nil, fmt.Errorf("%s is an invalid or unimplemented PipelineResource", r.Spec.Type) } diff --git a/pkg/apis/resource/v1alpha1/cloudevent/cloud_event_resource.go b/pkg/apis/resource/v1alpha1/cloudevent/cloud_event_resource.go index d2fcede62af..ece8912327d 100644 --- a/pkg/apis/resource/v1alpha1/cloudevent/cloud_event_resource.go +++ b/pkg/apis/resource/v1alpha1/cloudevent/cloud_event_resource.go @@ -35,7 +35,7 @@ type Resource struct { } // NewResource creates a new CloudEvent resource to pass to a Task -func NewResource(r *resource.PipelineResource) (*Resource, error) { +func NewResource(name string, r *resource.PipelineResource) (*Resource, error) { if r.Spec.Type != resource.PipelineResourceTypeCloudEvent { return nil, fmt.Errorf("cloudevent.Resource: Cannot create a Cloud Event resource from a %s Pipeline Resource", r.Spec.Type) } @@ -55,7 +55,7 @@ func NewResource(r *resource.PipelineResource) (*Resource, error) { return nil, fmt.Errorf("cloudevent.Resource: Need URI to be specified in order to create a CloudEvent resource %s", r.Name) } return &Resource{ - Name: r.Name, + Name: name, Type: r.Spec.Type, TargetURI: targetURI, }, nil diff --git a/pkg/apis/resource/v1alpha1/cloudevent/cloud_event_resource_test.go b/pkg/apis/resource/v1alpha1/cloudevent/cloud_event_resource_test.go index c008c04e283..a2916df0196 100644 --- a/pkg/apis/resource/v1alpha1/cloudevent/cloud_event_resource_test.go +++ b/pkg/apis/resource/v1alpha1/cloudevent/cloud_event_resource_test.go @@ -46,7 +46,7 @@ func TestNewResource_Invalid(t *testing.T) { }} for _, tc := range testcases { t.Run(tc.name, func(t *testing.T) { - _, err := cloudevent.NewResource(tc.pipelineResource) + _, err := cloudevent.NewResource("test-resource", tc.pipelineResource) if err == nil { t.Error("Expected error creating CloudEvent resource") } @@ -60,12 +60,12 @@ func TestNewResource_Valid(t *testing.T) { tb.PipelineResourceSpecParam("TargetURI", "http://fake-sink"), )) expectedResource := &cloudevent.Resource{ - Name: "cloud-event-resource-uri", + Name: "test-resource", TargetURI: "http://fake-sink", Type: resourcev1alpha1.PipelineResourceTypeCloudEvent, } - r, err := cloudevent.NewResource(pr) + r, err := cloudevent.NewResource("test-resource", pr) if err != nil { t.Fatalf("Unexpected error creating CloudEvent resource: %s", err) } diff --git a/pkg/apis/resource/v1alpha1/cluster/cluster_resource.go b/pkg/apis/resource/v1alpha1/cluster/cluster_resource.go index b07c7f5f7ed..b2b753eb4d9 100644 --- a/pkg/apis/resource/v1alpha1/cluster/cluster_resource.go +++ b/pkg/apis/resource/v1alpha1/cluster/cluster_resource.go @@ -61,14 +61,14 @@ type Resource struct { } // NewResource create a new k8s cluster resource to pass to a pipeline task -func NewResource(kubeconfigWriterImage string, r *resource.PipelineResource) (*Resource, error) { +func NewResource(name string, kubeconfigWriterImage string, r *resource.PipelineResource) (*Resource, error) { if r.Spec.Type != resource.PipelineResourceTypeCluster { return nil, fmt.Errorf("cluster.Resource: Cannot create a Cluster resource from a %s Pipeline Resource", r.Spec.Type) } clusterResource := Resource{ Type: r.Spec.Type, KubeconfigWriterImage: kubeconfigWriterImage, - Name: r.Name, + Name: name, } for _, param := range r.Spec.Params { switch { diff --git a/pkg/apis/resource/v1alpha1/cluster/cluster_resource_test.go b/pkg/apis/resource/v1alpha1/cluster/cluster_resource_test.go index 3ff785912b5..0c23b558baf 100644 --- a/pkg/apis/resource/v1alpha1/cluster/cluster_resource_test.go +++ b/pkg/apis/resource/v1alpha1/cluster/cluster_resource_test.go @@ -36,14 +36,14 @@ func TestNewClusterResource(t *testing.T) { want *cluster.Resource }{{ desc: "basic cluster resource", - resource: tb.PipelineResource("test-cluster-resource", tb.PipelineResourceSpec( + resource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec( resourcev1alpha1.PipelineResourceTypeCluster, tb.PipelineResourceSpecParam("url", "http://10.10.10.10"), tb.PipelineResourceSpecParam("cadata", "bXktY2x1c3Rlci1jZXJ0Cg"), tb.PipelineResourceSpecParam("token", "my-token"), )), want: &cluster.Resource{ - Name: "test-cluster-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeCluster, URL: "http://10.10.10.10", CAData: []byte("my-cluster-cert"), @@ -52,7 +52,7 @@ func TestNewClusterResource(t *testing.T) { }, }, { desc: "resource with password instead of token", - resource: tb.PipelineResource("test-cluster-resource", tb.PipelineResourceSpec( + resource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec( resourcev1alpha1.PipelineResourceTypeCluster, tb.PipelineResourceSpecParam("url", "http://10.10.10.10"), tb.PipelineResourceSpecParam("cadata", "bXktY2x1c3Rlci1jZXJ0Cg"), @@ -60,7 +60,7 @@ func TestNewClusterResource(t *testing.T) { tb.PipelineResourceSpecParam("password", "pass"), )), want: &cluster.Resource{ - Name: "test-cluster-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeCluster, URL: "http://10.10.10.10", CAData: []byte("my-cluster-cert"), @@ -70,7 +70,7 @@ func TestNewClusterResource(t *testing.T) { }, }, { desc: "resource with clientKeyData and clientCertificateData instead of token or password", - resource: tb.PipelineResource("test-cluster-resource", tb.PipelineResourceSpec( + resource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec( resourcev1alpha1.PipelineResourceTypeCluster, tb.PipelineResourceSpecParam("url", "http://10.10.10.10"), tb.PipelineResourceSpecParam("username", "user"), @@ -79,7 +79,7 @@ func TestNewClusterResource(t *testing.T) { tb.PipelineResourceSpecParam("clientCertificateData", "Y2xpZW50LWNlcnRpZmljYXRlLWRhdGE="), )), want: &cluster.Resource{ - Name: "test-cluster-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeCluster, URL: "http://10.10.10.10", Username: "user", @@ -90,13 +90,13 @@ func TestNewClusterResource(t *testing.T) { }, }, { desc: "set insecure flag to true when there is no cert", - resource: tb.PipelineResource("test-cluster-resource", tb.PipelineResourceSpec( + resource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec( resourcev1alpha1.PipelineResourceTypeCluster, tb.PipelineResourceSpecParam("url", "http://10.10.10.10"), tb.PipelineResourceSpecParam("token", "my-token"), )), want: &cluster.Resource{ - Name: "test-cluster-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeCluster, URL: "http://10.10.10.10", Token: "my-token", @@ -105,7 +105,7 @@ func TestNewClusterResource(t *testing.T) { }, }, { desc: "basic cluster resource with namespace", - resource: tb.PipelineResource("test-cluster-resource", tb.PipelineResourceSpec( + resource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec( resourcev1alpha1.PipelineResourceTypeCluster, tb.PipelineResourceSpecParam("url", "http://10.10.10.10"), tb.PipelineResourceSpecParam("cadata", "bXktY2x1c3Rlci1jZXJ0Cg"), @@ -113,7 +113,7 @@ func TestNewClusterResource(t *testing.T) { tb.PipelineResourceSpecParam("namespace", "my-namespace"), )), want: &cluster.Resource{ - Name: "test-cluster-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeCluster, URL: "http://10.10.10.10", CAData: []byte("my-cluster-cert"), @@ -123,14 +123,14 @@ func TestNewClusterResource(t *testing.T) { }, }, { desc: "basic resource with secrets", - resource: tb.PipelineResource("test-cluster-resource", tb.PipelineResourceSpec( + resource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec( resourcev1alpha1.PipelineResourceTypeCluster, tb.PipelineResourceSpecParam("url", "http://10.10.10.10"), tb.PipelineResourceSpecSecretParam("cadata", "secret1", "cadatakey"), tb.PipelineResourceSpecSecretParam("token", "secret1", "tokenkey"), )), want: &cluster.Resource{ - Name: "test-cluster-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeCluster, URL: "http://10.10.10.10", Secrets: []resourcev1alpha1.SecretParam{{ @@ -146,7 +146,7 @@ func TestNewClusterResource(t *testing.T) { }, }} { t.Run(c.desc, func(t *testing.T) { - got, err := cluster.NewResource("override-with-kubeconfig-writer:latest", c.resource) + got, err := cluster.NewResource("test-resource", "override-with-kubeconfig-writer:latest", c.resource) if err != nil { t.Errorf("Test: %q; TestNewClusterResource() error = %v", c.desc, err) } diff --git a/pkg/apis/resource/v1alpha1/git/git_resource.go b/pkg/apis/resource/v1alpha1/git/git_resource.go index f80adf26551..4aa7b3b5b8a 100644 --- a/pkg/apis/resource/v1alpha1/git/git_resource.go +++ b/pkg/apis/resource/v1alpha1/git/git_resource.go @@ -53,12 +53,12 @@ type Resource struct { } // NewResource creates a new git resource to pass to a Task -func NewResource(gitImage string, r *resource.PipelineResource) (*Resource, error) { +func NewResource(name, gitImage string, r *resource.PipelineResource) (*Resource, error) { if r.Spec.Type != resource.PipelineResourceTypeGit { return nil, fmt.Errorf("git.Resource: Cannot create a Git resource from a %s Pipeline Resource", r.Spec.Type) } gitResource := Resource{ - Name: r.Name, + Name: name, Type: r.Spec.Type, GitImage: gitImage, Submodules: true, diff --git a/pkg/apis/resource/v1alpha1/git/git_resource_test.go b/pkg/apis/resource/v1alpha1/git/git_resource_test.go index 1cd0dae1b00..a36ce703ed2 100644 --- a/pkg/apis/resource/v1alpha1/git/git_resource_test.go +++ b/pkg/apis/resource/v1alpha1/git/git_resource_test.go @@ -31,7 +31,7 @@ import ( ) func TestNewGitResource_Invalid(t *testing.T) { - if _, err := git.NewResource("override-with-git:latest", tb.PipelineResource("git-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGCS))); err == nil { + if _, err := git.NewResource("test-resource", "override-with-git:latest", tb.PipelineResource("git-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGCS))); err == nil { t.Error("Expected error creating Git resource") } } @@ -50,7 +50,7 @@ func TestNewGitResource_Valid(t *testing.T) { ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "test", @@ -65,13 +65,13 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "Without Revision", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "master", @@ -86,14 +86,14 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "With Refspec", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), tb.PipelineResourceSpecParam("Refspec", "refs/changes/22/222134"), ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "master", @@ -108,13 +108,13 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "Without Refspec", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "master", @@ -129,14 +129,14 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "With Submodules", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), tb.PipelineResourceSpecParam("Revision", "test"), ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "test", @@ -151,7 +151,7 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "Without Submodules", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), tb.PipelineResourceSpecParam("Revision", "test"), @@ -159,7 +159,7 @@ func TestNewGitResource_Valid(t *testing.T) { ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "test", @@ -174,7 +174,7 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "With positive depth", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), tb.PipelineResourceSpecParam("Revision", "test"), @@ -182,7 +182,7 @@ func TestNewGitResource_Valid(t *testing.T) { ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "test", @@ -197,7 +197,7 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "With zero depth", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), tb.PipelineResourceSpecParam("Revision", "test"), @@ -205,7 +205,7 @@ func TestNewGitResource_Valid(t *testing.T) { ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "test", @@ -220,7 +220,7 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "Without SSLVerify", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), tb.PipelineResourceSpecParam("Revision", "test"), @@ -229,7 +229,7 @@ func TestNewGitResource_Valid(t *testing.T) { ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "test", @@ -244,7 +244,7 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "With HTTPProxy", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), tb.PipelineResourceSpecParam("Revision", "test"), @@ -253,7 +253,7 @@ func TestNewGitResource_Valid(t *testing.T) { ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "test", @@ -268,7 +268,7 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "With HTTPSProxy", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), tb.PipelineResourceSpecParam("Revision", "test"), @@ -277,7 +277,7 @@ func TestNewGitResource_Valid(t *testing.T) { ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "test", @@ -292,7 +292,7 @@ func TestNewGitResource_Valid(t *testing.T) { }, }, { desc: "With NOProxy", - pipelineResource: tb.PipelineResource("git-resource", + pipelineResource: tb.PipelineResource("test-resource", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit, tb.PipelineResourceSpecParam("URL", "git@github.com:test/test.git"), tb.PipelineResourceSpecParam("Revision", "test"), @@ -301,7 +301,7 @@ func TestNewGitResource_Valid(t *testing.T) { ), ), want: &git.Resource{ - Name: "git-resource", + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypeGit, URL: "git@github.com:test/test.git", Revision: "test", @@ -316,7 +316,7 @@ func TestNewGitResource_Valid(t *testing.T) { }, }} { t.Run(tc.desc, func(t *testing.T) { - got, err := git.NewResource("override-with-git:latest", tc.pipelineResource) + got, err := git.NewResource("test-resource", "override-with-git:latest", tc.pipelineResource) if err != nil { t.Fatalf("Unexpected error creating Git resource: %s", err) } diff --git a/pkg/apis/resource/v1alpha1/image/image_resource.go b/pkg/apis/resource/v1alpha1/image/image_resource.go index 955928b7a8c..028edfb2b3e 100644 --- a/pkg/apis/resource/v1alpha1/image/image_resource.go +++ b/pkg/apis/resource/v1alpha1/image/image_resource.go @@ -35,12 +35,12 @@ type Resource struct { } // NewResource creates a new ImageResource from a PipelineResourcev1alpha1. -func NewResource(r *resourcev1alpha1.PipelineResource) (*Resource, error) { +func NewResource(name string, r *resourcev1alpha1.PipelineResource) (*Resource, error) { if r.Spec.Type != resourcev1alpha1.PipelineResourceTypeImage { return nil, fmt.Errorf("ImageResource: Cannot create an Image resource from a %s Pipeline Resource", r.Spec.Type) } ir := &Resource{ - Name: r.Name, + Name: name, Type: resourcev1alpha1.PipelineResourceTypeImage, } diff --git a/pkg/apis/resource/v1alpha1/image/image_resource_test.go b/pkg/apis/resource/v1alpha1/image/image_resource_test.go index 502af70110c..2b8be922d45 100644 --- a/pkg/apis/resource/v1alpha1/image/image_resource_test.go +++ b/pkg/apis/resource/v1alpha1/image/image_resource_test.go @@ -28,9 +28,9 @@ import ( ) func TestNewImageResource_Invalid(t *testing.T) { - r := tb.PipelineResource("git-resource", tb.PipelineResourceSpec(v1alpha1.PipelineResourceTypeGit)) + r := tb.PipelineResource("test-resource", tb.PipelineResourceSpec(v1alpha1.PipelineResourceTypeGit)) - _, err := image.NewResource(r) + _, err := image.NewResource("test-resource", r) if err == nil { t.Error("Expected error creating Image resource") } @@ -53,7 +53,7 @@ func TestNewImageResource_Valid(t *testing.T) { ), ) - got, err := image.NewResource(r) + got, err := image.NewResource("image-resource", r) if err != nil { t.Fatalf("Unexpected error creating Image resource: %s", err) } diff --git a/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource.go b/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource.go index 12a58767b89..7a045cf0c4d 100644 --- a/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource.go +++ b/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource.go @@ -54,12 +54,12 @@ type Resource struct { } // NewResource create a new git resource to pass to a Task -func NewResource(prImage string, r *resourcev1alpha1.PipelineResource) (*Resource, error) { +func NewResource(name, prImage string, r *resourcev1alpha1.PipelineResource) (*Resource, error) { if r.Spec.Type != resourcev1alpha1.PipelineResourceTypePullRequest { return nil, fmt.Errorf("cannot create a PR resource from a %s Pipeline Resource", r.Spec.Type) } prResource := Resource{ - Name: r.Name, + Name: name, Type: r.Spec.Type, Secrets: r.Spec.SecretParams, PRImage: prImage, diff --git a/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource_test.go b/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource_test.go index 456558d88ef..1250bf60fd5 100644 --- a/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource_test.go +++ b/pkg/apis/resource/v1alpha1/pullrequest/pull_request_resource_test.go @@ -38,13 +38,13 @@ func TestPullRequest_NewResource(t *testing.T) { tb.PipelineResourceSpecParam("provider", "github"), tb.PipelineResourceSpecSecretParam("authToken", "test-secret-key", "test-secret-name"), )) - got, err := pullrequest.NewResource("override-with-pr:latest", pr) + got, err := pullrequest.NewResource("test-resource", "override-with-pr:latest", pr) if err != nil { t.Fatalf("Error creating storage resource: %s", err.Error()) } want := &pullrequest.Resource{ - Name: pr.Name, + Name: "test-resource", Type: resourcev1alpha1.PipelineResourceTypePullRequest, URL: url, Provider: "github", @@ -59,7 +59,7 @@ func TestPullRequest_NewResource(t *testing.T) { func TestPullRequest_NewResource_error(t *testing.T) { pr := tb.PipelineResource("foo", tb.PipelineResourceSpec(resourcev1alpha1.PipelineResourceTypeGit)) - if _, err := pullrequest.NewResource("override-with-pr:latest", pr); err == nil { + if _, err := pullrequest.NewResource("test-resource", "override-with-pr:latest", pr); err == nil { t.Error("NewPullRequestResource() want error, got nil") } } diff --git a/pkg/apis/resource/v1alpha1/storage/build_gcs.go b/pkg/apis/resource/v1alpha1/storage/build_gcs.go index dc540230346..f3132d20613 100644 --- a/pkg/apis/resource/v1alpha1/storage/build_gcs.go +++ b/pkg/apis/resource/v1alpha1/storage/build_gcs.go @@ -71,7 +71,7 @@ type BuildGCSResource struct { } // NewBuildGCSResource creates a new BuildGCS resource to pass to a Task. -func NewBuildGCSResource(images pipeline.Images, r *resource.PipelineResource) (*BuildGCSResource, error) { +func NewBuildGCSResource(name string, images pipeline.Images, r *resource.PipelineResource) (*BuildGCSResource, error) { if r.Spec.Type != resource.PipelineResourceTypeStorage { return nil, fmt.Errorf("BuildGCSResource: Cannot create a BuildGCS resource from a %s Pipeline Resource", r.Spec.Type) } @@ -99,7 +99,7 @@ func NewBuildGCSResource(images pipeline.Images, r *resource.PipelineResource) ( return nil, fmt.Errorf("BuildGCSResource: Need ArtifactType to be specified to create BuildGCS resource %s", r.Name) } return &BuildGCSResource{ - Name: r.Name, + Name: name, Type: r.Spec.Type, Location: location, ArtifactType: aType, diff --git a/pkg/apis/resource/v1alpha1/storage/build_gcs_test.go b/pkg/apis/resource/v1alpha1/storage/build_gcs_test.go index 71c90a35e40..fde0185a9d4 100644 --- a/pkg/apis/resource/v1alpha1/storage/build_gcs_test.go +++ b/pkg/apis/resource/v1alpha1/storage/build_gcs_test.go @@ -95,7 +95,7 @@ func TestBuildGCSResource_Invalid(t *testing.T) { )), }} { t.Run(tc.name, func(t *testing.T) { - _, err := storage.NewResource(images, tc.pipelineResource) + _, err := storage.NewResource("test-resource", images, tc.pipelineResource) if err == nil { t.Error("Expected error creating BuildGCS resource") } @@ -111,7 +111,7 @@ func TestNewBuildGCSResource_Valid(t *testing.T) { tb.PipelineResourceSpecParam("ArtifactType", "Manifest"), )) expectedGCSResource := &storage.BuildGCSResource{ - Name: "build-gcs-resource", + Name: "test-resource", Location: "gs://fake-bucket", Type: resourcev1alpha1.PipelineResourceTypeStorage, ArtifactType: "Manifest", @@ -119,7 +119,7 @@ func TestNewBuildGCSResource_Valid(t *testing.T) { BuildGCSFetcherImage: "gcr.io/cloud-builders/gcs-fetcher:latest", } - r, err := storage.NewBuildGCSResource(images, pr) + r, err := storage.NewBuildGCSResource("test-resource", images, pr) if err != nil { t.Fatalf("Unexpected error creating BuildGCS resource: %s", err) } @@ -190,7 +190,7 @@ func TestBuildGCS_InvalidArtifactType(t *testing.T) { tb.PipelineResourceSpecParam("type", "build-gcs"), tb.PipelineResourceSpecParam("ArtifactType", "InVaLiD"), )) - if _, err := storage.NewBuildGCSResource(images, pr); err == nil { + if _, err := storage.NewBuildGCSResource("test-resource", images, pr); err == nil { t.Error("NewBuildGCSResource: expected error") } } diff --git a/pkg/apis/resource/v1alpha1/storage/gcs.go b/pkg/apis/resource/v1alpha1/storage/gcs.go index 4851c8857e4..21e2d1b1cbc 100644 --- a/pkg/apis/resource/v1alpha1/storage/gcs.go +++ b/pkg/apis/resource/v1alpha1/storage/gcs.go @@ -53,7 +53,7 @@ type GCSResource struct { } // NewGCSResource creates a new GCS resource to pass to a Task -func NewGCSResource(images pipeline.Images, r *resourcev1alpha1.PipelineResource) (*GCSResource, error) { +func NewGCSResource(name string, images pipeline.Images, r *resourcev1alpha1.PipelineResource) (*GCSResource, error) { if r.Spec.Type != resourcev1alpha1.PipelineResourceTypeStorage { return nil, fmt.Errorf("GCSResource: Cannot create a GCS resource from a %s Pipeline Resource", r.Spec.Type) } @@ -76,7 +76,7 @@ func NewGCSResource(images pipeline.Images, r *resourcev1alpha1.PipelineResource return nil, fmt.Errorf("GCSResource: Need Location to be specified in order to create GCS resource %s", r.Name) } return &GCSResource{ - Name: r.Name, + Name: name, Type: r.Spec.Type, Location: location, TypeDir: dir, diff --git a/pkg/apis/resource/v1alpha1/storage/gcs_test.go b/pkg/apis/resource/v1alpha1/storage/gcs_test.go index e9c14e6f500..8843d61ee3b 100644 --- a/pkg/apis/resource/v1alpha1/storage/gcs_test.go +++ b/pkg/apis/resource/v1alpha1/storage/gcs_test.go @@ -71,7 +71,7 @@ func TestInvalidNewStorageResource(t *testing.T) { ), }} { t.Run(tc.name, func(t *testing.T) { - _, err := storage.NewResource(images, tc.pipelineResource) + _, err := storage.NewResource("test-resource", images, tc.pipelineResource) if err == nil { t.Error("Expected error creating GCS resource") } @@ -88,7 +88,7 @@ func TestValidNewGCSResource(t *testing.T) { tb.PipelineResourceSpecSecretParam("GOOGLE_APPLICATION_CREDENTIALS", "secretName", "secretKey"), )) expectedGCSResource := &storage.GCSResource{ - Name: "gcs-resource", + Name: "test-resource", Location: "gs://fake-bucket", Type: resourcev1alpha1.PipelineResourceTypeStorage, TypeDir: true, @@ -101,7 +101,7 @@ func TestValidNewGCSResource(t *testing.T) { GsutilImage: "google/cloud-sdk", } - gcsRes, err := storage.NewGCSResource(images, pr) + gcsRes, err := storage.NewGCSResource("test-resource", images, pr) if err != nil { t.Fatalf("Unexpected error creating GCS resource: %s", err) } @@ -133,7 +133,7 @@ func TestGetParams(t *testing.T) { tb.PipelineResourceSpecParam("type", "gcs"), tb.PipelineResourceSpecSecretParam("test-field-name", "test-secret-name", "test-secret-key"), )) - gcsResource, err := storage.NewResource(images, pr) + gcsResource, err := storage.NewResource("test-resource", images, pr) if err != nil { t.Fatalf("Error creating storage resource: %s", err.Error()) } diff --git a/pkg/apis/resource/v1alpha1/storage/storage.go b/pkg/apis/resource/v1alpha1/storage/storage.go index 7a9149ada88..e3c0f445ca6 100644 --- a/pkg/apis/resource/v1alpha1/storage/storage.go +++ b/pkg/apis/resource/v1alpha1/storage/storage.go @@ -44,7 +44,7 @@ type PipelineStorageResourceInterface interface { // NewResource returns an instance of the requested storage subtype, which can be used // to add input and output steps and volumes to an executing pod. -func NewResource(images pipeline.Images, r *resource.PipelineResource) (PipelineStorageResourceInterface, error) { +func NewResource(name string, images pipeline.Images, r *resource.PipelineResource) (PipelineStorageResourceInterface, error) { if r.Spec.Type != v1beta1.PipelineResourceTypeStorage { return nil, fmt.Errorf("StoreResource: Cannot create a storage resource from a %s Pipeline Resource", r.Spec.Type) } @@ -53,9 +53,9 @@ func NewResource(images pipeline.Images, r *resource.PipelineResource) (Pipeline if strings.EqualFold(param.Name, "type") { switch { case strings.EqualFold(param.Value, string(resource.PipelineResourceTypeGCS)): - return NewGCSResource(images, r) + return NewGCSResource(name, images, r) case strings.EqualFold(param.Value, string(resource.PipelineResourceTypeBuildGCS)): - return NewBuildGCSResource(images, r) + return NewBuildGCSResource(name, images, r) default: return nil, fmt.Errorf("%s is an invalid or unimplemented PipelineStorageResource", param.Value) } diff --git a/pkg/reconciler/events/cloudevent/cloud_event_controller.go b/pkg/reconciler/events/cloudevent/cloud_event_controller.go index 2bb69dd20fc..523520273b5 100644 --- a/pkg/reconciler/events/cloudevent/cloud_event_controller.go +++ b/pkg/reconciler/events/cloudevent/cloud_event_controller.go @@ -31,13 +31,13 @@ import ( // InitializeCloudEvents initializes the CloudEvents part of the // TaskRunStatus from a slice of PipelineResources -func InitializeCloudEvents(tr *v1beta1.TaskRun, prs []*resource.PipelineResource) { +func InitializeCloudEvents(tr *v1beta1.TaskRun, prs map[string]*resource.PipelineResource) { // If there are no cloud event resources, this check will run on every reconcile if len(tr.Status.CloudEvents) == 0 { var targets []string - for _, output := range prs { + for name, output := range prs { if output.Spec.Type == resource.PipelineResourceTypeCloudEvent { - cer, _ := cloudevent.NewResource(output) + cer, _ := cloudevent.NewResource(name, output) targets = append(targets, cer.TargetURI) } } diff --git a/pkg/reconciler/events/cloudevent/cloud_event_controller_test.go b/pkg/reconciler/events/cloudevent/cloud_event_controller_test.go index f48cf96d055..645f519f6fd 100644 --- a/pkg/reconciler/events/cloudevent/cloud_event_controller_test.go +++ b/pkg/reconciler/events/cloudevent/cloud_event_controller_test.go @@ -249,7 +249,11 @@ func TestInitializeCloudEvents(t *testing.T) { }} for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { - InitializeCloudEvents(tc.taskRun, tc.pipelineResources) + prMap := map[string]*resourcev1alpha1.PipelineResource{} + for _, pr := range tc.pipelineResources { + prMap[pr.Name] = pr + } + InitializeCloudEvents(tc.taskRun, prMap) opts := GetCloudEventDeliveryCompareOptions() if d := cmp.Diff(tc.wantTaskRun.Status, tc.taskRun.Status, opts...); d != "" { t.Errorf("Wrong Cloud Events Status %s", diff.PrintWantGot(d)) diff --git a/pkg/reconciler/pipelinerun/resources/conditionresolution.go b/pkg/reconciler/pipelinerun/resources/conditionresolution.go index fe319985e1b..973988b1d07 100644 --- a/pkg/reconciler/pipelinerun/resources/conditionresolution.go +++ b/pkg/reconciler/pipelinerun/resources/conditionresolution.go @@ -140,7 +140,7 @@ func ApplyResourceSubstitution(step *v1beta1.Step, resolvedResources map[string] replacements := make(map[string]string) for _, cr := range conditionResources { if rSpec, ok := resolvedResources[cr.Name]; ok { - r, err := resource.FromType(rSpec, images) + r, err := resource.FromType(cr.Name, rSpec, images) if err != nil { return fmt.Errorf("error trying to create resource: %w", err) } diff --git a/pkg/reconciler/taskrun/resources/apply_test.go b/pkg/reconciler/taskrun/resources/apply_test.go index 3fd2acc1ef6..e5b3504a745 100644 --- a/pkg/reconciler/taskrun/resources/apply_test.go +++ b/pkg/reconciler/taskrun/resources/apply_test.go @@ -345,7 +345,7 @@ var ( "bucket": gcsResource, } - gitResource, _ = resource.FromType(&resourcev1alpha1.PipelineResource{ + gitResource, _ = resource.FromType("git-resource", &resourcev1alpha1.PipelineResource{ ObjectMeta: metav1.ObjectMeta{ Name: "git-resource", }, @@ -358,7 +358,7 @@ var ( }, }, images) - imageResource, _ = resource.FromType(&resourcev1alpha1.PipelineResource{ + imageResource, _ = resource.FromType("image-resource", &resourcev1alpha1.PipelineResource{ ObjectMeta: metav1.ObjectMeta{ Name: "image-resource", }, @@ -371,7 +371,7 @@ var ( }, }, images) - gcsResource, _ = resource.FromType(&resourcev1alpha1.PipelineResource{ + gcsResource, _ = resource.FromType("gcs-resource", &resourcev1alpha1.PipelineResource{ ObjectMeta: metav1.ObjectMeta{ Name: "gcs-resource", }, diff --git a/pkg/reconciler/taskrun/resources/image_exporter.go b/pkg/reconciler/taskrun/resources/image_exporter.go index c2c3a3a1b9e..f9b19a9568f 100644 --- a/pkg/reconciler/taskrun/resources/image_exporter.go +++ b/pkg/reconciler/taskrun/resources/image_exporter.go @@ -50,7 +50,7 @@ func AddOutputImageDigestExporter( return fmt.Errorf("failed to get output pipeline Resource for taskRun %q resource %v; error: %w while adding output image digest exporter", tr.Name, boundResource, err) } if resource.Spec.Type == v1beta1.PipelineResourceTypeImage { - imageResource, err := image.NewResource(resource) + imageResource, err := image.NewResource(trb.Name, resource) if err != nil { return fmt.Errorf("invalid Image Resource for taskRun %q resource %v; error: %w", tr.Name, boundResource, err) } diff --git a/pkg/reconciler/taskrun/resources/image_exporter_test.go b/pkg/reconciler/taskrun/resources/image_exporter_test.go index 98eb9baac1d..f90cea50988 100644 --- a/pkg/reconciler/taskrun/resources/image_exporter_test.go +++ b/pkg/reconciler/taskrun/resources/image_exporter_test.go @@ -93,7 +93,7 @@ func TestAddOutputImageDigestExporter(t *testing.T) { Name: "image-digest-exporter-9l9zj", Image: "override-with-imagedigest-exporter-image:latest", Command: []string{"/ko-app/imagedigestexporter"}, - Args: []string{"-images", "[{\"name\":\"source-image-1\",\"type\":\"image\",\"url\":\"gcr.io/some-image-1\",\"digest\":\"\",\"OutputImageDir\":\"/workspace/output/source-image\"}]"}, + Args: []string{"-images", "[{\"name\":\"source-image\",\"type\":\"image\",\"url\":\"gcr.io/some-image-1\",\"digest\":\"\",\"OutputImageDir\":\"/workspace/output/source-image\"}]"}, }}}, }, { desc: "image resource in task with multiple steps", @@ -158,7 +158,7 @@ func TestAddOutputImageDigestExporter(t *testing.T) { Name: "image-digest-exporter-9l9zj", Image: "override-with-imagedigest-exporter-image:latest", Command: []string{"/ko-app/imagedigestexporter"}, - Args: []string{"-images", "[{\"name\":\"source-image-1\",\"type\":\"image\",\"url\":\"gcr.io/some-image-1\",\"digest\":\"\",\"OutputImageDir\":\"/workspace/output/source-image\"}]"}, + Args: []string{"-images", "[{\"name\":\"source-image\",\"type\":\"image\",\"url\":\"gcr.io/some-image-1\",\"digest\":\"\",\"OutputImageDir\":\"/workspace/output/source-image\"}]"}, }}}, }} { t.Run(c.desc, func(t *testing.T) { diff --git a/pkg/reconciler/taskrun/resources/input_resource_test.go b/pkg/reconciler/taskrun/resources/input_resource_test.go index 49e2baac206..5651f0baf0b 100644 --- a/pkg/reconciler/taskrun/resources/input_resource_test.go +++ b/pkg/reconciler/taskrun/resources/input_resource_test.go @@ -279,7 +279,7 @@ func setUp() { }} inputResourceInterfaces = make(map[string]v1beta1.PipelineResourceInterface) for _, r := range rs { - ri, _ := resource.FromType(r, images) + ri, _ := resource.FromType(r.Name, r, images) inputResourceInterfaces[r.Name] = ri } } @@ -1452,7 +1452,7 @@ func mockResolveTaskResources(taskRun *v1beta1.TaskRun) map[string]v1beta1.Pipel i = inputResourceInterfaces[r.ResourceRef.Name] resolved[r.Name] = i case r.ResourceSpec != nil: - i, _ = resource.FromType(&resourcev1alpha1.PipelineResource{ + i, _ = resource.FromType(r.Name, &resourcev1alpha1.PipelineResource{ ObjectMeta: metav1.ObjectMeta{ Name: r.Name, }, diff --git a/pkg/reconciler/taskrun/resources/output_resource_test.go b/pkg/reconciler/taskrun/resources/output_resource_test.go index b6a0632aea4..7e112f0ef99 100644 --- a/pkg/reconciler/taskrun/resources/output_resource_test.go +++ b/pkg/reconciler/taskrun/resources/output_resource_test.go @@ -151,7 +151,7 @@ func outputTestResourceSetup() { outputTestResources = make(map[string]v1beta1.PipelineResourceInterface) for _, r := range rs { - ri, _ := resource.FromType(r, images) + ri, _ := resource.FromType(r.Name, r, images) outputTestResources[r.Name] = ri } } @@ -1335,7 +1335,7 @@ func resolveInputResources(taskRun *v1beta1.TaskRun) map[string]v1beta1.Pipeline i = outputTestResources[name] resolved[r.Name] = i } else if r.ResourceSpec != nil { - i, _ = resource.FromType(&resourcev1alpha1.PipelineResource{ + i, _ = resource.FromType(name, &resourcev1alpha1.PipelineResource{ ObjectMeta: metav1.ObjectMeta{ Name: r.Name, }, @@ -1358,7 +1358,7 @@ func resolveOutputResources(taskRun *v1beta1.TaskRun) map[string]v1beta1.Pipelin i = outputTestResources[name] resolved[r.Name] = i } else if r.ResourceSpec != nil { - i, _ = resource.FromType(&resourcev1alpha1.PipelineResource{ + i, _ = resource.FromType(r.Name, &resourcev1alpha1.PipelineResource{ ObjectMeta: metav1.ObjectMeta{ Name: r.Name, }, diff --git a/pkg/reconciler/taskrun/taskrun.go b/pkg/reconciler/taskrun/taskrun.go index 7636ba71189..63dd6652532 100644 --- a/pkg/reconciler/taskrun/taskrun.go +++ b/pkg/reconciler/taskrun/taskrun.go @@ -312,11 +312,7 @@ func (c *Reconciler) prepare(ctx context.Context, tr *v1beta1.TaskRun) (*v1beta1 // FIXME(afrittoli) This resource specific logic will have to be replaced // once we have a custom PipelineResource framework in place. c.Logger.Infof("Cloud Events: %s", tr.Status.CloudEvents) - prs := make([]*resourcev1alpha1.PipelineResource, 0, len(rtr.Outputs)) - for _, pr := range rtr.Outputs { - prs = append(prs, pr) - } - cloudevent.InitializeCloudEvents(tr, prs) + cloudevent.InitializeCloudEvents(tr, rtr.Outputs) return taskSpec, rtr, nil } @@ -650,7 +646,7 @@ func isExceededResourceQuotaError(err error) bool { func resourceImplBinding(resources map[string]*resourcev1alpha1.PipelineResource, images pipeline.Images) (map[string]v1beta1.PipelineResourceInterface, error) { p := make(map[string]v1beta1.PipelineResourceInterface) for rName, r := range resources { - i, err := resource.FromType(r, images) + i, err := resource.FromType(rName, r, images) if err != nil { return nil, fmt.Errorf("failed to create resource %s : %v with error: %w", rName, r, err) } diff --git a/pkg/reconciler/taskrun/taskrun_test.go b/pkg/reconciler/taskrun/taskrun_test.go index c66d7a60f7f..5753f8e7bfa 100644 --- a/pkg/reconciler/taskrun/taskrun_test.go +++ b/pkg/reconciler/taskrun/taskrun_test.go @@ -725,14 +725,14 @@ func TestReconcile(t *testing.T) { tb.PodRestartPolicy(corev1.RestartPolicyNever), getPlaceToolsInitContainer(), getMkdirResourceContainer("myimage", "/workspace/output/myimage", "mssqb"), - tb.PodContainer("step-git-source-git-resource-mz4c7", "override-with-git:latest", + tb.PodContainer("step-git-source-workspace-mz4c7", "override-with-git:latest", tb.Command(entrypointLocation), tb.Args("-wait_file", "/tekton/tools/0", "-post_file", "/tekton/tools/1", "-termination_path", "/tekton/termination", "-entrypoint", "/ko-app/git-init", "--", "-url", "https://foo.git", "-revision", "master", "-path", "/workspace/workspace"), tb.WorkingDir(workspaceDir), tb.EnvVar("HOME", "/tekton/home"), - tb.EnvVar("TEKTON_RESOURCE_NAME", "git-resource"), + tb.EnvVar("TEKTON_RESOURCE_NAME", "workspace"), tb.EnvVar("HOME", "/tekton/home"), tb.VolumeMount("tekton-internal-tools", "/tekton/tools"), tb.VolumeMount("tekton-internal-workspace", workspaceDir), @@ -769,7 +769,7 @@ func TestReconcile(t *testing.T) { tb.Command(entrypointLocation), tb.Args("-wait_file", "/tekton/tools/3", "-post_file", "/tekton/tools/4", "-termination_path", "/tekton/termination", "-entrypoint", "/ko-app/imagedigestexporter", "--", - "-images", "[{\"name\":\"image-resource\",\"type\":\"image\",\"url\":\"gcr.io/kristoff/sven\",\"digest\":\"\",\"OutputImageDir\":\"/workspace/output/myimage\"}]"), + "-images", "[{\"name\":\"myimage\",\"type\":\"image\",\"url\":\"gcr.io/kristoff/sven\",\"digest\":\"\",\"OutputImageDir\":\"/workspace/output/myimage\"}]"), tb.WorkingDir(workspaceDir), tb.EnvVar("HOME", "/tekton/home"), tb.VolumeMount("tekton-internal-tools", "/tekton/tools"), @@ -798,7 +798,7 @@ func TestReconcile(t *testing.T) { tb.PodVolumes(workspaceVolume, homeVolume, resultsVolume, toolsVolume, downwardVolume), tb.PodRestartPolicy(corev1.RestartPolicyNever), getPlaceToolsInitContainer(), - tb.PodContainer("step-git-source-git-resource-9l9zj", "override-with-git:latest", + tb.PodContainer("step-git-source-workspace-9l9zj", "override-with-git:latest", tb.Command(entrypointLocation), tb.Args("-wait_file", "/tekton/downward/ready", @@ -822,7 +822,7 @@ func TestReconcile(t *testing.T) { // adds it first and the git pipelineresource adds its own to ensure that HOME // is set even when disable-home-env-overwrite feature flag is "true". tb.EnvVar("HOME", "/tekton/home"), - tb.EnvVar("TEKTON_RESOURCE_NAME", "git-resource"), + tb.EnvVar("TEKTON_RESOURCE_NAME", "workspace"), tb.EnvVar("HOME", "/tekton/home"), tb.VolumeMount("tekton-internal-tools", "/tekton/tools"), tb.VolumeMount("tekton-internal-downward", "/tekton/downward"),