From 52f728e1aca1ced7238e02457fb47e0415a6e71b Mon Sep 17 00:00:00 2001 From: Abhiuday Date: Thu, 14 Sep 2023 01:57:15 +0530 Subject: [PATCH 1/2] fix: updated version of go and github actions Signed-off-by: Abhiuday --- .github/workflows/build-and-release.yml | 96 +++++------ .github/workflows/ci.yml | 111 +++++++------ .github/workflows/component-generator.yaml | 14 +- .github/workflows/components-to-doc.yml | 84 +++++----- .github/workflows/e2etests.yml | 180 ++++++++++----------- .github/workflows/error-ref-publisher.yaml | 28 ++-- .github/workflows/label-commenter.yml | 4 +- .github/workflows/multi-platform.yml | 89 +++++----- Dockerfile | 3 +- build/Makefile.core.mk | 2 +- go.mod | 2 +- go.sum | 39 +++++ 12 files changed, 341 insertions(+), 311 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index a14b00beb..2b061b703 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -6,7 +6,7 @@ on: branches: - "master" paths-ignore: - - '.github/**' + - ".github/**" jobs: build: @@ -14,54 +14,54 @@ jobs: runs-on: ubuntu-22.04 # needs: [lint, error_check, static_check, vet, sec_check, tests] steps: - - name: Check out code - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: Setup Go - uses: actions/setup-go@v3 - with: - go-version: 1.19 - - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build . + - name: Check out code + uses: actions/checkout@v4 + with: + fetch-depth: 1 + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version: 1.21 + - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build . docker: name: Docker build and push runs-on: ubuntu-22.04 steps: - - name: Check out code - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: Docker login - uses: azure/docker-login@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Docker edge build & tag - if: startsWith(github.ref, 'refs/tags/') != true && success() - run: | - DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:edge-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::7} --build-arg VERSION="edge-latest" . - docker tag ${{ secrets.IMAGE_NAME }}:edge-latest ${{ secrets.IMAGE_NAME }}:edge-${GITHUB_SHA::7} - - name: Docker edge push - if: startsWith(github.ref, 'refs/tags/') != true && success() - run: | - docker push ${{ secrets.IMAGE_NAME }}:edge-latest - docker push ${{ secrets.IMAGE_NAME }}:edge-${GITHUB_SHA::7} - - name: Docker stable build & tag - if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() - run: | - DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest --build-arg GIT_COMMITSHA=${GITHUB_SHA::7} --build-arg VERSION=${GITHUB_REF/refs\/tags\//} . - docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_REF/refs\/tags\//} - docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7} - - name: Docker stable push - if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() - run: | - docker push ${{ secrets.IMAGE_NAME }}:stable-latest - docker push ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_REF/refs\/tags\//} - docker push ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7} - - name: Docker Hub Description - if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() - uses: peter-evans/dockerhub-description@v2.4.3 - env: - DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - DOCKERHUB_REPOSITORY: ${{ secrets.IMAGE_NAME }} + - name: Check out code + uses: actions/checkout@v4 + with: + fetch-depth: 1 + - name: Docker login + uses: azure/docker-login@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Docker edge build & tag + if: startsWith(github.ref, 'refs/tags/') != true && success() + run: | + DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:edge-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::7} --build-arg VERSION="edge-latest" . + docker tag ${{ secrets.IMAGE_NAME }}:edge-latest ${{ secrets.IMAGE_NAME }}:edge-${GITHUB_SHA::7} + - name: Docker edge push + if: startsWith(github.ref, 'refs/tags/') != true && success() + run: | + docker push ${{ secrets.IMAGE_NAME }}:edge-latest + docker push ${{ secrets.IMAGE_NAME }}:edge-${GITHUB_SHA::7} + - name: Docker stable build & tag + if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() + run: | + DOCKER_BUILDKIT=1 docker build --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest --build-arg GIT_COMMITSHA=${GITHUB_SHA::7} --build-arg VERSION=${GITHUB_REF/refs\/tags\//} . + docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_REF/refs\/tags\//} + docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7} + - name: Docker stable push + if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() + run: | + docker push ${{ secrets.IMAGE_NAME }}:stable-latest + docker push ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_REF/refs\/tags\//} + docker push ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7} + - name: Docker Hub Description + if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() + uses: peter-evans/dockerhub-description@v2.4.3 + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKERHUB_REPOSITORY: ${{ secrets.IMAGE_NAME }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad4d6b6d6..87998a8d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,8 +6,8 @@ on: tags: - "v*" paths-ignore: - - 'docs/**' - - '.github/**' + - "docs/**" + - ".github/**" pull_request: branches: - master @@ -16,15 +16,15 @@ jobs: name: golangci-lint runs-on: ubuntu-22.04 steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.19 - - uses: actions/checkout@v3 + go-version: 1.21 + - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. - version: v1.49 + version: v1.54 # Optional: working directory, useful for monorepos # working-directory: somedir @@ -39,65 +39,65 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - run: GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/kisielk/errcheck@latest; /home/runner/go/bin/errcheck -tags draft ./... error_code_check: name: Error code utility check runs-on: ubuntu-22.04 steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - run: | - errWillHave="level=error" - GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/layer5io/meshkit/cmd/errorutil; - err=$(/home/runner/go/bin/errorutil -d . update --skip-dirs meshery -i ./helpers -o ./helpers); - echo "ERR: $err"; - if [[ $err == *"$errWillHave"* ]]; - then - echo "$err"; - return 1; - fi - + errWillHave="level=error" + GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/layer5io/meshkit/cmd/errorutil; + err=$(/home/runner/go/bin/errorutil -d . update --skip-dirs meshery -i ./helpers -o ./helpers); + echo "ERR: $err"; + if [[ $err == *"$errWillHave"* ]]; + then + echo "$err"; + return 1; + fi + static_check: name: Static check runs-on: ubuntu-22.04 steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 - - uses: dominikh/staticcheck-action@v1.2.0 + go-version: 1.21 + - uses: dominikh/staticcheck-action@v1.3.0 with: install-go: false - version: "2022.1" + version: "2023.1.6" vet: name: Vet runs-on: ubuntu-22.04 steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - run: GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go vet -tags draft ./... sec_check: name: Security check @@ -106,36 +106,35 @@ jobs: GO111MODULE: on steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Run Gosec Security Scanner uses: securego/gosec@master with: - args: -exclude=G301,G304,G107,G101,G110,G204,G409,G305,G302 ./... + args: -exclude=G301,G304,G107,G101,G110,G204,G409,G305,G302 ./... tests: # needs: [lint, error_check, static_check, vet, sec_check] - name: Tests - runs-on: ubuntu-22.04 - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - steps: - - name: Check out code - uses: actions/checkout@v3 - with: - fetch-depth: 1 - - name: Setup Go - uses: actions/setup-go@v3 - with: - go-version: 1.19 - - name: Create cluster using KinD - uses: engineerd/setup-kind@v0.5.0 - with: - version: "v0.11.0" - - run: | - export CURRENTCONTEXT="$(kubectl config current-context)" - echo "current-context:" ${CURRENTCONTEXT} - export KUBECONFIG="${HOME}/.kube/config" - echo "environment-kubeconfig:" ${KUBECONFIG} - GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go test -v ./... - + name: Tests + runs-on: ubuntu-22.04 + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + steps: + - name: Check out code + uses: actions/checkout@v4 + with: + fetch-depth: 1 + - name: Setup Go + uses: actions/setup-go@v4 + with: + go-version: 1.21 + - name: Create cluster using KinD + uses: engineerd/setup-kind@v0.5.0 + with: + version: "v0.11.1" + - run: | + export CURRENTCONTEXT="$(kubectl config current-context)" + echo "current-context:" ${CURRENTCONTEXT} + export KUBECONFIG="${HOME}/.kube/config" + echo "environment-kubeconfig:" ${KUBECONFIG} + GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go test -v ./... diff --git a/.github/workflows/component-generator.yaml b/.github/workflows/component-generator.yaml index ef1e2babf..02bb4d6eb 100644 --- a/.github/workflows/component-generator.yaml +++ b/.github/workflows/component-generator.yaml @@ -2,26 +2,26 @@ name: Meshery Istio Pattern Components Generator on: push: branches: - - 'master' + - "master" paths-ignore: - - 'docs/**' - - '.github/**' + - "docs/**" + - ".github/**" schedule: - - cron: "0 0 * * *" + - cron: "0 0 * * *" jobs: GenerateComponents: runs-on: ubuntu-22.04 steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 token: ${{ secrets.GH_ACCESS_TOKEN }} ref: "master" - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - name: Run adapter to create components run: | touch log.txt diff --git a/.github/workflows/components-to-doc.yml b/.github/workflows/components-to-doc.yml index e3c05095d..792609b29 100644 --- a/.github/workflows/components-to-doc.yml +++ b/.github/workflows/components-to-doc.yml @@ -10,54 +10,54 @@ jobs: CopyComponents: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Make components to .md files run: | - - function join_by { - local d=${1-} f=${2-} - if shift 2; then - echo "$f${@/#/$d}" - - fi - } - mkdir output - folder_path=templates/meshmodel/components/* - for file in $folder_path; - do - folder_name="$file/*" - onlyfolder=$(basename "$file") - echo "--- - component: $onlyfolder - integrations:" > $onlyfolder.md - for indFile in $folder_name; - do - filename=$(basename "$indFile") - temp_filename=$filename - IFS="." - read -ra newarr <<< "$temp_filename" - IFS="" - if [[ "${newarr[7]}" == "schema" ]] - then - continue - fi - ans=$(join_by . ${newarr[0]} ${newarr[1]}) - echo " - $ans" >> $onlyfolder.md - done - echo "---" >> $onlyfolder.md - mv $onlyfolder.md output - done + + function join_by { + local d=${1-} f=${2-} + if shift 2; then + echo "$f${@/#/$d}" + + fi + } + mkdir output + folder_path=templates/meshmodel/components/* + for file in $folder_path; + do + folder_name="$file/*" + onlyfolder=$(basename "$file") + echo "--- + component: $onlyfolder + integrations:" > $onlyfolder.md + for indFile in $folder_name; + do + filename=$(basename "$indFile") + temp_filename=$filename + IFS="." + read -ra newarr <<< "$temp_filename" + IFS="" + if [[ "${newarr[7]}" == "schema" ]] + then + continue + fi + ans=$(join_by . ${newarr[0]} ${newarr[1]}) + echo " - $ans" >> $onlyfolder.md + done + echo "---" >> $onlyfolder.md + mv $onlyfolder.md output + done - name: Pushes folder to main repo uses: crykn/copy_folder_to_another_repo_action@v1.0.6 env: API_TOKEN_GITHUB: ${{ secrets.GH_ACCESS_TOKEN }} with: - source_folder: 'output' - destination_repo: 'meshery/meshery' - destination_folder: 'docs/_integrations/istio' - destination_branch: 'master' - user_email: 'ci@layer5.io' - user_name: 'l5io' - commit_msg: 'Adapters Component added' \ No newline at end of file + source_folder: "output" + destination_repo: "meshery/meshery" + destination_folder: "docs/_integrations/istio" + destination_branch: "master" + user_email: "ci@layer5.io" + user_name: "l5io" + commit_msg: "Adapters Component added" diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 3756b4eaa..3a3929d15 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -7,7 +7,7 @@ on: tags: - "v*" paths-ignore: - - 'docs/**' + - "docs/**" pull_request: branches: - "*" @@ -18,32 +18,32 @@ jobs: runs-on: ubuntu-22.04 outputs: sm_version: ${{ steps.gettag.outputs.release }} - adapter_version: ${{ env.version }} + adapter_version: ${{ env.version }} steps: - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get version of adapter run: | - if [ ${{ github.event_name }} == "release" ];then - echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - else - echo "version=edge" >> $GITHUB_ENV - fi + if [ ${{ github.event_name }} == "release" ];then + echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV + else + echo "version=edge" >> $GITHUB_ENV + fi - name: Get latest release tag id: gettag uses: pozetroninc/github-action-get-latest-release@master with: repository: istio/istio - excludes: prerelease, draft, edge + excludes: prerelease, draft, edge - name: Change service mesh version in patternfile - run: | - yq e -i '.services.istio.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml - cat ./.github/install/deploy.yaml + run: | + yq e -i '.services.istio.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml + cat ./.github/install/deploy.yaml - name: Uploading file - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: patternfile - path: ./.github/install/deploy.yaml + path: ./.github/install/deploy.yaml TestIstioForServicemeshInstall: needs: SetPatternfileForServicemeshInstall @@ -59,31 +59,31 @@ jobs: provider: Local k8s_version: v1.20.1 sm_version: ${{ needs.SetPatternfileForServicemeshInstall.outputs.sm_version }} - adapter_version: ${{ needs.SetPatternfileForServicemeshInstall.outputs.adapter_version }} + adapter_version: ${{ needs.SetPatternfileForServicemeshInstall.outputs.adapter_version }} output_filename: data.json secrets: - token: ${{ secrets.PROVIDER_TOKEN }} + token: ${{ secrets.PROVIDER_TOKEN }} UpdateDocsForServicemeshInstall: needs: TestIstioForServicemeshInstall - if: "always() && github.event_name != 'pull_request' " + if: "always() && github.event_name != 'pull_request' " runs-on: ubuntu-22.04 steps: - name: Skip if needed run: | - echo "this is it ${{ needs.SkipIfNeeded.outputs.skipdocupdate }} " - if [ "${{github.event_name }}" == "push" ];then - echo "version=edge" >> $GITHUB_ENV - fi - if [ "${{github.event_name }}" == "release" ];then - echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - fi - - uses: actions/checkout@v3 + echo "this is it ${{ needs.SkipIfNeeded.outputs.skipdocupdate }} " + if [ "${{github.event_name }}" == "push" ];then + echo "version=edge" >> $GITHUB_ENV + fi + if [ "${{github.event_name }}" == "release" ];then + echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV + fi + - uses: actions/checkout@v4 with: - repository: meshery/meshery - token: ${{ secrets.GH_ACCESS_TOKEN }} + repository: meshery/meshery + token: ${{ secrets.GH_ACCESS_TOKEN }} - name: DownloadJSON - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: data.json - name: Add commit SHORT_SHA @@ -124,41 +124,41 @@ jobs: commit_user_name: l5io commit_user_email: ci@layer5.io commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - commit_options: '--signoff' - commit_message: '[Docs] Test status of adapter' + commit_options: "--signoff" + commit_message: "[Docs] Test status of adapter" SetPatternfileForServicemeshAndAddon: runs-on: ubuntu-22.04 outputs: sm_version: ${{ steps.gettag.outputs.release }} - adapter_version: ${{ env.version }} + adapter_version: ${{ env.version }} steps: - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get version of adapter run: | - if [ ${{ github.event_name }} == "release" ];then - echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - else - echo "version=edge" >> $GITHUB_ENV - fi + if [ ${{ github.event_name }} == "release" ];then + echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV + else + echo "version=edge" >> $GITHUB_ENV + fi - name: Get latest release tag id: gettag uses: pozetroninc/github-action-get-latest-release@master with: repository: istio/istio - excludes: prerelease, draft, edge + excludes: prerelease, draft, edge - name: Change service mesh version in patternfile - run: | - yq e -i '.services.istio.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithaddons.yaml - yq e -i '.services.grafana.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithaddons.yaml - yq e -i '.services.prometheus.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithaddons.yaml - cat ./.github/install/deploywithaddons.yaml + run: | + yq e -i '.services.istio.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithaddons.yaml + yq e -i '.services.grafana.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithaddons.yaml + yq e -i '.services.prometheus.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithaddons.yaml + cat ./.github/install/deploywithaddons.yaml - name: Uploading file - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: patternfile - path: ./.github/install/deploywithaddons.yaml + path: ./.github/install/deploywithaddons.yaml TestIstioForServicemeshAndAddon: needs: SetPatternfileForServicemeshAndAddon @@ -174,31 +174,31 @@ jobs: provider: Local k8s_version: v1.20.1 sm_version: ${{ needs.SetPatternfileForServicemeshAndAddon.outputs.sm_version }} - adapter_version: ${{ needs.SetPatternfileForServicemeshAndAddon.outputs.adapter_version }} + adapter_version: ${{ needs.SetPatternfileForServicemeshAndAddon.outputs.adapter_version }} output_filename: data.json secrets: - token: ${{ secrets.PROVIDER_TOKEN }} + token: ${{ secrets.PROVIDER_TOKEN }} UpdateDocsForServicemeshAndAddon: needs: TestIstioForServicemeshAndAddon - if: "always() && github.event_name != 'pull_request' " + if: "always() && github.event_name != 'pull_request' " runs-on: ubuntu-22.04 steps: - name: Skip if needed run: | - echo "this is it ${{ needs.SkipIfNeeded.outputs.skipdocupdate }} " - if [ "${{github.event_name }}" == "push" ];then - echo "version=edge" >> $GITHUB_ENV - fi - if [ "${{github.event_name }}" == "release" ];then - echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - fi - - uses: actions/checkout@v3 + echo "this is it ${{ needs.SkipIfNeeded.outputs.skipdocupdate }} " + if [ "${{github.event_name }}" == "push" ];then + echo "version=edge" >> $GITHUB_ENV + fi + if [ "${{github.event_name }}" == "release" ];then + echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV + fi + - uses: actions/checkout@v4 with: - repository: meshery/meshery - token: ${{ secrets.GH_ACCESS_TOKEN }} + repository: meshery/meshery + token: ${{ secrets.GH_ACCESS_TOKEN }} - name: DownloadJSON - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: data.json - name: Add commit SHORT_SHA @@ -241,39 +241,39 @@ jobs: commit_user_name: l5io commit_user_email: ci@layer5.io commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - commit_options: '--signoff' - commit_message: '[Docs] Test status of adapter' + commit_options: "--signoff" + commit_message: "[Docs] Test status of adapter" SetPatternfileForServicemeshAndSampleApp: runs-on: ubuntu-22.04 outputs: sm_version: ${{ steps.gettag.outputs.release }} - adapter_version: ${{ env.version }} + adapter_version: ${{ env.version }} steps: - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get version of adapter run: | - if [ ${{ github.event_name }} == "release" ];then - echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - else - echo "version=edge" >> $GITHUB_ENV - fi + if [ ${{ github.event_name }} == "release" ];then + echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV + else + echo "version=edge" >> $GITHUB_ENV + fi - name: Get latest release tag id: gettag uses: pozetroninc/github-action-get-latest-release@master with: repository: istio/istio - excludes: prerelease, draft, edge + excludes: prerelease, draft, edge - name: Change service mesh version in patternfile - run: | - yq e -i '.services.istioinstallation.settings.istioVersion="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithsampleapp.yaml - cat ./.github/install/deploywithsampleapp.yaml + run: | + yq e -i '.services.istioinstallation.settings.istioVersion="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithsampleapp.yaml + cat ./.github/install/deploywithsampleapp.yaml - name: Uploading file - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: patternfile - path: ./.github/install/deploywithsampleapp.yaml + path: ./.github/install/deploywithsampleapp.yaml TestIstioForServicemeshAndSampleApp: needs: SetPatternfileForServicemeshAndSampleApp @@ -289,31 +289,31 @@ jobs: provider: Local k8s_version: v1.20.1 sm_version: ${{ needs.SetPatternfileForServicemeshAndSampleApp.outputs.sm_version }} - adapter_version: ${{ needs.SetPatternfileForServicemeshAndSampleApp.outputs.adapter_version }} + adapter_version: ${{ needs.SetPatternfileForServicemeshAndSampleApp.outputs.adapter_version }} output_filename: data.json secrets: - token: ${{ secrets.PROVIDER_TOKEN }} + token: ${{ secrets.PROVIDER_TOKEN }} UpdateDocsForServicemeshAndSampleApp: needs: TestIstioForServicemeshAndSampleApp - if: "always() && github.event_name != 'pull_request' " + if: "always() && github.event_name != 'pull_request' " runs-on: ubuntu-22.04 steps: - name: Skip if needed run: | - echo "this is it ${{ needs.SkipIfNeeded.outputs.skipdocupdate }} " - if [ "${{github.event_name }}" == "push" ];then - echo "version=edge" >> $GITHUB_ENV - fi - if [ "${{github.event_name }}" == "release" ];then - echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV - fi - - uses: actions/checkout@v3 + echo "this is it ${{ needs.SkipIfNeeded.outputs.skipdocupdate }} " + if [ "${{github.event_name }}" == "push" ];then + echo "version=edge" >> $GITHUB_ENV + fi + if [ "${{github.event_name }}" == "release" ];then + echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV + fi + - uses: actions/checkout@v4 with: - repository: meshery/meshery - token: ${{ secrets.GH_ACCESS_TOKEN }} + repository: meshery/meshery + token: ${{ secrets.GH_ACCESS_TOKEN }} - name: DownloadJSON - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: data.json - name: Add commit SHORT_SHA @@ -358,5 +358,5 @@ jobs: commit_user_name: l5io commit_user_email: ci@layer5.io commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - commit_options: '--signoff' - commit_message: '[Docs] Test status of adapter' + commit_options: "--signoff" + commit_message: "[Docs] Test status of adapter" diff --git a/.github/workflows/error-ref-publisher.yaml b/.github/workflows/error-ref-publisher.yaml index 2603ebc80..d2345c13f 100644 --- a/.github/workflows/error-ref-publisher.yaml +++ b/.github/workflows/error-ref-publisher.yaml @@ -2,9 +2,9 @@ name: Meshkit Error Codes Utility Runner on: push: branches: - - 'master' + - "master" paths: - - '**.go' + - "**.go" jobs: Update-error-codes: @@ -12,16 +12,16 @@ jobs: if: github.repository == 'meshery/meshery-istio' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # token here with write access to meshery-istio repo with: token: ${{ secrets.GH_ACCESS_TOKEN }} - ref: 'master' + ref: "master" - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - name: Run utility run: | @@ -33,19 +33,19 @@ jobs: commit_user_name: l5io commit_user_email: ci@layer5.io commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - commit_options: '--signoff' - commit_message: 'run error codes utility' + commit_options: "--signoff" + commit_message: "run error codes utility" file_pattern: helpers/ **error.go # to push changes to meshery docs - name: Checkout meshery - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: - repository: 'meshery/meshery' + repository: "meshery/meshery" # token with write access to meshery repository token: ${{ secrets.GH_ACCESS_TOKEN }} - path: 'meshery' - ref: 'master' + path: "meshery" + ref: "master" - name: Update docs run: | @@ -58,6 +58,6 @@ jobs: commit_user_name: l5io commit_user_email: ci@layer5.io commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> - commit_options: '--signoff' - commit_message: '[Docs] Error Code Reference: Meshery Adapter for Istio updated' + commit_options: "--signoff" + commit_message: "[Docs] Error Code Reference: Meshery Adapter for Istio updated" file_pattern: docs/ diff --git a/.github/workflows/label-commenter.yml b/.github/workflows/label-commenter.yml index 9e9ca103f..62c1ee597 100644 --- a/.github/workflows/label-commenter.yml +++ b/.github/workflows/label-commenter.yml @@ -18,9 +18,9 @@ jobs: comment: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: master # Set your default branch - name: Label Commenter - uses: peaceiris/actions-label-commenter@v1 \ No newline at end of file + uses: peaceiris/actions-label-commenter@v1 diff --git a/.github/workflows/multi-platform.yml b/.github/workflows/multi-platform.yml index 052385af1..c12d850bd 100644 --- a/.github/workflows/multi-platform.yml +++ b/.github/workflows/multi-platform.yml @@ -4,26 +4,26 @@ on: types: [published] push: tags: - - 'v*' + - "v*" branches: - - 'master' + - "master" paths-ignore: - - 'docs/**' - - '.github/**' + - "docs/**" + - ".github/**" workflow_dispatch: inputs: release-ver: - description: 'Stable Release Version' - required: true - default: 'v' + description: "Stable Release Version" + required: true + default: "v" stripped-release-ver: - description: 'Stripped Stable Release Version' - required: true - default: '' + description: "Stripped Stable Release Version" + required: true + default: "" release-channel: - description: 'Release Channel' - required: true - default: 'edge' + description: "Release Channel" + required: true + default: "edge" env: GIT_VERSION: ${{github.event.inputs.release-ver}} @@ -35,25 +35,22 @@ jobs: print-inputs: runs-on: ubuntu-22.04 steps: + - run: | + echo "Dispatched GIT_VERSION: ${{github.event.inputs.release-ver}}" + echo "Dispatched GIT_STRIPPED_VERSION: ${{github.event.inputs.stripped-release-ver}}" + echo "Env RELEASE_CHANNEL: ${{env.RELEASE_CHANNEL}}" + echo "Env GIT_VERSION: ${{env.GIT_VERSION}}" + echo "Env GIT_STRIPPED_VERSION: ${{env.GIT_STRIPPED_VERSION}}" + echo "Env GIT_TAG: ${{ github.event.release.tag_name }}" + echo "Env GITHUB_REF: $GITHUB_REF" + echo "Env GITHUB_REF:" ${GITHUB_REF} - - run: | - echo "Dispatched GIT_VERSION: ${{github.event.inputs.release-ver}}" - echo "Dispatched GIT_STRIPPED_VERSION: ${{github.event.inputs.stripped-release-ver}}" - echo "Env RELEASE_CHANNEL: ${{env.RELEASE_CHANNEL}}" - echo "Env GIT_VERSION: ${{env.GIT_VERSION}}" - echo "Env GIT_STRIPPED_VERSION: ${{env.GIT_STRIPPED_VERSION}}" - echo "Env GIT_TAG: ${{ github.event.release.tag_name }}" - echo "Env GITHUB_REF: $GITHUB_REF" - echo "Env GITHUB_REF:" ${GITHUB_REF} - docker-build: runs-on: ubuntu-22.04 steps: - - - name: Checkout repo - uses: actions/checkout@v3 - - - name: Identify Release Values + - name: Checkout repo + uses: actions/checkout@v4 + - name: Identify Release Values if: "${{ github.event.inputs.release-ver}} != 'v' }}" run: | if [[ ${GITHUB_REF} = refs/tags* ]] @@ -68,19 +65,16 @@ jobs: echo "Release channel determined to be $RELEASE_CHANNEL" echo "GIT_LATEST=$LATEST_VERSION" >> $GITHUB_ENV echo "GIT_VERSION=$GIT_VERSION" >> $GITHUB_ENV - echo "GIT_STRIPPED_VERSION=$GIT_STRIPPED_VERSION" >> $GITHUB_ENV + echo "GIT_STRIPPED_VERSION=$GIT_STRIPPED_VERSION" >> $GITHUB_ENV shell: bash - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Docker Meta + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Docker Meta id: meta - uses: docker/metadata-action@v3 + uses: docker/metadata-action@v5 with: images: ${{ secrets.IMAGE_NAME }} flavor: | @@ -90,28 +84,25 @@ jobs: type=semver,pattern={{version}},value=${{env.GIT_STRIPPED_VERSION}} type=raw,value=${{env.RELEASE_CHANNEL}}-{{tag}},enable=${{ startsWith(github.ref, 'refs/tags/v') }} type=raw,value=${{env.RELEASE_CHANNEL}}-latest - - - name: Login to DockerHub - uses: docker/login-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and Push - uses: docker/build-push-action@v2 + - name: Build and Push + uses: docker/build-push-action@v5 with: context: "{{defaultContext}}" push: true build-args: | VERSION=${{env.GIT_VERSION}} GIT_COMMITSHA=${GITHUB_SHA::7} - tags: ${{ steps.meta.outputs.tags }} + tags: ${{ steps.meta.outputs.tags }} platforms: linux/amd64,linux/arm64 - - - name: Docker Hub Description + - name: Docker Hub Description uses: peter-evans/dockerhub-description@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - repository: ${{ secrets.IMAGE_NAME }} - readme-filepath: README.md + repository: ${{ secrets.IMAGE_NAME }} + readme-filepath: README.md diff --git a/Dockerfile b/Dockerfile index 599111aad..1986fe6fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM golang:1.19 as builder +ARG GOLANG_VERSION=1.21 +FROM golang:${GOLANG_VERSION} as builder ARG VERSION ARG GIT_COMMITSHA diff --git a/build/Makefile.core.mk b/build/Makefile.core.mk index 7bb7627d7..bc5afcce1 100644 --- a/build/Makefile.core.mk +++ b/build/Makefile.core.mk @@ -19,7 +19,7 @@ GIT_VERSION = $(shell git describe --tags `git rev-list --tags --max-count=1`) GIT_COMMITSHA = $(shell git rev-list -1 HEAD) GIT_STRIPPED_VERSION=$(shell git describe --tags `git rev-list --tags --max-count=1` | cut -c 2-) -GOVERSION = 1.19 +GOVERSION = 1.21 GOPATH = $(shell go env GOPATH) GOBIN = $(GOPATH)/bin diff --git a/go.mod b/go.mod index 2f212fbe4..643fd8a54 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/layer5io/meshery-istio -go 1.19 +go 1.21 replace ( //github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible diff --git a/go.sum b/go.sum index ff259b495..9ee2e7d01 100644 --- a/go.sum +++ b/go.sum @@ -29,7 +29,9 @@ cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUM cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/compute v1.15.1 h1:7UGq3QknM33pw5xATlpzeoomNxsacIVvTqTTvbfajmE= +cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= @@ -61,6 +63,7 @@ github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -77,7 +80,9 @@ github.com/Masterminds/squirrel v1.5.3 h1:YPpoceAcxuzIljlr5iWpNKaql7hLeG1KLSrhvd github.com/Masterminds/squirrel v1.5.3/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= github.com/Microsoft/hcsshim v0.9.7 h1:mKNHW/Xvv1aFH87Jb6ERDzXTJTLPlmzfZ28VBFD/bfg= +github.com/Microsoft/hcsshim v0.9.7/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -86,6 +91,7 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -97,6 +103,7 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY= @@ -111,9 +118,13 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= +github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= +github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= +github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= +github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -135,6 +146,7 @@ github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b80 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= +github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/containerd v1.2.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.6.19 h1:F0qgQPrG0P2JPgwpxWxYavrVeXAG0ezUIB9Z/4FTUAU= github.com/containerd/containerd v1.6.19/go.mod h1:HZCDMn4v/Xl2579/MvtOC2M206i+JJ6VxFWU/NetrGY= @@ -156,6 +168,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -166,6 +179,7 @@ github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27N github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/distribution/distribution/v3 v3.0.0-20230214150026-36d8c594d7aa h1:L9Ay/slwQ4ERSPaurC+TVkZrM0K98GNrEEo1En3e8as= +github.com/distribution/distribution/v3 v3.0.0-20230214150026-36d8c594d7aa/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI= github.com/docker/cli v20.10.21+incompatible h1:qVkgyYUnOLQ98LtXBrwd/duVqPT2X4SHndOuGsfwyhU= github.com/docker/cli v20.10.21+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -180,6 +194,7 @@ github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNk github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -187,6 +202,7 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4= +github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -200,6 +216,7 @@ github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw= +github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -217,7 +234,9 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -331,6 +350,7 @@ github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -360,6 +380,7 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= +github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= @@ -419,6 +440,7 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGa github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= +github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= @@ -454,6 +476,7 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v0.0.0-20171017181929-23c074d0eceb/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= @@ -525,6 +548,7 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -622,6 +646,7 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI= +github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA= github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -657,6 +682,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4= github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs= +github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -664,6 +690,7 @@ github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys= +github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -681,6 +708,7 @@ github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= +github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -721,6 +749,7 @@ github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJf github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b h1:zd/2RNzIRkoGGMjE+YIsZ85CnDIz672JK2F3Zl4vux4= +github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b/go.mod h1:KjY0wibdYKc4DYkerHSbguaf3JeIPGhNJBp2BNiFH78= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -728,6 +757,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rubenv/sql-migrate v1.2.0 h1:fOXMPLMd41sK7Tg75SXDec15k3zg5WNV6SjuDRiNfcU= github.com/rubenv/sql-migrate v1.2.0/go.mod h1:Z5uVnq7vrIrPmHbVFfR4YLHRZquxeHpckCnRq0P/K9Y= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= @@ -738,6 +768,7 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= @@ -803,6 +834,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= @@ -834,8 +866,11 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI= +github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE= +github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= +github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -855,6 +890,7 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= @@ -941,6 +977,7 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1198,6 +1235,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1368,6 +1406,7 @@ gorm.io/gorm v1.24.3/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= +gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= helm.sh/helm/v3 v3.11.1 h1:cmL9fFohOoNQf+wnp2Wa0OhNFH0KFnSzEkVxi3fcc3I= helm.sh/helm/v3 v3.11.1/go.mod h1:z/Bu/BylToGno/6dtNGuSmjRqxKq5gaH+FU0BPO+AQ8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 6d98976f20a7120b8068a0e54d258fcbcc131464 Mon Sep 17 00:00:00 2001 From: Abhiuday Gupta <77210185+cp-Coder@users.noreply.github.com> Date: Thu, 14 Sep 2023 03:08:15 +0530 Subject: [PATCH 2/2] fix: updated dockerhub-description action Signed-off-by: Abhiuday Gupta <77210185+cp-Coder@users.noreply.github.com> --- .github/workflows/build-and-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 2b061b703..499aacc1c 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -60,8 +60,8 @@ jobs: docker push ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7} - name: Docker Hub Description if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() - uses: peter-evans/dockerhub-description@v2.4.3 - env: - DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - DOCKERHUB_REPOSITORY: ${{ secrets.IMAGE_NAME }} + uses: peter-evans/dockerhub-description@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + repository: ${{ secrets.IMAGE_NAME }}