Add a new field for the resourceName.

tektoncd · May 27, 2020 · d0b82e2 · d0b82e2
1 parent 23bbe1e
commit d0b82e2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/cmd/git-init/main.go b/cmd/git-init/main.go
@@ -65,6 +65,7 @@ func main() {
 			ResourceRef: v1beta1.PipelineResourceRef{
 				Name: resourceName,
 			},
+			ResourceName: resourceName,
 		},
 	}
 

diff --git a/cmd/imagedigestexporter/main.go b/cmd/imagedigestexporter/main.go
@@ -64,8 +64,9 @@ func main() {
 			logger.Fatalf("Unexpected error getting image digest for %s: %v", imageResource.Name, err)
 		}
 		output = append(output, v1beta1.PipelineResourceResult{
-			Key:   "digest",
-			Value: digest.String(),
+			Key:          "digest",
+			Value:        digest.String(),
+			ResourceName: imageResource.Name,
 			ResourceRef: v1beta1.PipelineResourceRef{
 				Name: imageResource.Name,
 			},

diff --git a/go.mod b/go.mod
@@ -4,7 +4,6 @@ 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
@@ -39,7 +38,6 @@ 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/pipeline/v1beta1/resource_types.go b/pkg/apis/pipeline/v1beta1/resource_types.go
@@ -120,10 +120,13 @@ type PipelineResourceBinding struct {
 
 // PipelineResourceResult used to export the image name and digest as json
 type PipelineResourceResult struct {
-	Key         string              `json:"key"`
-	Value       string              `json:"value"`
-	ResourceRef PipelineResourceRef `json:"resourceRef,omitempty"`
-	ResultType  ResultType          `json:"type,omitempty"`
+	Key          string              `json:"key"`
+	Value        string              `json:"value"`
+	ResourceName string              `json:"resourceName,omitempty"`
+	// This field should be deprecated and removed in the next API version.
+	// See https://github.com/tektoncd/pipeline/issues/2694 for more information.
+	ResourceRef  PipelineResourceRef `json:"resourceRef,omitempty"`
+	ResultType   ResultType          `json:"type,omitempty"`
 }
 
 // ResultType used to find out whether a PipelineResourceResult is from a task result or not
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,7 @@ func main() { @@
     			ResourceRef: v1beta1.PipelineResourceRef{
     				Name: resourceName,
     			},
+    			ResourceName: resourceName,
     		},
     	}
@@ Expand Down @@