diff --git a/go.mod b/go.mod index 35340910..25a9a121 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/argoproj/argo-cd/v2 v2.10.6 github.com/argoproj/gitops-engine v0.7.1-0.20240411122334-1ade3a199867 github.com/cenkalti/backoff/v4 v4.3.0 + github.com/chainguard-dev/git-urls v1.0.2 github.com/creasty/defaults v1.7.0 github.com/docker/docker v26.0.0+incompatible github.com/ghodss/yaml v1.0.0 @@ -33,7 +34,6 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.9.0 - github.com/whilp/git-urls v1.0.0 github.com/xanzy/go-gitlab v0.101.0 github.com/yannh/kubeconform v0.6.4 github.com/ziflex/lecho/v3 v3.5.0 diff --git a/go.sum b/go.sum index bd23a4e3..01901a4d 100644 --- a/go.sum +++ b/go.sum @@ -298,6 +298,8 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= +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/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -972,8 +974,6 @@ github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= -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/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/xanzy/go-gitlab v0.101.0 h1:qRgvX8DNE19zRugB6rnnZMZ5ubhITSKPLNWEyc6UIPg= github.com/xanzy/go-gitlab v0.101.0/go.mod h1:ETg8tcj4OhrB84UEgeE8dSuV/0h4BBL1uOV/qK0vlyI= diff --git a/pkg/repoUrl.go b/pkg/repoUrl.go index bdba40a2..cfc5a677 100644 --- a/pkg/repoUrl.go +++ b/pkg/repoUrl.go @@ -5,7 +5,7 @@ import ( "net/url" "strings" - giturls "github.com/whilp/git-urls" + "github.com/chainguard-dev/git-urls" ) type RepoURL struct { diff --git a/pkg/vcs/github_client/client.go b/pkg/vcs/github_client/client.go index d5ea0518..2c26da76 100644 --- a/pkg/vcs/github_client/client.go +++ b/pkg/vcs/github_client/client.go @@ -9,11 +9,11 @@ import ( "strconv" "strings" + "github.com/chainguard-dev/git-urls" "github.com/google/go-github/v53/github" "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/shurcooL/githubv4" - giturls "github.com/whilp/git-urls" "go.opentelemetry.io/otel" "golang.org/x/oauth2" diff --git a/pkg/vcs/gitlab_client/client.go b/pkg/vcs/gitlab_client/client.go index af7f8e28..989f3d2d 100644 --- a/pkg/vcs/gitlab_client/client.go +++ b/pkg/vcs/gitlab_client/client.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" + "github.com/chainguard-dev/git-urls" "github.com/pkg/errors" "github.com/rs/zerolog/log" - giturls "github.com/whilp/git-urls" "github.com/xanzy/go-gitlab" "github.com/zapier/kubechecks/pkg"