From 7c095a64fde4908a4cbfacc09fef553c7818e2c7 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 15 May 2024 20:27:21 +0100 Subject: [PATCH] fix: replace whilp/git-urls with chainguard-dev/git-urls --- envbuilder.go | 2 +- git.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/envbuilder.go b/envbuilder.go index ce980b85..8d3df783 100644 --- a/envbuilder.go +++ b/envbuilder.go @@ -33,6 +33,7 @@ import ( "github.com/GoogleContainerTools/kaniko/pkg/creds" "github.com/GoogleContainerTools/kaniko/pkg/executor" "github.com/GoogleContainerTools/kaniko/pkg/util" + giturls "github.com/chainguard-dev/git-urls" "github.com/coder/coder/v2/codersdk" "github.com/coder/envbuilder/devcontainer" "github.com/coder/envbuilder/internal/ebutil" @@ -49,7 +50,6 @@ import ( "github.com/google/go-containerregistry/pkg/v1/remote" "github.com/sirupsen/logrus" "github.com/tailscale/hujson" - giturls "github.com/whilp/git-urls" "golang.org/x/xerrors" ) diff --git a/git.go b/git.go index 4aa9c541..0ef4c180 100644 --- a/git.go +++ b/git.go @@ -9,6 +9,7 @@ import ( "os" "strings" + giturls "github.com/chainguard-dev/git-urls" "github.com/coder/coder/v2/codersdk" "github.com/go-git/go-billy/v5" "github.com/go-git/go-git/v5" @@ -21,7 +22,6 @@ import ( gitssh "github.com/go-git/go-git/v5/plumbing/transport/ssh" "github.com/go-git/go-git/v5/storage/filesystem" "github.com/skeema/knownhosts" - giturls "github.com/whilp/git-urls" "golang.org/x/crypto/ssh" gossh "golang.org/x/crypto/ssh" ) diff --git a/go.mod b/go.mod index 8eaa09c8..7070eb09 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( cdr.dev/slog v1.6.2-0.20240126064726-20367d4aede6 github.com/GoogleContainerTools/kaniko v1.9.2 github.com/breml/rootcerts v0.2.10 + github.com/chainguard-dev/git-urls v1.0.2 github.com/coder/coder/v2 v2.3.3 github.com/coder/serpent v0.7.0 github.com/containerd/containerd v1.7.11 @@ -40,7 +41,6 @@ require ( github.com/skeema/knownhosts v1.2.2 github.com/stretchr/testify v1.9.0 github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a - github.com/whilp/git-urls v1.0.0 go.uber.org/mock v0.4.0 golang.org/x/crypto v0.22.0 golang.org/x/sync v0.7.0 diff --git a/go.sum b/go.sum index 20e24369..d3875105 100644 --- a/go.sum +++ b/go.sum @@ -174,6 +174,8 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6 github.com/cespare/xxhash/v2 v2.1.1/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/charmbracelet/glamour v0.6.0 h1:wi8fse3Y7nfcabbbDuwolqTqMQPMnVPeZhDM273bISc= github.com/charmbracelet/glamour v0.6.0/go.mod h1:taqWV4swIMMbWALc0m7AfE9JkPSU8om2538k9ITBxOc= github.com/charmbracelet/lipgloss v0.8.0 h1:IS00fk4XAHcf8uZKc3eHeMUTCxUH6NkaTrdyCQk84RU= @@ -842,8 +844,6 @@ github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vb github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/wagslane/go-password-validator v0.3.0 h1:vfxOPzGHkz5S146HDpavl0cw1DSVP061Ry2PX0/ON6I= github.com/wagslane/go-password-validator v0.3.0/go.mod h1:TI1XJ6T5fRdRnHqHt14pvy1tNVnrwe7m3/f1f2fDphQ= -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/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=