From 538fee37f93b763fd5769b23f101f3f4392714fc Mon Sep 17 00:00:00 2001 From: Jerome Ju Date: Sat, 25 Mar 2023 07:55:47 -0400 Subject: [PATCH] Cleanup resolution import path This commit cleans up the duplicate import path for resolution. No functional changes. --- pkg/resolution/resolver/cluster/resolver.go | 3 +-- test/resolution.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/resolution/resolver/cluster/resolver.go b/pkg/resolution/resolver/cluster/resolver.go index 355455b70fb..634f5c83b95 100644 --- a/pkg/resolution/resolver/cluster/resolver.go +++ b/pkg/resolution/resolver/cluster/resolver.go @@ -25,7 +25,6 @@ import ( "strings" resolverconfig "github.com/tektoncd/pipeline/pkg/apis/config/resolver" - "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" pipelinev1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" clientset "github.com/tektoncd/pipeline/pkg/client/clientset/versioned" pipelineclient "github.com/tektoncd/pipeline/pkg/client/injection/client" @@ -215,7 +214,7 @@ func (r ResolvedClusterResource) Source() *pipelinev1beta1.ConfigSource { h.Write(r.Spec) sha256CheckSum := hex.EncodeToString(h.Sum(nil)) - return &v1beta1.ConfigSource{ + return &pipelinev1beta1.ConfigSource{ URI: r.Identifier, Digest: map[string]string{ "sha256": sha256CheckSum, diff --git a/test/resolution.go b/test/resolution.go index 43a7380d582..4175bc4f1bc 100644 --- a/test/resolution.go +++ b/test/resolution.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/google/go-cmp/cmp" - "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" pipelinev1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1" resolution "github.com/tektoncd/pipeline/pkg/resolution/resource" "github.com/tektoncd/pipeline/test/diff" @@ -28,7 +27,7 @@ func NewRequester(resource resolution.ResolvedResource, err error) *Requester { // NewResolvedResource creates a mock resolved resource that is // populated with the given data and annotations or returns the given // error from its Data() method. -func NewResolvedResource(data []byte, annotations map[string]string, source *v1beta1.ConfigSource, dataErr error) *ResolvedResource { +func NewResolvedResource(data []byte, annotations map[string]string, source *pipelinev1beta1.ConfigSource, dataErr error) *ResolvedResource { return &ResolvedResource{ ResolvedData: data, ResolvedAnnotations: annotations,