Skip to content

Commit

Permalink
Cleanup resolution import path
Browse files Browse the repository at this point in the history
This commit cleans up the duplicate import path for resolution.
No functional changes.
  • Loading branch information
JeromeJu authored and tekton-robot committed Mar 28, 2023
1 parent 545bdbb commit 538fee3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions pkg/resolution/resolver/cluster/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions test/resolution.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
Expand Down

0 comments on commit 538fee3

Please sign in to comment.