From 6452bec403b7d946a2a1a1d2a222e75bb582f7d3 Mon Sep 17 00:00:00 2001 From: Ramkumar Chinchani <45800463+rchincha@users.noreply.github.com> Date: Wed, 26 Nov 2025 01:21:36 -0800 Subject: [PATCH] chore: fix dependabot alerts (#3595) * chore: fix dependabot alerts Signed-off-by: Ramkumar Chinchani * ci: bump up golang to 1.25.x Signed-off-by: Ramkumar Chinchani * fix: linter errors Signed-off-by: Ramkumar Chinchani * fix: stacker and docker build files to use golang 1.25 Signed-off-by: Ramkumar Chinchani --------- Signed-off-by: Ramkumar Chinchani --- .github/workflows/benchmark.yaml | 4 +- .github/workflows/branch-cov.yaml | 4 +- .github/workflows/build.yaml | 4 +- .github/workflows/cloc.yaml | 4 +- .github/workflows/cluster.yaml | 8 +- .github/workflows/codeql-analysis.yml | 10 +- .github/workflows/commit-msg.yaml | 2 +- .github/workflows/compare-binary-size.yaml | 4 +- .github/workflows/dco.yaml | 2 +- .github/workflows/ecosystem-tools.yaml | 4 +- .github/workflows/gc-stress-test.yaml | 16 +-- .github/workflows/golangci-lint.yaml | 4 +- .github/workflows/gqlgen.yaml | 6 +- .github/workflows/license.yaml | 4 +- .github/workflows/nightly.yaml | 32 +++--- .github/workflows/oci-conformance-action.yaml | 6 +- .github/workflows/publish.yaml | 12 +-- .github/workflows/scorecards.yaml | 4 +- .github/workflows/sync-3rdparty-images.yaml | 2 +- .github/workflows/test.yaml | 16 +-- .github/workflows/tls.yaml | 4 +- .github/workflows/verify-config.yaml | 4 +- .github/workflows/web-scan.yaml | 4 +- build/Dockerfile | 2 +- build/Dockerfile-conformance | 2 +- build/Dockerfile-minimal | 2 +- build/Dockerfile-zb | 2 +- build/Dockerfile-zxp | 2 +- build/stacker-conformance.yaml | 2 +- build/stacker-minimal.yaml | 2 +- build/stacker-zb.yaml | 2 +- build/stacker-zxp.yaml | 2 +- build/stacker.yaml | 2 +- cmd/zb/perf.go | 25 ++--- go.mod | 49 +++++---- go.sum | 100 +++++++++--------- pkg/exporter/api/controller_test.go | 21 ++-- 37 files changed, 186 insertions(+), 189 deletions(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 597ab8f8..fe3cc141 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -14,11 +14,11 @@ jobs: name: Performance regression check runs-on: oracle-vm-8cpu-32gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x # Run benchmark with `go test -bench` and stores the output to a file - name: Run benchmark run: make BENCH_OUTPUT=ci-cd run-bench diff --git a/.github/workflows/branch-cov.yaml b/.github/workflows/branch-cov.yaml index 86c98236..b442ed6e 100644 --- a/.github/workflows/branch-cov.yaml +++ b/.github/workflows/branch-cov.yaml @@ -14,11 +14,11 @@ jobs: runs-on: ubuntu-latest name: coverage steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 739ac831..d695a525 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,12 +25,12 @@ jobs: arch: [amd64, arm64] steps: - name: Check out source code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install go uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Cache go dependencies id: cache-go-dependencies uses: actions/cache@v4 diff --git a/.github/workflows/cloc.yaml b/.github/workflows/cloc.yaml index a47a9a49..2550c7cc 100644 --- a/.github/workflows/cloc.yaml +++ b/.github/workflows/cloc.yaml @@ -21,9 +21,9 @@ jobs: uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Check out source code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/cluster.yaml b/.github/workflows/cluster.yaml index 6fe80c7e..55ebd7df 100644 --- a/.github/workflows/cluster.yaml +++ b/.github/workflows/cluster.yaml @@ -16,11 +16,11 @@ jobs: name: Stateless zot with minio and boltdb runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE @@ -271,11 +271,11 @@ jobs: name: Stateless zot with minio and redis runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 68fa8386..c68bf34a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,17 +43,17 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install go uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v4.31.3 + uses: github/codeql-action/init@v4.31.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -64,7 +64,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v4.31.3 + uses: github/codeql-action/autobuild@v4.31.5 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -77,4 +77,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4.31.3 + uses: github/codeql-action/analyze@v4.31.5 diff --git a/.github/workflows/commit-msg.yaml b/.github/workflows/commit-msg.yaml index d80e9f3c..73d65914 100644 --- a/.github/workflows/commit-msg.yaml +++ b/.github/workflows/commit-msg.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Check Commit Type uses: gsactions/commit-message-checker@v2 with: diff --git a/.github/workflows/compare-binary-size.yaml b/.github/workflows/compare-binary-size.yaml index 1b5ecee5..68424329 100644 --- a/.github/workflows/compare-binary-size.yaml +++ b/.github/workflows/compare-binary-size.yaml @@ -10,11 +10,11 @@ jobs: runs-on: ubuntu-latest name: compare-with-main steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Checkout zot (main branch) run: | mkdir -p $GITHUB_WORKSPACE/zot_main diff --git a/.github/workflows/dco.yaml b/.github/workflows/dco.yaml index 03ed6249..a5e8f8f7 100644 --- a/.github/workflows/dco.yaml +++ b/.github/workflows/dco.yaml @@ -10,7 +10,7 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Python 3.x uses: actions/setup-python@v6 with: diff --git a/.github/workflows/ecosystem-tools.yaml b/.github/workflows/ecosystem-tools.yaml index ed60e91f..8da1eecc 100644 --- a/.github/workflows/ecosystem-tools.yaml +++ b/.github/workflows/ecosystem-tools.yaml @@ -16,11 +16,11 @@ jobs: name: Check client tools runs-on: oracle-vm-16cpu-64gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/gc-stress-test.yaml b/.github/workflows/gc-stress-test.yaml index b3220d4f..a64da1b6 100644 --- a/.github/workflows/gc-stress-test.yaml +++ b/.github/workflows/gc-stress-test.yaml @@ -16,11 +16,11 @@ jobs: name: GC(with referrers) on filesystem with short interval runs-on: oracle-vm-8cpu-32gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Run zb id: bench @@ -55,11 +55,11 @@ jobs: name: GC(without referrers) on filesystem with short interval runs-on: oracle-vm-8cpu-32gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Run zb id: bench @@ -94,11 +94,11 @@ jobs: name: GC(with referrers) on S3(minio) with short interval runs-on: oracle-vm-8cpu-32gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - uses: ./.github/actions/setup-localstack - name: Setup minio service run: | @@ -178,11 +178,11 @@ jobs: name: GC(without referrers) on S3(minio) with short interval runs-on: oracle-vm-8cpu-32gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - uses: ./.github/actions/setup-localstack - name: Setup minio service run: | diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml index 93c3b5aa..2e0ebf5c 100644 --- a/.github/workflows/golangci-lint.yaml +++ b/.github/workflows/golangci-lint.yaml @@ -18,8 +18,8 @@ jobs: - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x - - uses: actions/checkout@v4 + go-version: 1.25.x + - uses: actions/checkout@v6 - name: Run linter with GH action uses: golangci/golangci-lint-action@v9 with: diff --git a/.github/workflows/gqlgen.yaml b/.github/workflows/gqlgen.yaml index 2ccb61d1..ff2b6582 100644 --- a/.github/workflows/gqlgen.yaml +++ b/.github/workflows/gqlgen.yaml @@ -21,11 +21,11 @@ jobs: name: Check GQL generation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE @@ -40,7 +40,7 @@ jobs: name: Check GQL schema follows best practices runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/license.yaml b/.github/workflows/license.yaml index 10e70977..4e787ca9 100644 --- a/.github/workflows/license.yaml +++ b/.github/workflows/license.yaml @@ -18,11 +18,11 @@ jobs: runs-on: ubuntu-latest name: License Check steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Install go-licenses run: go install github.com/google/go-licenses@latest - name: Check for forbidden licenses diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 6eb4adc3..d37d4772 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -18,10 +18,10 @@ jobs: name: Dedupe/restore blobs runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE @@ -69,10 +69,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out source code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE @@ -86,11 +86,11 @@ jobs: name: GC(with referrers) on S3(localstack) with short interval runs-on: oracle-vm-16cpu-64gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - uses: ./.github/actions/setup-localstack - name: Run zb @@ -123,11 +123,11 @@ jobs: name: GC(without referrers) on S3(localstack) with short interval runs-on: oracle-vm-16cpu-64gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - uses: ./.github/actions/setup-localstack - name: Run zb @@ -160,9 +160,9 @@ jobs: name: Build docker image (for users still using Docker environments) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Check out source code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: ./.github/actions/clean-runner - name: Build image run: | @@ -172,10 +172,10 @@ jobs: name: Prometheus setup runs-on: oracle-vm-8cpu-32gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE @@ -203,11 +203,11 @@ jobs: name: s3+dynamodb scale-out runs-on: oracle-vm-16cpu-64gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE @@ -289,11 +289,11 @@ jobs: name: s3+redis scale-out runs-on: oracle-vm-16cpu-64gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/oci-conformance-action.yaml b/.github/workflows/oci-conformance-action.yaml index d83abf7c..addb1882 100644 --- a/.github/workflows/oci-conformance-action.yaml +++ b/.github/workflows/oci-conformance-action.yaml @@ -24,9 +24,9 @@ jobs: uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Checkout this PR - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Start zot server run: | cd $GITHUB_WORKSPACE @@ -34,7 +34,7 @@ jobs: RUNNER_TRACKING_ID="" && ./bin/zot-linux-amd64 serve examples/config-conformance.json & IP=`hostname -I | awk '{print $1}'` echo "SERVER_URL=http://${IP}:8080" >> $GITHUB_ENV - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: repository: opencontainers/distribution-spec ref: main diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index ac7b7ba8..224c3054 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -27,7 +27,7 @@ jobs: echo "BASE_IMAGE=gcr.io/distroless/base-debian12:latest-${ARCH}" >> "$GITHUB_ENV" fi - name: Check out the repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Log in to GitHub Docker Registry uses: docker/login-action@v3 with: @@ -112,7 +112,7 @@ jobs: image: [zot, zot-minimal, zxp, zb] steps: - name: Check out the repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Log in to GitHub Docker Registry uses: docker/login-action@v3 with: @@ -253,7 +253,7 @@ jobs: TRIVY_USERNAME: ${{ github.actor }} TRIVY_PASSWORD: ${{ secrets.GITHUB_TOKEN }} - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v4.31.3 + uses: github/codeql-action/upload-sarif@v4.31.5 with: sarif_file: 'trivy-results.sarif' @@ -290,7 +290,7 @@ jobs: TRIVY_USERNAME: ${{ github.actor }} TRIVY_PASSWORD: ${{ secrets.GITHUB_TOKEN }} - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v4.31.3 + uses: github/codeql-action/upload-sarif@v4.31.5 with: sarif_file: 'trivy-results.sarif' @@ -303,13 +303,13 @@ jobs: packages: write runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: main fetch-depth: '0' - name: Checkout project-zot/helm-charts - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: project-zot/helm-charts ref: main diff --git a/.github/workflows/scorecards.yaml b/.github/workflows/scorecards.yaml index ccabea2f..a79ddf63 100644 --- a/.github/workflows/scorecards.yaml +++ b/.github/workflows/scorecards.yaml @@ -25,7 +25,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v4 # v3.0.0 + uses: actions/checkout@v6 # v3.0.0 with: persist-credentials: false @@ -57,6 +57,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@v4.31.3 + uses: github/codeql-action/upload-sarif@v4.31.5 with: sarif_file: results.sarif diff --git a/.github/workflows/sync-3rdparty-images.yaml b/.github/workflows/sync-3rdparty-images.yaml index 3340a881..82b4bc9b 100644 --- a/.github/workflows/sync-3rdparty-images.yaml +++ b/.github/workflows/sync-3rdparty-images.yaml @@ -40,7 +40,7 @@ jobs: packages: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: sparse-checkout: | Makefile diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7ef4694d..e1c7bcbe 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -16,12 +16,12 @@ jobs: name: Running zot without extensions tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install go uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Cache go dependencies id: cache-go-dependencies uses: actions/cache@v4 @@ -56,11 +56,11 @@ jobs: name: Run zot with extensions tests runs-on: oracle-vm-16cpu-64gb-x86-64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Cache go dependencies id: cache-go-dependencies uses: actions/cache@v4 @@ -95,11 +95,11 @@ jobs: name: Running privileged tests on Linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Cache go dependencies id: cache-go-dependencies uses: actions/cache@v4 @@ -129,11 +129,11 @@ jobs: if: always() needs: [test-run-minimal,test-run-extensions,test-run-devmode] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: download all workflow coverage files uses: actions/download-artifact@v6 - name: merge code coverage diff --git a/.github/workflows/tls.yaml b/.github/workflows/tls.yaml index aa757e32..4323ed3e 100644 --- a/.github/workflows/tls.yaml +++ b/.github/workflows/tls.yaml @@ -22,11 +22,11 @@ jobs: godebug: "fips140=only" name: TLS check (${{ matrix.mode }}) steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Install dependencies run: | cd $GITHUB_WORKSPACE diff --git a/.github/workflows/verify-config.yaml b/.github/workflows/verify-config.yaml index 7c2afd29..45438e78 100644 --- a/.github/workflows/verify-config.yaml +++ b/.github/workflows/verify-config.yaml @@ -19,12 +19,12 @@ jobs: name: Verify Config Files runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install go uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Cache go dependencies id: cache-go-dependencies uses: actions/cache@v4 diff --git a/.github/workflows/web-scan.yaml b/.github/workflows/web-scan.yaml index 0b901f0e..85b7c73a 100644 --- a/.github/workflows/web-scan.yaml +++ b/.github/workflows/web-scan.yaml @@ -25,9 +25,9 @@ jobs: uses: actions/setup-go@v6 with: cache: false - go-version: 1.24.x + go-version: 1.25.x - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Build zot run: | echo "Building $FLAVOR" diff --git a/build/Dockerfile b/build/Dockerfile index ba6a0cce..04b1f501 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -11,7 +11,7 @@ ARG BASE_IMAGE # --- # Stage 1: Install certs, build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.24 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.25 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-conformance b/build/Dockerfile-conformance index df53b223..5862d1b4 100644 --- a/build/Dockerfile-conformance +++ b/build/Dockerfile-conformance @@ -11,7 +11,7 @@ ARG BASE_IMAGE # --- # Stage 1: Install certs, build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.24 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.25 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-minimal b/build/Dockerfile-minimal index a1944508..1705e146 100644 --- a/build/Dockerfile-minimal +++ b/build/Dockerfile-minimal @@ -11,7 +11,7 @@ ARG BASE_IMAGE # --- # Stage 1: Install certs, build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.24 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.25 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-zb b/build/Dockerfile-zb index 2e7237ca..f83459b9 100644 --- a/build/Dockerfile-zb +++ b/build/Dockerfile-zb @@ -11,7 +11,7 @@ ARG BASE_IMAGE # --- # Stage 1: Install certs, build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.24 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.25 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/Dockerfile-zxp b/build/Dockerfile-zxp index 1cb25eb5..df83ed6b 100644 --- a/build/Dockerfile-zxp +++ b/build/Dockerfile-zxp @@ -11,7 +11,7 @@ ARG BASE_IMAGE # --- # Stage 1: Build binary, create default config file # --- -FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.24 AS builder +FROM --platform=$BUILDPLATFORM ghcr.io/project-zot/golang:1.25 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/build/stacker-conformance.yaml b/build/stacker-conformance.yaml index 8875f89d..d9f84b24 100644 --- a/build/stacker-conformance.yaml +++ b/build/stacker-conformance.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.24 + url: docker://ghcr.io/project-zot/golang:1.25 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker-minimal.yaml b/build/stacker-minimal.yaml index a30c60a8..021b8c59 100644 --- a/build/stacker-minimal.yaml +++ b/build/stacker-minimal.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.24 + url: docker://ghcr.io/project-zot/golang:1.25 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker-zb.yaml b/build/stacker-zb.yaml index 4eae6193..1e1fa91e 100644 --- a/build/stacker-zb.yaml +++ b/build/stacker-zb.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.24 + url: docker://ghcr.io/project-zot/golang:1.25 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker-zxp.yaml b/build/stacker-zxp.yaml index bb40cb53..30cec8e9 100644 --- a/build/stacker-zxp.yaml +++ b/build/stacker-zxp.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.24 + url: docker://ghcr.io/project-zot/golang:1.25 binds: - ../. -> /zotcopy run: | diff --git a/build/stacker.yaml b/build/stacker.yaml index 126eff20..1efce86e 100644 --- a/build/stacker.yaml +++ b/build/stacker.yaml @@ -1,7 +1,7 @@ build: from: type: docker - url: docker://ghcr.io/project-zot/golang:1.24 + url: docker://ghcr.io/project-zot/golang:1.25 binds: - ../. -> /zotcopy run: | diff --git a/cmd/zb/perf.go b/cmd/zb/perf.go index d8442dde..1cb20251 100644 --- a/cmd/zb/perf.go +++ b/cmd/zb/perf.go @@ -733,21 +733,18 @@ func Perf( for range concurrency { // parallelize with clients - wg.Add(1) + wg.Go( + func() { + httpClient, err := getRandomClientIPs(auth, url, ips) + if err != nil { + fatalWithCleanup(err) + } - go func() { - defer wg.Done() - - httpClient, err := getRandomClientIPs(auth, url, ips) - if err != nil { - fatalWithCleanup(err) - } - - err = tconfig.tfunc(workdir, url, repo, requests/concurrency, tconfig, statsCh, httpClient, skipCleanup) - if err != nil { - fatalWithCleanup(err) - } - }() + err = tconfig.tfunc(workdir, url, repo, requests/concurrency, tconfig, statsCh, httpClient, skipCleanup) + if err != nil { + fatalWithCleanup(err) + } + }) } wg.Wait() diff --git a/go.mod b/go.mod index 61ffd57e..8fa59ac5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module zotregistry.dev/zot/v2 -go 1.24.6 +go 1.25.0 require ( github.com/99designs/gqlgen v0.17.83 @@ -10,12 +10,12 @@ require ( github.com/aquasecurity/trivy v0.65.0 github.com/aquasecurity/trivy-db v0.0.0-20250723062229-56ec1e482238 github.com/aws/aws-sdk-go v1.55.8 - github.com/aws/aws-sdk-go-v2 v1.39.6 - github.com/aws/aws-sdk-go-v2/config v1.31.20 - github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.20.23 - github.com/aws/aws-sdk-go-v2/service/dynamodb v1.52.6 - github.com/aws/aws-sdk-go-v2/service/ecr v1.51.2 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.13 + github.com/aws/aws-sdk-go-v2 v1.40.0 + github.com/aws/aws-sdk-go-v2/config v1.32.1 + github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.20.25 + github.com/aws/aws-sdk-go-v2/service/dynamodb v1.53.1 + github.com/aws/aws-sdk-go-v2/service/ecr v1.54.0 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1 github.com/aws/aws-secretsmanager-caching-go v1.2.0 github.com/aws/smithy-go v1.23.2 github.com/bmatcuk/doublestar/v4 v4.9.1 @@ -59,7 +59,7 @@ require ( github.com/prometheus/client_golang v1.23.2 github.com/prometheus/client_model v0.6.2 github.com/rbcervilla/redisstore/v9 v9.0.0 - github.com/redis/go-redis/v9 v9.16.0 + github.com/redis/go-redis/v9 v9.17.0 github.com/regclient/regclient v0.10.0 github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 github.com/sigstore/cosign/v3 v3.0.2 @@ -80,7 +80,7 @@ require ( google.golang.org/protobuf v1.36.10 gopkg.in/resty.v1 v1.12.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/apimachinery v0.34.1 + k8s.io/apimachinery v0.34.2 modernc.org/sqlite v1.40.0 oras.land/oras-go/v2 v2.6.0 sigs.k8s.io/controller-runtime v0.22.4 @@ -168,22 +168,23 @@ require ( github.com/aquasecurity/trivy-checks v1.11.3-0.20250604022615-9a7efa7c9169 // indirect github.com/aquasecurity/trivy-java-db v0.0.0-20240109071736-184bd7481d48 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.18.24 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.19.1 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect - github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.32.4 // indirect + github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.32.5 // indirect github.com/aws/aws-sdk-go-v2/service/ebs v1.25.3 // indirect github.com/aws/aws-sdk-go-v2/service/ec2 v1.234.0 // indirect github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.33.2 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.13 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.30.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.40.2 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.14 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.88.3 // indirect + github.com/aws/aws-sdk-go-v2/service/signin v1.0.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.30.4 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.9 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.41.1 // indirect github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.10.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect @@ -222,7 +223,7 @@ require ( github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect github.com/containerd/ttrpc v1.2.7 // indirect github.com/containerd/typeurl/v2 v2.2.3 // indirect - github.com/coreos/go-oidc/v3 v3.14.1 // indirect + github.com/coreos/go-oidc/v3 v3.16.0 // indirect github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect github.com/cyphar/filepath-securejoin v0.6.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect @@ -354,7 +355,7 @@ require ( github.com/lestrrat-go/jwx/v3 v3.0.11 // indirect github.com/lestrrat-go/option v1.0.1 // indirect github.com/lestrrat-go/option/v2 v2.0.0 // indirect - github.com/letsencrypt/boulder v0.0.0-20240726163629-a21c417bc04e // indirect + github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect github.com/liamg/memoryfs v1.6.0 // indirect github.com/lib/pq v1.10.9 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect @@ -369,6 +370,7 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.19 // indirect github.com/mattn/go-shellwords v1.0.12 // indirect + github.com/miekg/dns v1.1.61 // indirect github.com/miekg/pkcs11 v1.1.1 // indirect github.com/minio/highwayhash v1.0.4-0.20251030100505-070ab1a87a76 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect @@ -430,6 +432,7 @@ require ( github.com/prometheus/procfs v0.19.2 // indirect github.com/protocolbuffers/txtpbfmt v0.0.0-20250627152318-f293424e46b5 // indirect github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect + github.com/redis/go-redis/extra/redisotel/v9 v9.5.3 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/rubenv/sql-migrate v1.8.0 // indirect @@ -447,7 +450,7 @@ require ( github.com/sergi/go-diff v1.4.0 // indirect github.com/shibumi/go-pathspec v1.3.0 // indirect github.com/shopspring/decimal v1.4.0 // indirect - github.com/sigstore/cosign/v2 v2.5.2 // indirect + github.com/sigstore/cosign/v2 v2.6.1 // indirect github.com/sigstore/fulcio v1.7.1 // indirect github.com/sigstore/protobuf-specs v0.5.0 // indirect github.com/sigstore/rekor v1.4.2 // indirect diff --git a/go.sum b/go.sum index 5ae48af2..676e797b 100644 --- a/go.sum +++ b/go.sum @@ -859,52 +859,54 @@ github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX github.com/aws/aws-sdk-go v1.47.10/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ= github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk= -github.com/aws/aws-sdk-go-v2 v1.39.6 h1:2JrPCVgWJm7bm83BDwY5z8ietmeJUbh3O2ACnn+Xsqk= -github.com/aws/aws-sdk-go-v2 v1.39.6/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE= -github.com/aws/aws-sdk-go-v2/config v1.31.20 h1:/jWF4Wu90EhKCgjTdy1DGxcbcbNrjfBHvksEL79tfQc= -github.com/aws/aws-sdk-go-v2/config v1.31.20/go.mod h1:95Hh1Tc5VYKL9NJ7tAkDcqeKt+MCXQB1hQZaRdJIZE0= -github.com/aws/aws-sdk-go-v2/credentials v1.18.24 h1:iJ2FmPT35EaIB0+kMa6TnQ+PwG5A1prEdAw+PsMzfHg= -github.com/aws/aws-sdk-go-v2/credentials v1.18.24/go.mod h1:U91+DrfjAiXPDEGYhh/x29o4p0qHX5HDqG7y5VViv64= -github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.20.23 h1:lbCh6aGAGHC/tZn30uaB5C1Txr5nRMr86ObRrDRZTYU= -github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.20.23/go.mod h1:JX1mhxc+O8hXWVVoA+gh9Y2iDLEY3AQQ2/Ix6dQKnQQ= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 h1:T1brd5dR3/fzNFAQch/iBKeX07/ffu/cLu+q+RuzEWk= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13/go.mod h1:Peg/GBAQ6JDt+RoBf4meB1wylmAipb7Kg2ZFakZTlwk= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 h1:a+8/MLcWlIxo1lF9xaGt3J/u3yOZx+CdSveSNwjhD40= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13/go.mod h1:oGnKwIYZ4XttyU2JWxFrwvhF6YKiK/9/wmE3v3Iu9K8= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 h1:HBSI2kDkMdWz4ZM7FjwE7e/pWDEZ+nR95x8Ztet1ooY= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13/go.mod h1:YE94ZoDArI7awZqJzBAZ3PDD2zSfuP7w6P2knOzIn8M= +github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc= +github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE= +github.com/aws/aws-sdk-go-v2/config v1.32.1 h1:iODUDLgk3q8/flEC7ymhmxjfoAnBDwEEYEVyKZ9mzjU= +github.com/aws/aws-sdk-go-v2/config v1.32.1/go.mod h1:xoAgo17AGrPpJBSLg81W+ikM0cpOZG8ad04T2r+d5P0= +github.com/aws/aws-sdk-go-v2/credentials v1.19.1 h1:JeW+EwmtTE0yXFK8SmklrFh/cGTTXsQJumgMZNlbxfM= +github.com/aws/aws-sdk-go-v2/credentials v1.19.1/go.mod h1:BOoXiStwTF+fT2XufhO0Efssbi1CNIO/ZXpZu87N0pw= +github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.20.25 h1:PcVbv9+k/gKWru6CB8GxfD2VNyBR54NxDUpUoLA1JFM= +github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.20.25/go.mod h1:kjc38Ecff42jswezFNVPRdDC1RjA0uIPbWZd3lEUsz8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 h1:WZVR5DbDgxzA0BJeudId89Kmgy6DIU4ORpxwsVHz0qA= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14/go.mod h1:Dadl9QO0kHgbrH1GRqGiZdYtW5w+IXXaBNCHTIaheM4= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 h1:PZHqQACxYb8mYgms4RZbhZG0a7dPW06xOjmaH0EJC/I= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14/go.mod h1:VymhrMJUWs69D8u0/lZ7jSB6WgaG/NqHi3gX0aYf6U0= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 h1:bOS19y6zlJwagBfHxs0ESzr1XCOU2KXJCWcq3E2vfjY= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14/go.mod h1:1ipeGBMAxZ0xcTm6y6paC2C/J6f6OO7LBODV9afuAyM= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.52.6 h1:jlPkBSbMSpqVk47u9kqblihtXlmzYv3ZFXtuNKUNwDc= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.52.6/go.mod h1:6eUUnWOJ8sucL5Uk8rPkFo8FYioM0CTNGHga8hwzXVc= -github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.32.4 h1:/uHlzAMroQ8CDKyCxC0sTgZKQNZUoG9USaWQ8PT3fG4= -github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.32.4/go.mod h1:nZ9KOFbkwpJtaM4VaBI+Jh6b3QrAyRX/k2hcNogeUZc= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.53.1 h1:94W5IklNYC4LSldDFfH9E+gQbczZjqRwEr6lN5wEpCM= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.53.1/go.mod h1:bz4cZH7uK5fLxQbj7hL4MFDL+pjReC9en/nM2Wfwxsk= +github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.32.5 h1:n+kCZnh0GUvkTFRI+PzADqyMj9rIoeBESipUiaEoByE= +github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.32.5/go.mod h1:r2DJVcbGPv7oJGoPICCQJ+4ci5oSGjdXtdscnJIQBfk= github.com/aws/aws-sdk-go-v2/service/ebs v1.25.3 h1:0Z1Oz8bRQJ1I/kDmTbISFxKwptaJoghfjh4QrKmXzE0= github.com/aws/aws-sdk-go-v2/service/ebs v1.25.3/go.mod h1:qIEaYAxM0l8/Tq5XtqCgc4Zs1a14JXoO2wU+LcCQDVk= github.com/aws/aws-sdk-go-v2/service/ec2 v1.234.0 h1:CwPCXL7/lBUFtgm+8P3V/eRi25Gu8UuvCrevjxJJrNI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.234.0/go.mod h1:K7qdQFo+lbGM48aPEyoPfy/VN/xNOA4o8GGczfSXNcQ= -github.com/aws/aws-sdk-go-v2/service/ecr v1.51.2 h1:aq2N/9UkbEyljIQ7OFcudEgUsJzO8MYucmfsM/k/dmc= -github.com/aws/aws-sdk-go-v2/service/ecr v1.51.2/go.mod h1:1NVD1KuMjH2GqnPwMotPndQaT/MreKkWpjkF12d6oKU= +github.com/aws/aws-sdk-go-v2/service/ecr v1.54.0 h1:ZIHAPzOl29665Ny0bcOZaiQh3ooQmKZdnpjUr9Bs6D8= +github.com/aws/aws-sdk-go-v2/service/ecr v1.54.0/go.mod h1:gTUZahuPMDg0ySQRPFNIbxUzpqu9CSSzU2LVURbWi54= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.33.2 h1:XJ/AEFYj9VFPJdF+VFi4SUPEDfz1akHwxxm07JfZJcs= github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.33.2/go.mod h1:JUBHdhvKbbKmhaHjLsKJAWnQL80T6nURmhB/LEprV+4= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 h1:x2Ibm/Af8Fi+BH+Hsn9TXGdT+hKbDd5XOTZxTMxDk7o= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3/go.mod h1:IW1jwyrQgMdhisceG8fQLmQIydcT/jWY21rFhzgaKwo= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.13 h1:FScsqdRyKFkw3u2ysLeWC0dbaz9I+g0xJ1JlQpH6bPo= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.13/go.mod h1:wkhwIaGltEuG4SRwNzPiJmf/tDp+yL5ym55Lt4bheno= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 h1:kDqdFvMY4AtKoACfzIGD8A0+hbT41KTKF//gq7jITfM= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13/go.mod h1:lmKuogqSU3HzQCwZ9ZtcqOc5XGMqtDK7OIc2+DxiUEg= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.14 h1:3exo28cClRTVnxdj/LULxkESZSSv74RUIjZ7tfHXfWQ= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.11.14/go.mod h1:yLon9pByjyB6JZq5IAmwnjE3ObIhD0QibfRWH7tUhLU= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 h1:FIouAnCE46kyYqyhs0XEBDFFSREtdnr8HQuLPQPLCrY= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14/go.mod h1:UTwDc5COa5+guonQU8qBikJo1ZJ4ln2r1MkF7Dqag1E= github.com/aws/aws-sdk-go-v2/service/kms v1.45.3 h1:hp7qDEQkW3IwV5eaTy2inECTgRHo0o/vgIVxq+ydNiU= github.com/aws/aws-sdk-go-v2/service/kms v1.45.3/go.mod h1:EADaLXofJkof++MP9zhzSZ0byBMOZTIRjtJO/ZMuPVE= -github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1 h1:+RpGuaQ72qnU83qBKVwxkznewEdAGhIWo/PQCmkhhog= -github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.13 h1:fObpETM4TWD58Uqp9QiMVnYP7gT/IT3r/D+5m/K5MdI= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.39.13/go.mod h1:QgVIY03/XoQs2iFr0MbQuQ/Tf1RwlkOvuySWMh1wph4= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.3 h1:NjShtS1t8r5LUfFVtFeI8xLAHQNTa7UI0VawXlrBMFQ= -github.com/aws/aws-sdk-go-v2/service/sso v1.30.3/go.mod h1:fKvyjJcz63iL/ftA6RaM8sRCtN4r4zl4tjL3qw5ec7k= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7 h1:gTsnx0xXNQ6SBbymoDvcoRHL+q4l/dAFsQuKfDWSaGc= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.7/go.mod h1:klO+ejMvYsB4QATfEOIXk8WAEwN4N0aBfJpvC+5SZBo= -github.com/aws/aws-sdk-go-v2/service/sts v1.40.2 h1:HK5ON3KmQV2HcAunnx4sKLB9aPf3gKGwVAf7xnx0QT0= -github.com/aws/aws-sdk-go-v2/service/sts v1.40.2/go.mod h1:E19xDjpzPZC7LS2knI9E6BaRFDK43Eul7vd6rSq2HWk= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.3 h1:P18I4ipbk+b/3dZNq5YYh+Hq6XC0vp5RWkLp1tJldDA= +github.com/aws/aws-sdk-go-v2/service/s3 v1.88.3/go.mod h1:Rm3gw2Jov6e6kDuamDvyIlZJDMYk97VeCZ82wz/mVZ0= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1 h1:w6a0H79HrHf3lr+zrw+pSzR5B+caiQFAKiNHlrUcnoc= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.40.1/go.mod h1:c6Vg0BRiU7v0MVhHupw90RyL120QBwAMLbDCzptGeMk= +github.com/aws/aws-sdk-go-v2/service/signin v1.0.1 h1:BDgIUYGEo5TkayOWv/oBLPphWwNm/A91AebUjAu5L5g= +github.com/aws/aws-sdk-go-v2/service/signin v1.0.1/go.mod h1:iS6EPmNeqCsGo+xQmXv0jIMjyYtQfnwg36zl2FwEouk= +github.com/aws/aws-sdk-go-v2/service/sso v1.30.4 h1:U//SlnkE1wOQiIImxzdY5PXat4Wq+8rlfVEw4Y7J8as= +github.com/aws/aws-sdk-go-v2/service/sso v1.30.4/go.mod h1:av+ArJpoYf3pgyrj6tcehSFW+y9/QvAY8kMooR9bZCw= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.9 h1:LU8S9W/mPDAU9q0FjCLi0TrCheLMGwzbRpvUMwYspcA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.9/go.mod h1:/j67Z5XBVDx8nZVp9EuFM9/BS5dvBznbqILGuu73hug= +github.com/aws/aws-sdk-go-v2/service/sts v1.41.1 h1:GdGmKtG+/Krag7VfyOXV17xjTCz0i9NT+JnqLTOI5nA= +github.com/aws/aws-sdk-go-v2/service/sts v1.41.1/go.mod h1:6TxbXoDSgBQ225Qd8Q+MbxUxUh6TtNKwbRt/EPS9xso= github.com/aws/aws-secretsmanager-caching-go v1.2.0 h1:gUA+CVKvFLj4OUSknhIrnt4dF7Y37+JrChKqfaehJME= github.com/aws/aws-secretsmanager-caching-go v1.2.0/go.mod h1:6t2/zQIsigFMlnpOdGj503Dgaz24tMqIRhass9uoTBo= github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM= @@ -1036,8 +1038,8 @@ github.com/containerd/ttrpc v1.2.7 h1:qIrroQvuOL9HQ1X6KHe2ohc7p+HP/0VE6XPU7elJRq github.com/containerd/ttrpc v1.2.7/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o= github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40= github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk= -github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk= -github.com/coreos/go-oidc/v3 v3.14.1/go.mod h1:HaZ3szPaZ0e4r6ebqvsLWlk2Tn+aejfmrfah6hnSYEU= +github.com/coreos/go-oidc/v3 v3.16.0 h1:qRQUCFstKpXwmEjDQTIbyY/5jF00+asXzSkmkoa/mow= +github.com/coreos/go-oidc/v3 v3.16.0/go.mod h1:wqPbKFrVnE90vty060SB40FCJ8fTHTxSwyXJqZH+sI8= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA= @@ -1405,8 +1407,6 @@ github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y= github.com/google/go-github/v62 v62.0.0 h1:/6mGCaRywZz9MuHyw9gD1CwsbmBX8GWsbFkwMmHdhl4= github.com/google/go-github/v62 v62.0.0/go.mod h1:EMxeUqGJq2xRu9DYBMwel/mr7kZrzUOfQmmpYrZn2a4= -github.com/google/go-github/v72 v72.0.0 h1:FcIO37BLoVPBO9igQQ6tStsv2asG4IPcYFi655PPvBM= -github.com/google/go-github/v72 v72.0.0/go.mod h1:WWtw8GMRiL62mvIquf1kO3onRHeWWKmK01qdCY8c5fg= github.com/google/go-github/v73 v73.0.0 h1:aR+Utnh+Y4mMkS+2qLQwcQ/cF9mOTpdwnzlaw//rG24= github.com/google/go-github/v73 v73.0.0/go.mod h1:fa6w8+/V+edSU0muqdhCVY7Beh1M8F1IlQPZIANKIYw= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= @@ -1667,8 +1667,8 @@ github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNB github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lestrrat-go/option/v2 v2.0.0 h1:XxrcaJESE1fokHy3FpaQ/cXW8ZsIdWcdFzzLOcID3Ss= github.com/lestrrat-go/option/v2 v2.0.0/go.mod h1:oSySsmzMoR0iRzCDCaUfsCzxQHUEuhOViQObyy7S6Vg= -github.com/letsencrypt/boulder v0.0.0-20240726163629-a21c417bc04e h1:NbhCRO0luM3HY9TbETRWyjAMoqlSwFlzrwVaEALThoI= -github.com/letsencrypt/boulder v0.0.0-20240726163629-a21c417bc04e/go.mod h1:qxVti2njl9SutSz7ZIxPGGt7bsoDPyjc+Nr8xJcuF+k= +github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2TSgRbAhD7yjZzTQmcN25sDRPEeinR51yQ= +github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk= github.com/liamg/memoryfs v1.6.0 h1:jAFec2HI1PgMTem5gR7UT8zi9u4BfG5jorCRlLH06W8= github.com/liamg/memoryfs v1.6.0/go.mod h1:z7mfqXFQS8eSeBBsFjYLlxYRMRyiPktytvYCYTb3BSk= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= @@ -1933,12 +1933,12 @@ github.com/rbcervilla/redisstore/v9 v9.0.0 h1:wOPbBaydbdxzi1gTafDftCI/Z7vnsXw0QD github.com/rbcervilla/redisstore/v9 v9.0.0/go.mod h1:q/acLpoKkTZzIsBYt0R4THDnf8W/BH6GjQYvxDSSfdI= github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg= github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho= -github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U= -github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 h1:EfpWLLCyXw8PSM2/XNJLjI3Pb27yVE+gIAfeqp8LUCc= -github.com/redis/go-redis/extra/redisotel/v9 v9.0.5/go.mod h1:WZjPDy7VNzn77AAfnAfVjZNvfJTYfPetfZk5yoSTLaQ= -github.com/redis/go-redis/v9 v9.16.0 h1:OotgqgLSRCmzfqChbQyG1PHC3tLNR89DG4jdOERSEP4= -github.com/redis/go-redis/v9 v9.16.0/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= +github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3 h1:1/BDligzCa40GTllkDnY3Y5DTHuKCONbB2JcRyIfl20= +github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3/go.mod h1:3dZmcLn3Qw6FLlWASn1g4y+YO9ycEFUOM+bhBmzLVKQ= +github.com/redis/go-redis/extra/redisotel/v9 v9.5.3 h1:kuvuJL/+MZIEdvtb/kTBRiRgYaOmx1l+lYJyVdrRUOs= +github.com/redis/go-redis/extra/redisotel/v9 v9.5.3/go.mod h1:7f/FMrf5RRRVHXgfk7CzSVzXHiWeuOQUu2bsVqWoa+g= +github.com/redis/go-redis/v9 v9.17.0 h1:K6E+ZlYN95KSMmZeEQPbU/c++wfmEvfFB17yEAq/VhM= +github.com/redis/go-redis/v9 v9.17.0/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= github.com/redis/rueidis v1.0.64 h1:XqgbueDuNV3qFdVdQwAHJl1uNt90zUuAJuzqjH4cw6Y= github.com/redis/rueidis v1.0.64/go.mod h1:Lkhr2QTgcoYBhxARU7kJRO8SyVlgUuEkcJO1Y8MCluA= github.com/redis/rueidis/rueidiscompat v1.0.64 h1:M8JbLP4LyHQhBLBRsUQIzui8/LyTtdESNIMVveqm4RY= @@ -2002,8 +2002,8 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sigstore/cosign/v2 v2.5.2 h1:i5Dw7M7W9OcWgyiknJB8vNx/07KweninBDxRoHPxqHE= -github.com/sigstore/cosign/v2 v2.5.2/go.mod h1:CYlcgkPQJZ5pvWlbl7mOfO/Q1S1N7r4tpdYCtFwhXco= +github.com/sigstore/cosign/v2 v2.6.1 h1:7Wf67ENNCjg+1fLqHRPgKUNaCCnCavnEfCe1LApOoIo= +github.com/sigstore/cosign/v2 v2.6.1/go.mod h1:L37doL+7s6IeCXFODV2J7kds5Po/srlVzA//++YqAJ8= github.com/sigstore/cosign/v3 v3.0.2 h1:VZrEg/CnocVRgieYBSqklq3f/AkVgN3iAqwiQxeXgoc= github.com/sigstore/cosign/v3 v3.0.2/go.mod h1:qz0RCzSoxiUu32z2jtyYRX/qXUyqmzK8O8PpMm+7wf4= github.com/sigstore/fulcio v1.7.1 h1:RcoW20Nz49IGeZyu3y9QYhyyV3ZKQ85T+FXPKkvE+aQ= @@ -3095,8 +3095,8 @@ k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM= k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk= k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI= k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc= -k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4= -k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= +k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4= +k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA= k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0= k8s.io/cli-runtime v0.33.3 h1:Dgy4vPjNIu8LMJBSvs8W0LcdV0PX/8aGG1DA1W8lklA= diff --git a/pkg/exporter/api/controller_test.go b/pkg/exporter/api/controller_test.go index 8b4446fb..4591b4e4 100644 --- a/pkg/exporter/api/controller_test.go +++ b/pkg/exporter/api/controller_test.go @@ -507,19 +507,16 @@ func TestNewExporter(t *testing.T) { workersSize := int(nBig.Int64()) for range workersSize { - wg.Add(1) + wg.Go( + func() { + m := serverController.Metrics.ReceiveMetrics() + json := jsoniter.ConfigCompatibleWithStandardLibrary - go func() { - defer wg.Done() - - m := serverController.Metrics.ReceiveMetrics() - json := jsoniter.ConfigCompatibleWithStandardLibrary - - _, err := json.Marshal(m) - if err != nil { - exporterController.Log.Error().Err(err).Msg("Concurrent metrics scrape fail") - } - }() + _, err := json.Marshal(m) + if err != nil { + exporterController.Log.Error().Err(err).Msg("Concurrent metrics scrape fail") + } + }) } wg.Wait()