From c4d0bc6ca117d69c023701bf532057f212009537 Mon Sep 17 00:00:00 2001 From: Luke Kingland Date: Tue, 12 Dec 2023 11:01:27 +0000 Subject: [PATCH] fix: replace git-urls with patched fork (#2105) * fix: replace git-urls with patched fork * update licenses --- go.mod | 2 +- go.sum | 4 ++-- pkg/functions/function_git.go | 2 +- .../github.com/{whilp => chainguard-dev}/git-urls/LICENSE | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename third_party/VENDOR-LICENSE/github.com/{whilp => chainguard-dev}/git-urls/LICENSE (100%) diff --git a/go.mod b/go.mod index 072a2fe1..282b2ad5 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b github.com/buildpacks/pack v0.30.0-pre3 + github.com/chainguard-dev/git-urls v1.0.2 github.com/cloudevents/sdk-go/v2 v2.14.0 github.com/containerd/containerd v1.7.2 github.com/containers/image/v5 v5.26.1 @@ -45,7 +46,6 @@ require ( github.com/spf13/pflag v1.0.5 github.com/tektoncd/cli v0.31.1 github.com/tektoncd/pipeline v0.47.0 - github.com/whilp/git-urls v1.0.0 github.com/xanzy/go-gitlab v0.83.0 golang.org/x/crypto v0.15.0 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 diff --git a/go.sum b/go.sum index 60d382b2..be379ffb 100644 --- a/go.sum +++ b/go.sum @@ -211,6 +211,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chainguard-dev/git-urls v1.0.2 h1:pSpT7ifrpc5X55n4aTTm7FFUE+ZQHKiqpiwNkJrVcKQ= +github.com/chainguard-dev/git-urls v1.0.2/go.mod h1:rbGgj10OS7UgZlbzdUQIQpT0k/D4+An04HJY7Ol+Y/o= github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 h1:krfRl01rzPzxSxyLyrChD+U+MzsBXbm0OwYYB67uF+4= github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589/go.mod h1:OuDyvmLnMCwa2ep4Jkm6nyA0ocJuZlGyk2gGseVzERM= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -967,8 +969,6 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck= github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY= github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= -github.com/whilp/git-urls v1.0.0 h1:95f6UMWN5FKW71ECsXRUd3FVYiXdrE7aX4NZKcPmIjU= -github.com/whilp/git-urls v1.0.0/go.mod h1:J16SAmobsqc3Qcy98brfl5f5+e0clUvg1krgwk/qCfE= github.com/xanzy/go-gitlab v0.83.0 h1:37p0MpTPNbsTMKX/JnmJtY8Ch1sFiJzVF342+RvZEGw= github.com/xanzy/go-gitlab v0.83.0/go.mod h1:5ryv+MnpZStBH8I/77HuQBsMbBGANtVpLWC15qOjWAw= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= diff --git a/pkg/functions/function_git.go b/pkg/functions/function_git.go index 9a2f8e08..b3122ac7 100644 --- a/pkg/functions/function_git.go +++ b/pkg/functions/function_git.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - giturls "github.com/whilp/git-urls" + giturls "github.com/chainguard-dev/git-urls" ) type Git struct { diff --git a/third_party/VENDOR-LICENSE/github.com/whilp/git-urls/LICENSE b/third_party/VENDOR-LICENSE/github.com/chainguard-dev/git-urls/LICENSE similarity index 100% rename from third_party/VENDOR-LICENSE/github.com/whilp/git-urls/LICENSE rename to third_party/VENDOR-LICENSE/github.com/chainguard-dev/git-urls/LICENSE