Update GetNameAndNamespace Parameters

tektoncd · May 27, 2024 · ff91c3a · ff91c3a
1 parent d649ded
commit ff91c3a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/pkg/remote/resolution/resolver.go b/pkg/remote/resolution/resolver.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 
 	v1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
+	"github.com/tektoncd/pipeline/pkg/apis/resolution/v1beta1"
 	"github.com/tektoncd/pipeline/pkg/client/clientset/versioned/scheme"
 	"github.com/tektoncd/pipeline/pkg/remote"
 	resolutioncommon "github.com/tektoncd/pipeline/pkg/resolution/common"
@@ -73,7 +74,10 @@ func (resolver *Resolver) List(_ context.Context) ([]remote.ResolvedObject, erro
 }
 
 func buildRequest(resolverName string, owner kmeta.OwnerRefable, name string, namespace string, params v1.Params) (*resolutionRequest, error) {
-	name, namespace, err := remoteresource.GetNameAndNamespace(resolverName, owner, name, namespace, params)
+	rr := &v1beta1.ResolutionRequestSpec{
+		Params: params,
+	}
+	name, namespace, err := remoteresource.GetNameAndNamespace(resolverName, owner, name, namespace, rr)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/remoteresolution/remote/resolution/resolver.go b/pkg/remoteresolution/remote/resolution/resolver.go
@@ -18,6 +18,7 @@ import (
 	"fmt"
 
 	v1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
+	"github.com/tektoncd/pipeline/pkg/apis/resolution/v1beta1"
 	"github.com/tektoncd/pipeline/pkg/remote"
 	resolution "github.com/tektoncd/pipeline/pkg/remote/resolution"
 	remoteresource "github.com/tektoncd/pipeline/pkg/remoteresolution/resource"
@@ -69,15 +70,21 @@ func (resolver *Resolver) List(_ context.Context) ([]remote.ResolvedObject, erro
 func buildRequest(resolverName string, owner kmeta.OwnerRefable, resolverPayload *remoteresource.ResolverPayload) (*resolutionRequest, error) {
 	var name string
 	var namespace string
+	var url string
 	var params v1.Params
 	if resolverPayload != nil {
 		name = resolverPayload.Name
 		namespace = resolverPayload.Namespace
 		if resolverPayload.ResolutionSpec != nil {
 			params = resolverPayload.ResolutionSpec.Params
+			url = resolverPayload.ResolutionSpec.URL
 		}
 	}
-	name, namespace, err := resource.GetNameAndNamespace(resolverName, owner, name, namespace, params)
+	rr := &v1beta1.ResolutionRequestSpec{
+		Params: params,
+		URL:    url,
+	}
+	name, namespace, err := resource.GetNameAndNamespace(resolverName, owner, name, namespace, rr)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/remoteresolution/remote/resolution/resolver_test.go b/pkg/remoteresolution/remote/resolution/resolver_test.go
@@ -20,6 +20,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+	resv1beta1 "github.com/tektoncd/pipeline/pkg/apis/resolution/v1beta1"
+
 	"github.com/tektoncd/pipeline/pkg/remote"
 	"github.com/tektoncd/pipeline/pkg/remote/resolution"
 	remoteresource "github.com/tektoncd/pipeline/pkg/remoteresolution/resource"
@@ -142,12 +144,18 @@ func TestBuildRequestV2(t *testing.T) {
 		name            string
 		targetName      string
 		targetNamespace string
+		url             string
 	}{{
 		name: "just owner",
 	}, {
 		name:            "with target name and namespace",
 		targetName:      "some-object",
 		targetNamespace: "some-ns",
+	}, {
+		name:            "with target name, namespace, and url",
+		targetName:      "some-object",
+		targetNamespace: "some-ns",
+		url:             "scheme://value",
 	}} {
 		t.Run(tc.name, func(t *testing.T) {
 			owner := &v1beta1.PipelineRun{
@@ -158,6 +166,7 @@ func TestBuildRequestV2(t *testing.T) {
 			}
 
 			rr := &remoteresource.ResolverPayload{Name: tc.targetName, Namespace: tc.targetNamespace}
+			rr.ResolutionSpec = &resv1beta1.ResolutionRequestSpec{URL: tc.url}
 			req, err := buildRequest("git", owner, rr)
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)

diff --git a/pkg/resolution/resource/name.go b/pkg/resolution/resource/name.go
@@ -50,7 +50,10 @@ func GenerateDeterministicName(prefix, base string, params v1.Params) (string, e
 	return GenerateDeterministicNameFromSpec(prefix, base, &v1beta1.ResolutionRequestSpec{Params: params})
 }
 
-func GetNameAndNamespace(resolverName string, owner kmeta.OwnerRefable, name string, namespace string, params v1.Params) (string, string, error) {
+// GetNameAndNamespace determines the name and namespace for a resource request.
+// It prioritizes explicit values, falling back to the owning object and "default" namespace.
+// If needed, it generates a deterministic name to prevent duplicate requests within a context.
+func GetNameAndNamespace(resolverName string, owner kmeta.OwnerRefable, name string, namespace string, req *v1beta1.ResolutionRequestSpec) (string, string, error) {
 	if name == "" {
 		name = owner.GetObjectMeta().GetName()
 		namespace = owner.GetObjectMeta().GetNamespace()
@@ -62,7 +65,7 @@ func GetNameAndNamespace(resolverName string, owner kmeta.OwnerRefable, name str
 	// prevents multiple requests being issued for the same
 	// pipelinerun's pipelineRef or taskrun's taskRef.
 	remoteResourceBaseName := namespace + "/" + name
-	name, err := GenerateDeterministicNameFromSpec(resolverName, remoteResourceBaseName, &v1beta1.ResolutionRequestSpec{Params: params})
+	name, err := GenerateDeterministicNameFromSpec(resolverName, remoteResourceBaseName, req)
 	if err != nil {
 		return "", "", fmt.Errorf("error generating name for taskrun %s/%s: %w", namespace, name, err)
 	}