From 6d19768df18994788a1f0f73c8b7813481fc8033 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 09:54:24 -0700 Subject: [PATCH 01/10] APIGOV-26149 - pipeline and CSR setup --- .csr-profile.json | 22 +++ .../build-discovery-agent-docker.yml | 37 +++++ .../build-traceability-agent-docker.yml | 37 +++++ .github/workflows/create-tag-for-release.yml | 33 ++++ .github/workflows/release.yml | 62 ++++++++ .github/workflows/test-and-build.yml | 41 +++++ .github/workflows/update-sdk-for-release.yml | 49 ++++++ .gitlab-ci.yml | 148 ++++++++++++++++++ .goreleaser-da.yml | 60 +++++++ .goreleaser-ta.yml | 59 +++++++ CODEOWNERS | 18 ++- release.sh | 85 ++++++++++ sonar-project.properties | 14 ++ whitesource.config | 26 +++ 14 files changed, 690 insertions(+), 1 deletion(-) create mode 100644 .csr-profile.json create mode 100644 .github/workflows/build-discovery-agent-docker.yml create mode 100644 .github/workflows/build-traceability-agent-docker.yml create mode 100644 .github/workflows/create-tag-for-release.yml create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/test-and-build.yml create mode 100644 .github/workflows/update-sdk-for-release.yml create mode 100644 .gitlab-ci.yml create mode 100644 .goreleaser-da.yml create mode 100644 .goreleaser-ta.yml create mode 100755 release.sh create mode 100644 sonar-project.properties create mode 100644 whitesource.config diff --git a/.csr-profile.json b/.csr-profile.json new file mode 100644 index 0000000..c9a597a --- /dev/null +++ b/.csr-profile.json @@ -0,0 +1,22 @@ +{ + "project": "Amplify - APIC Kong Agents", + "repo_url": "https://github.com/Axway/agents-kong", + "security_guide": "https://docs.axway.com/bundle/axway_resources/page/amplify_api_management_platform_security_white_paper.html", + "requirements": { + "dependency-check": false, + "fortify": true, + "irius-risk": false, + "npm-audit": false, + "pentest": false, + "retirejs": false, + "twistlock": true, + "zap": false, + "yarn": false, + "gosec": false, + "whitesource": true, + "appspider": false, + "insightvm": false + }, + "suppressions": [ + ] +} \ No newline at end of file diff --git a/.github/workflows/build-discovery-agent-docker.yml b/.github/workflows/build-discovery-agent-docker.yml new file mode 100644 index 0000000..5c003df --- /dev/null +++ b/.github/workflows/build-discovery-agent-docker.yml @@ -0,0 +1,37 @@ +name: Kong Discovery Agent Docker +on: + push: + tags: + - v*.*.* + +jobs: + build: + env: + GOFLAGS: "-mod=mod" + IMAGE_NAME: kong_discovery_agent + ORG_NAME: Axway + VERSION: ${{ github.ref_name }} + COMMIT_ID: ${{ github.sha }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Log in to the Container registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + flavor: latest=false + images: ghcr.io/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }} + - name: Build and push Docker image + uses: docker/build-push-action@v3 + with: + context: . + file: build/discovery.Dockerfile + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/build-traceability-agent-docker.yml b/.github/workflows/build-traceability-agent-docker.yml new file mode 100644 index 0000000..7e66ddb --- /dev/null +++ b/.github/workflows/build-traceability-agent-docker.yml @@ -0,0 +1,37 @@ +name: Kong Traceability Agent Docker +on: + push: + tags: + - v*.*.* + +jobs: + build: + env: + GOFLAGS: "-mod=mod" + IMAGE_NAME: kong_traceability_agent + ORG_NAME: Axway + VERSION: ${{ github.ref_name }} + COMMIT_ID: ${{ github.sha }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Log in to the Container registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + flavor: latest=false + images: ghcr.io/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }} + - name: Build and push Docker image + uses: docker/build-push-action@v3 + with: + context: . + file: build/traceability.Dockerfile + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/create-tag-for-release.yml b/.github/workflows/create-tag-for-release.yml new file mode 100644 index 0000000..6266f54 --- /dev/null +++ b/.github/workflows/create-tag-for-release.yml @@ -0,0 +1,33 @@ +# This action gets triggered by a closed PR on branch named 'APIGOV-UpdateSDK' +name: Create tag for release + +on: + pull_request: + types: + - closed + +jobs: + if_SDK_update_merged: + if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'APIGOV-UpdateSDK') + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Bump tag version and push tag + id: tag_version + uses: mathieudutour/github-tag-action@v6.1 + with: + # by default, this action creates a tag with a 'v' prefix, and bumps the patch version. + # See https://github.com/mathieudutour/github-tag-action to customize these rules. + github_token: ${{ secrets.ACTION_ACCESS_TOKEN }} + + - name: Show the new tag + run: | + echo "previous tag ${{ steps.tag_version.outputs.previous_tag }} + echo "new tag ${{ steps.tag_version.outputs.new_tag }} + + - name: Create a GitHub release + uses: ncipollo/release-action@v1 + with: + tag: ${{ steps.tag_version.outputs.new_tag }} + name: Release ${{ steps.tag_version.outputs.new_tag }} + body: ${{ steps.tag_version.outputs.changelog }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..060ed6d --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,62 @@ +name: Release agents with goreleaser +on: + push: + tags: + - v*.*.* + +jobs: + discovery: + runs-on: ubuntu-latest + name: Release discovery + defaults: + run: + working-directory: . + steps: + - uses: actions/checkout@v3 + - name: Unshallow Fetch + run: git fetch --prune --unshallow + - uses: actions/setup-go@v3 + with: + go-version: 1.21 + - name: Export SDK Version # exports the SDK_VERSION to be used by the goreleaser + run: echo "SDK_VERSION=$(make sdk-version)" >> $GITHUB_ENV + - name: Discovery Release + uses: goreleaser/goreleaser-action@v4.2.0 + with: + args: release -f .goreleaser-da.yml + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + traceability: + runs-on: ubuntu-latest + name: Release traceability + defaults: + run: + working-directory: . + steps: + - uses: actions/checkout@v3 + - name: Unshallow Fetch + run: git fetch --prune --unshallow + - uses: actions/setup-go@v3 + with: + go-version: 1.21 + - name: Export SDK Version # exports the SDK_VERSION to be used by the goreleaser + run: echo "SDK_VERSION=$(make sdk-version)" >> $GITHUB_ENV + - name: Traceability Release + uses: goreleaser/goreleaser-action@v4.2.0 + with: + args: release -f .goreleaser-ta.yml + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + notifyTeamsChannel: + needs: [discovery, traceability] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Notify Teams channel + env: + TEAMS_WEBHOOK_URL: ${{ secrets.TEAMS_WEBHOOK_URL }} + TAG: ${{ github.ref_name }} + run: ./release.sh diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml new file mode 100644 index 0000000..09b840d --- /dev/null +++ b/.github/workflows/test-and-build.yml @@ -0,0 +1,41 @@ +name: Build Kong Agents +on: + push: + branches: [main, "APIGOV-*"] + +jobs: + test: + env: + GOFLAGS: "-mod=mod" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.21 + - name: Test + working-directory: . + run: | + make test + + build: + env: + GOFLAGS: "-mod=mod" + VERSION: ${{ github.ref_name }} + COMMIT_ID: ${{ github.sha }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.21 + - name: Build discovery agent + working-directory: . + run: | + make build-discovery + - name: Build traceability agent + working-directory: . + run: | + make build-traceability diff --git a/.github/workflows/update-sdk-for-release.yml b/.github/workflows/update-sdk-for-release.yml new file mode 100644 index 0000000..dd6124d --- /dev/null +++ b/.github/workflows/update-sdk-for-release.yml @@ -0,0 +1,49 @@ +# this action is triggered by selecting the action in the github UI and then clicking "run workflow" +name: Update SDK version for release + +on: workflow_dispatch + +jobs: + updateAndCreatePR: + env: + GOFLAGS: "-mod=mod" + GOWORK: "off" + defaults: + run: + working-directory: . + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.21 + + - name: Get latest SDK version + run: | + export LATEST_REMOTE_TAG_CMD="git ls-remote --tags --refs --sort='version:refname' REMOTE_REPO | grep -Eo 'v?[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,3}$' | tail -1" + REMOTE_REPO_PATH="https://github.com/Axway/agent-sdk" + CMD=${LATEST_REMOTE_TAG_CMD/"REMOTE_REPO"/${REMOTE_REPO_PATH}} + export SDK_VERSION=$(eval $CMD) + echo "SDK_VERSION=${SDK_VERSION}" >> $GITHUB_ENV + - name: Update SDK version in go.mod + working-directory: . + run: | + echo "SDK_VERSION is ${{ env.SDK_VERSION }}" + make dep-version sdk=${{ env.SDK_VERSION }} + + - name: Create Pull Request + id: cpr + uses: peter-evans/create-pull-request@v5.0.2 + with: + branch: APIGOV-UpdateSDK + commit-message: 'Update to SDK ${{ env.SDK_VERSION }}' + title: 'APIGOV-UpdateSDK - Update to SDK ${{ env.SDK_VERSION }}' + delete-branch: true + reviewers: dfeldick + + - name: Enable Pull Request Automerge + run: gh pr merge APIGOV-UpdateSDK --admin --merge --subject "Merge branch APIGOV-UpdateSDK" + env: + GH_TOKEN: ${{ secrets.ACTION_ACCESS_TOKEN }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..21605f4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,148 @@ +image: docker:dind + +variables: + PROJECT: 'agents-kong' + CSR_SUPPRESSION_LIST: "/tmp/csr-suppressions/amplify-central/golang-agents-common.json" + + # Fortify + FORTIFY_PROJECT: "10715" + FORTIFY_BUILD_ID: "agents-kong" + FORTIFY_INCLUDE: "**/*.go" + FORTIFY_EXCLUDE: "**/*_test.go" + + # Whitesource + WS_PROJECT_ID: "agents-kong" + WS_CONFIG_FILE: "whitesource.config" + + GIT_TAG_PREFIX: v + +include: + - project: "apigov/gitlabci" + ref: master + file: "/.gitlab-ci-sonar.yml" + - project: "apigov/beano_cicd" + ref: $BEANO_CICD_LATEST + # the order of these include files is important + file: + - "/gitlabci/variables.yml" + - "/gitlabci/restrictions.yml" + - "/gitlabci/jobs.yml" + - project: 'scurity/gitlabci' + ref: $SCURITY_V2 + file: + - '/.gitlab-ci-fortify.yml' + - "/.gitlab-ci-twistlock.yml" + - "/.gitlab-ci-iriusrisk.yml" + - "/.gitlab-ci-whitesource.yml" + - "/.gitlab-ci-csr.yml" + - project: "apigov/beano_cicd" + ref: $BEANO_CICD_LATEST + # the order of these include files is important + file: + - "/gitlabci/csrjobs.yml" + +.get-latest-tag: &get-latest-tag | + if [ $(git --version | grep -Eo '2.*') ]; then + export LATEST_TAG=$(git tag -l --sort="version:refname" | grep -Eo '[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,3}$' | tail -1) + else + export LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) + fi + +stages: + - test + - sonar-preview + - sonar-publish + - security-scans + - security-review + +twistlock-discovery: + extends: .twistlock + rules: + - !reference [.mirror-branch-csr-rules, rules] + before_script: + - apk --no-cache update && apk add make + - make docker-build-discovery + - export IMAGE_NAME=kong_discovery_agent:latest + +twistlock-traceability: + extends: .twistlock + rules: + - !reference [.mirror-branch-csr-rules, rules] + before_script: + - apk --no-cache update && apk add make + - make docker-build-traceability + - export IMAGE_NAME=kong_traceability_agent:latest + +twistlock-discovery:on-schedule: + extends: .twistlock + rules: + - !reference [.mirror-schedule-csr-rules, rules] + dependencies: [] + before_script: + - apk --no-cache update && apk add git + - *get-latest-tag + - export IMAGE_NAME=ghcr.io/axway/kong_discovery_agent:${GIT_TAG_PREFIX}${LATEST_TAG} + - docker pull ${IMAGE_NAME} + +twistlock-traceability:on-schedule: + extends: .twistlock + rules: + - !reference [.mirror-schedule-csr-rules, rules] + dependencies: [] + before_script: + - apk --no-cache update && apk add git + - *get-latest-tag + - export IMAGE_NAME=ghcr.io/axway/kong_traceability_agent:${GIT_TAG_PREFIX}${LATEST_TAG} + - docker pull ${IMAGE_NAME} + +whitesource:on-schedule: + extends: .whitesource + rules: + - !reference [.mirror-schedule-csr-rules, rules] + before_script: + - git config --global http.sslVerify false + - git config --global url."ssh://git@git.ecd.axway.org".insteadOf "https://git.ecd.axway.org"'' + - git fetch + - *get-latest-tag + - echo "Checking out ${GIT_TAG_PREFIX}${LATEST_TAG}" + - git checkout ${GIT_TAG_PREFIX}${LATEST_TAG} + +# overridden from csrjobs.yml because mirror repos like this one don't get merge events +fortify: + rules: + - !reference [.mirror-branch-csr-rules, rules] + +fetch-fortify: + rules: + - !reference [.mirror-branch-csr-rules, rules] + +whitesource: + rules: + - !reference [.mirror-branch-csr-rules, rules] + before_script: + - export GOWORK=off + +run-csr: + rules: + - !reference [.mirror-branch-csr-rules, rules] + +#################### +# CSR - overridden from csrjobs.yml to effectively not see these jobs ever. For some reason, probably multi-level +# extends and overrides, using only-never for these csr jobs doesn't work. Had to do it like this. +#################### +fetch-iriusrisk: + rules: + - !reference [.only-never-rule, rules] + +fetch-iriusrisk:on-schedule: + rules: + - !reference [.only-never-rule, rules] + +twistlock: + rules: + - !reference [.only-never-rule, rules] + dependencies: + +twistlock:on-schedule: + rules: + - !reference [.only-never-rule, rules] diff --git a/.goreleaser-da.yml b/.goreleaser-da.yml new file mode 100644 index 0000000..66e5b63 --- /dev/null +++ b/.goreleaser-da.yml @@ -0,0 +1,60 @@ +# Documentation at http://goreleaser.com +before: + hooks: + - go mod download + - go mod tidy + +builds: + - id: kong_discovery_agent + binary: kong_discovery_agent + main: ./cmd/discovery/main.go + flags: + - -tags=static_all + - -a + ldflags: + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildTime={{ .Date }}' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildVersion={{ .Version }}' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildCommitSha={{ .Commit }}' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentName=KongDiscoveryAgent' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentDescription=Kong Discovery Agent' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion={{ .Env.SDK_VERSION }}' + env: + - CGO_ENABLED=0 + goos: + - linux + - windows + - darwin + ignore: + - goos: windows + goarch: arm64 + +archives: + - id: discovery_agent_archives + name_template: >- + kong_discovery_agent_{{ .Version }}_{{ .Os }}_ + {{- if eq .Arch "darwin" }}Darwin + {{- else if eq .Arch "linux" }}Linux + {{- else if eq .Arch "windows" }}Windows + {{- else if eq .Arch "386" }}i386 + {{- else if eq .Arch "amd64" }}x86_64 + {{- else }}{{ .Arch }}{{ end }} + wrap_in_directory: discovery_agent + files: + - README_discovery.md + - README_subscription.md + - src: build/kong_discovery_agent.yml + dst: . + strip_parent: true + +checksum: + name_template: "discovery_checksums.txt" + +snapshot: + name_template: "{{ .Tag }}-next" + +changelog: + sort: asc + filters: + exclude: + - '^docs:' + - '^test:' diff --git a/.goreleaser-ta.yml b/.goreleaser-ta.yml new file mode 100644 index 0000000..d733a86 --- /dev/null +++ b/.goreleaser-ta.yml @@ -0,0 +1,59 @@ +# Documentation at http://goreleaser.com +before: + hooks: + - go mod download + - go mod tidy + +builds: + - id: kong_traceability_agent + binary: kong_traceability_agent + main: ./cmd/traceability/main.go + flags: + - -tags=static_all + - -a + ldflags: + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildTime={{ .Date }}' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildVersion={{ .Version }}' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildCommitSha={{ .Commit }}' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentName=KongTraceabilityAgent' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentDescription=Kong Traceability Agent' + - -X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion={{ .Env.SDK_VERSION }}' + env: + - CGO_ENABLED=0 + goos: + - linux + - windows + - darwin + ignore: + - goos: windows + goarch: arm64 + +archives: + - id: traceability_agent_archives + name_template: >- + kong_traceability_agent_{{ .Version }}_{{ .Os }}_ + {{- if eq .Arch "darwin" }}Darwin + {{- else if eq .Arch "linux" }}Linux + {{- else if eq .Arch "windows" }}Windows + {{- else if eq .Arch "386" }}i386 + {{- else if eq .Arch "amd64" }}x86_64 + {{- else }}{{ .Arch }}{{ end }} + wrap_in_directory: traceability_agent + files: + - README_traceability.md + - src: build/kong_traceability_agent.yml + dst: . + strip_parent: true + +checksum: + name_template: "traceability_checksums.txt" + +snapshot: + name_template: "{{ .Tag }}-next" + +changelog: + sort: asc + filters: + exclude: + - '^docs:' + - '^test:' diff --git a/CODEOWNERS b/CODEOWNERS index 3a38ec9..29c1290 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1,17 @@ -* @jcollins-axway @sbolosan @vivekschauhan @alrosca @dgghinea \ No newline at end of file +# Order is important; the last matching pattern takes the most precedence. +* @jcollins-axway @sbolosan @vivekschauhan @alrosca @dgghinea + +#[CSR] + # .csr-profile.json requires SPOC approval for any modifications +.csr-profile.json @dfeldick @jcollins-axway @vivekschauhan +whitesource.config @dfeldick + +#[CICD] +# cicd-related files +.gitlab-ci.yml @dfeldick @jcollins-axway @vivekschauhan +Makefile @dfeldick @jcollins-axway @vivekschauhan +build/scripts/ @dfeldick @jcollins-axway @vivekschauhan +.github/** @dfeldick @jcollins-axway @vivekschauhan + +#[EXPERT] +pkg/** @jcollins-axway @vivekschauhan @alrosca @dgghinea diff --git a/release.sh b/release.sh new file mode 100755 index 0000000..a08f25a --- /dev/null +++ b/release.sh @@ -0,0 +1,85 @@ +#!/bin/bash +shopt -s nocasematch + +# you can add variables like this to test locally. Just run ./release.sh. Note that to run on MAC, you must install bash 5.x. +# Then, to run the script you must do: /usr/local/bin/bash ./release.sh +# TEAMS_WEBHOOK_URL="foo.bar" +# TAG="1.2.3" + +# Would like to use this, but can't get it to work in curl command +#export COMMON_CURL_HEADER=`printf -- '-H "PRIVATE-TOKEN:${GIT_API_TOKEN}" -H "Accept:application/json" -H "Content-Type:application/json"'` +export H_ACCEPT="Accept:application/json" +export H_CONTENT="Content-Type:application/json" +export H_TOKEN="PRIVATE-TOKEN:${GIT_API_TOKEN}" + +# validate all of the required variables +check_required_variables() { + echo "Validating the required environment variables..." + + [ -z "${TEAMS_WEBHOOK_URL}" ] && echo "TEAMS_WEBHOOK_URL variable not set" && exit 1 + [ -z "${TAG}" ] && echo "TAG variable not set" && exit 1 + [ -z "${SDK}" ] && echo "SDK variable not set" && exit 1 + + pat='v[0-9]+\.[0-9]+\.[0-9]' + if [[ ! ${TAG} =~ $pat ]]; then + echo "TAG variable must be of the form vX.X.X" + exit 1 + fi + + return 0 +} + +get_sdk_version() +{ + # pull out the SDK version from go.mod + ver=$(grep 'github.com/Axway/agent-sdk v' ./go.mod) + + # Set space as the delimiter + IFS=' ' + + # Read the split words into an array + read -a strarr <<< $ver + export SDK=${strarr[1]} +} + +post_to_teams() { + rel_date=$(date +'%m/%d/%Y') + JSON="{ + \"@type\": \"MessageCard\", + \"@context\": \"http://schema.org/extensions\", + \"summary\": \"Agent Release Info\", + \"sections\": [{ + \"facts\": [{ + \"name\": \"Date:\", + \"value\": \"${rel_date}\" + }, { + \"name\": \"Info:\", + \"value\": \"${1}\" + }] + }] + }" + curl -v ${TEAMS_WEBHOOK_URL} \ + -H 'Content-Type: application/json' \ + -d "${JSON}" &> /dev/null +} + +main() { + # validate required variables + get_sdk_version + check_required_variables + + if [ $? -eq 1 ]; then + echo "No release info being generated." + exit 1 + fi + + # gather stats + releaseStats="- SDK version: ${SDK}\n" + releaseStats+="- Kong agents version: ${TAG}\n" + + echo -e "Full Release Info:\n"${releaseStats} + post_to_teams "${releaseStats}" + exit 0 +} + +main $@ diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..54fa5d3 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,14 @@ +sonar.projectName=Kong_Agents +sonar.projectVersion=1.0 +sonar.projectKey=Kong_Agents +sonar.language=go +sonar.sourceEncoding=UTF-8 +sonar.projectBaseDir=. +sonar.sources=. +sonar.exclusions=**/*test*.go,**/build/**/*,**/deployment/** +sonar.tests=. +sonar.test.inclusions=**/*test*.go +sonar.go.tests.reportPaths=goreport.json +sonar.go.coverage.reportPaths=gocoverage.out +sonar.issuesReport.console.enable=true +sonar.report.export.path=sonar-report.json diff --git a/whitesource.config b/whitesource.config new file mode 100644 index 0000000..3e83429 --- /dev/null +++ b/whitesource.config @@ -0,0 +1,26 @@ +############################################################### +# WhiteSource Unified-Agent configuration file +############################################################### + +# Change the below URL to your WhiteSource server. +# Use the 'WhiteSource Server URL' which can be retrieved +# from your 'Profile' page on the 'Server URLs' panel. +# Then, add the '/agent' path to it. +wss.url=https://axway.whitesourcesoftware.com/agent + +######################################## +# Package Manager Dependency resolvers # +######################################## +resolveAllDependencies=false +go.collectDependenciesAtRuntime=false +go.resolveDependencies=false +go.modules.resolveDependencies=true + +########################################################################################### +# Includes/Excludes Glob patterns - Please use only one exclude line and one include line # +########################################################################################### +includes=**/*.go go.mod + +excludes=**/*_test.go + +wss.url=https://axway.whitesourcesoftware.com/agent From dbf27cc13b0fbb3d75c1c60fb3eb5fe992b25f56 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 09:55:46 -0700 Subject: [PATCH 02/10] APIGOV-26149 - comment out fortify ID for now --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21605f4..9aa487a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: CSR_SUPPRESSION_LIST: "/tmp/csr-suppressions/amplify-central/golang-agents-common.json" # Fortify - FORTIFY_PROJECT: "10715" + # FORTIFY_PROJECT: "10715" FORTIFY_BUILD_ID: "agents-kong" FORTIFY_INCLUDE: "**/*.go" FORTIFY_EXCLUDE: "**/*_test.go" From 86f39c4eb18fa256bcef979e1cc0631f9ac73726 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 10:31:11 -0700 Subject: [PATCH 03/10] APIGOV-26149 - fixes --- .gitlab-ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9aa487a..21c0f10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,18 +59,22 @@ twistlock-discovery: extends: .twistlock rules: - !reference [.mirror-branch-csr-rules, rules] + tags: + - twistlock before_script: - apk --no-cache update && apk add make - - make docker-build-discovery + - make docker-da - export IMAGE_NAME=kong_discovery_agent:latest twistlock-traceability: extends: .twistlock - rules: + tags: + - twistlock + rules:ß - !reference [.mirror-branch-csr-rules, rules] before_script: - apk --no-cache update && apk add make - - make docker-build-traceability + - make docker-ta - export IMAGE_NAME=kong_traceability_agent:latest twistlock-discovery:on-schedule: From 5cc1f1f82815e981ee9f0467659b1bb28c281aed Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 10:34:02 -0700 Subject: [PATCH 04/10] APIGOV-26149 - fix --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21c0f10..75ddb59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,10 +68,10 @@ twistlock-discovery: twistlock-traceability: extends: .twistlock + rules: + - !reference [.mirror-branch-csr-rules, rules] tags: - twistlock - rules:ß - - !reference [.mirror-branch-csr-rules, rules] before_script: - apk --no-cache update && apk add make - make docker-ta From 9ce09b4e3ceb2ef6e5f7ac789ac326582e19558c Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 10:37:31 -0700 Subject: [PATCH 05/10] APIGOV-26149 - fix --- .github/workflows/test-and-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 09b840d..cf316ba 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -34,8 +34,8 @@ jobs: - name: Build discovery agent working-directory: . run: | - make build-discovery + make build-da - name: Build traceability agent working-directory: . run: | - make build-traceability + make build-ta From 879da53565598e4244bd5805dc0885e146ce7895 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 10:40:40 -0700 Subject: [PATCH 06/10] APIGOV-26149 - disable tests --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75ddb59..2b44153 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,3 +150,7 @@ twistlock: twistlock:on-schedule: rules: - !reference [.only-never-rule, rules] + +unit_tests: + script: + - echo "foo" \ No newline at end of file From de622275154ab1273a51462a56b87537e1a5de61 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 10:41:39 -0700 Subject: [PATCH 07/10] APIGOV-26149 - disable sonar --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b44153..0ebfe3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,4 +153,8 @@ twistlock:on-schedule: unit_tests: script: - - echo "foo" \ No newline at end of file + - echo "foo" + +sonar_preview: + script: + - echo "foo" \ No newline at end of file From 16f014c6e684a8488f55cd83b87258b0a72edce3 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 12:53:19 -0700 Subject: [PATCH 08/10] APIGOV-26149 - tix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 856fa25..5645faf 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ ${WORKSPACE}/traceability_agent: -X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion=$(sdk_version)' \ -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentName=KongTraceabilityAgent' \ -X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentDescription=Kong Traceability Agent'" \ - -a -o ${WORKSPACE}/bin/traceability_agent ${WORKSPACE}/traceability/main.go + -a -o ${WORKSPACE}/bin/traceability_agent ${WORKSPACE}/pkg/main/traceability/main.go build-ta: dep ${WORKSPACE}/traceability_agent @echo "Traceability Agent build completed" From 0aa417ae6b680bcedbbcd6f3b9ecca9aabd42653 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 13:26:16 -0700 Subject: [PATCH 09/10] APIGOV-26149 - fix --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ebfe3e..db42642 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: docker:dind variables: - PROJECT: 'agents-kong' + PROJECT: "agents-kong" CSR_SUPPRESSION_LIST: "/tmp/csr-suppressions/amplify-central/golang-agents-common.json" # Fortify @@ -27,10 +27,10 @@ include: - "/gitlabci/variables.yml" - "/gitlabci/restrictions.yml" - "/gitlabci/jobs.yml" - - project: 'scurity/gitlabci' + - project: "scurity/gitlabci" ref: $SCURITY_V2 file: - - '/.gitlab-ci-fortify.yml' + - "/.gitlab-ci-fortify.yml" - "/.gitlab-ci-twistlock.yml" - "/.gitlab-ci-iriusrisk.yml" - "/.gitlab-ci-whitesource.yml" @@ -64,7 +64,7 @@ twistlock-discovery: before_script: - apk --no-cache update && apk add make - make docker-da - - export IMAGE_NAME=kong_discovery_agent:latest + - export IMAGE_NAME=kong-discovery-agent:latest twistlock-traceability: extends: .twistlock @@ -75,7 +75,7 @@ twistlock-traceability: before_script: - apk --no-cache update && apk add make - make docker-ta - - export IMAGE_NAME=kong_traceability_agent:latest + - export IMAGE_NAME=kong-traceability-agent:latest twistlock-discovery:on-schedule: extends: .twistlock @@ -111,7 +111,7 @@ whitesource:on-schedule: - echo "Checking out ${GIT_TAG_PREFIX}${LATEST_TAG}" - git checkout ${GIT_TAG_PREFIX}${LATEST_TAG} -# overridden from csrjobs.yml because mirror repos like this one don't get merge events +# overridden from csrjobs.yml because mirror repos like this one don't get merge events fortify: rules: - !reference [.mirror-branch-csr-rules, rules] @@ -157,4 +157,4 @@ unit_tests: sonar_preview: script: - - echo "foo" \ No newline at end of file + - echo "foo" From 3a4eed00d061640577e7e617f042166955ec5494 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Wed, 8 Nov 2023 14:08:02 -0700 Subject: [PATCH 10/10] APIGOV-26149 - update libs --- go.mod | 24 ++++++++++----------- go.sum | 68 +++++++++++++++++++++------------------------------------- 2 files changed, 37 insertions(+), 55 deletions(-) diff --git a/go.mod b/go.mod index 2ca53c4..b1b09c7 100644 --- a/go.mod +++ b/go.mod @@ -17,11 +17,11 @@ require ( github.com/Shopify/sarama v1.26.4 // indirect github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6 // indirect github.com/armon/go-radix v1.0.0 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf // indirect - github.com/docker/distribution v2.8.0+incompatible // indirect + github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/docker v1.13.1 // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect @@ -105,7 +105,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 // indirect + github.com/opencontainers/image-spec v1.0.2 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.2 // indirect github.com/pierrec/lz4 v2.6.0+incompatible // indirect @@ -140,20 +140,20 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect - golang.org/x/crypto v0.14.0 // indirect + golang.org/x/crypto v0.15.0 // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/mod v0.10.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/term v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/net v0.18.0 // indirect + golang.org/x/oauth2 v0.11.0 // indirect + golang.org/x/sys v0.14.0 // indirect + golang.org/x/term v0.14.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect golang.org/x/tools v0.8.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220714211235-042d03aeabc9 // indirect - google.golang.org/grpc v1.48.0 // indirect - google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/grpc v1.59.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.6 // indirect gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect diff --git a/go.sum b/go.sum index f3d3ed3..bec4261 100644 --- a/go.sum +++ b/go.sum @@ -61,15 +61,14 @@ github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod h1:3eOhrU github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20 h1:7rj9qZ63knnVo2ZeepYHvHuRdG76f3tRUTdIQDzRBeI= github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod h1:cI59GRkC2FRaFYtgbYEqMlgnnfvAwXzjojyZKXwklNg= github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43 h1:WFwa9pqou0Nb4DdfBOyaBTH0GqLE74Qwdf61E7ITHwQ= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -77,10 +76,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA= @@ -92,8 +87,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etly github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf h1:uOWCk+L8abzw0BzmnCn7j7VT3g6bv9zW8fkR0yOP0Q4= github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/docker/distribution v2.8.0+incompatible h1:l9EaZDICImO1ngI+uTifW+ZYvvz7fKISBAKpg+MbWbY= -github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= +github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/engine v17.12.0-ce-rc1.0.20190717161051-705d9623b7c1+incompatible h1:4Pnn+RsurVEiBbmqlRtzh77HLMiP4NaaqRHOOK4aPj8= github.com/docker/engine v17.12.0-ce-rc1.0.20190717161051-705d9623b7c1+incompatible/go.mod h1:3CPr2caMgTHxxIAZgEMd3uLYPDlRvPqCpyeRf6ncPcY= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= @@ -152,7 +147,6 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -237,7 +231,6 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= 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/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -258,7 +251,6 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= @@ -300,7 +292,6 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/h2non/filetype v1.1.1 h1:xvOwnXKAckvtLWsN398qS9QhlxlnVXBjXBydK2/UFB4= github.com/h2non/filetype v1.1.1/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -427,8 +418,8 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 h1:yN8BPXVwMBAm3Cuvh1L5XE8XpvYRMdsVLd82ILprhUU= -github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= +github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= @@ -451,7 +442,6 @@ github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -548,7 +538,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= @@ -578,8 +567,8 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -661,12 +650,11 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= +golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -676,8 +664,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= +golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -690,8 +678,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -747,7 +735,6 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211102192858-4dd72447c267/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -755,8 +742,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -764,8 +751,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= +golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -777,8 +764,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -900,7 +887,6 @@ google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -914,8 +900,8 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20220714211235-042d03aeabc9 h1:zfXhTgBfGlIh3jMXN06W8qbhFGsh6MJNJiYEuhTddOI= -google.golang.org/genproto v0.0.0-20220714211235-042d03aeabc9/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -929,13 +915,11 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= -google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= +google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -948,9 +932,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -980,7 +963,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=