diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 20430d01..2f11b829 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,7 +15,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: 1.20.10 + go-version: 1.20.11 - uses: actions/checkout@v2 with: fetch-depth: '0' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d45df40d..fea3dfcb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.20.10 + go-version: 1.20.11 - name: Retrieve version run: | echo "TAG_NAME=$(echo ${{ github.ref }} | grep -Eo 'v[0-9].*')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml index fbeaab8d..1051ccf3 100644 --- a/.github/workflows/test-gh.yml +++ b/.github/workflows/test-gh.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v1 with: - go-version: 1.20.10 + go-version: 1.20.11 - name: Check out code into the Go module directory uses: actions/checkout@v1 with: diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index d4ddd4fb..a23eb6f5 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -10,7 +10,7 @@ jobs: with: repo: carvel-dev/vendir tool: vendir - goVersion: 1.20.10 + goVersion: 1.20.11 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/go.mod b/go.mod index 1284a607..ae116e8d 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/spf13/cobra v1.6.1 github.com/stretchr/testify v1.8.2 - github.com/vmware-tanzu/carvel-imgpkg v0.36.6 + github.com/vmware-tanzu/carvel-imgpkg v0.36.8 golang.org/x/crypto v0.14.0 golang.org/x/oauth2 v0.1.0 golang.org/x/tools v0.6.0 diff --git a/go.sum b/go.sum index 717d9458..625021ae 100644 --- a/go.sum +++ b/go.sum @@ -336,8 +336,8 @@ github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlI github.com/vbatts/tar-split v0.11.2/go.mod h1:vV3ZuO2yWSVsz+pfFzDG/upWH1JhjOiEaWq6kXyQ3VI= github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs= github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA= -github.com/vmware-tanzu/carvel-imgpkg v0.36.6 h1:hVCyqbUws/D3wZsaW/011ral/wTuoKuEB42FcWCH9n8= -github.com/vmware-tanzu/carvel-imgpkg v0.36.6/go.mod h1:CvEN84+mnkcDp8YbXYR0HHIV+KAKM3ZTj/Ku7sPPcXk= +github.com/vmware-tanzu/carvel-imgpkg v0.36.8 h1:409NYaUvTTvlI0VB0Q42hgQVyQV1R1Fi31VYNswW8a0= +github.com/vmware-tanzu/carvel-imgpkg v0.36.8/go.mod h1:Ay4s/zSvD65SCKLBmzk/Q6ks0OCKIa+pWgadp1iviWw= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/tag.go b/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/tag.go index ea785e79..80eef5b7 100644 --- a/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/tag.go +++ b/vendor/github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/internal/util/tag.go @@ -5,6 +5,7 @@ package util import ( "fmt" + "regexp" "strings" regname "github.com/google/go-containerregistry/pkg/name" @@ -65,13 +66,19 @@ func (tagGen RepoBasedTagGenerator) GenerateTag(item imagedigest.DigestWrap, imp } origRepoPath = strings.Join(strings.Split(origRepoPath, "/")[1:], "-") + + pattern := `^[^a-zA-Z0-9_]+|[^a-zA-Z0-9\._-]+` + regex := regexp.MustCompile(pattern) + cleanedOrigRepoPath := regex.ReplaceAllString(origRepoPath, "") + digestArr := strings.Split(item.RegnameDigest().DigestStr(), ":") - tagStartIdx := len(origRepoPath) - 49 + tagStartIdx := len(cleanedOrigRepoPath) - 49 if tagStartIdx < 0 { tagStartIdx = 0 } - dashedRepo := fmt.Sprintf("%s-%s-%s.imgpkg", origRepoPath[tagStartIdx:], digestArr[0], digestArr[1]) + cleanedTag := regex.ReplaceAllString(cleanedOrigRepoPath[tagStartIdx:], "") + dashedRepo := fmt.Sprintf("%s-%s-%s.imgpkg", cleanedTag, digestArr[0], digestArr[1]) // if tag starts with a "-", PUT to /v2//manifests/- // will give an "un-recognized request" error if strings.HasPrefix(dashedRepo, "-") { diff --git a/vendor/modules.txt b/vendor/modules.txt index 58e3c039..0a14de84 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -364,7 +364,7 @@ github.com/vbatts/tar-split/archive/tar # github.com/vito/go-interact v1.0.1 ## explicit; go 1.12 github.com/vito/go-interact/interact -# github.com/vmware-tanzu/carvel-imgpkg v0.36.6 +# github.com/vmware-tanzu/carvel-imgpkg v0.36.8 ## explicit; go 1.20 github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image