From b7ba499776b1d9337a00229d0c98903b8c46a4d2 Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 5 Feb 2024 08:54:59 -0700 Subject: [PATCH 1/8] chore: bump go version Signed-off-by: Tyler Gillson --- .github/workflows/bulwark-golicences.yaml | 2 +- go.mod | 4 +++- go.sum | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bulwark-golicences.yaml b/.github/workflows/bulwark-golicences.yaml index 489a61b6..d71d9c7c 100644 --- a/.github/workflows/bulwark-golicences.yaml +++ b/.github/workflows/bulwark-golicences.yaml @@ -24,7 +24,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 with: - go-version: '1.21' + go-version-file: go.mod - name: golicense-scan run: | diff --git a/go.mod b/go.mod index 2e20336a..40fae7da 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/spectrocloud-labs/validator -go 1.20 +go 1.22 + +toolchain go1.22rc2 require ( buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.14.0-20231213011348-5645e27c876a.1 diff --git a/go.sum b/go.sum index 72bfe048..1a6e337e 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,7 @@ connectrpc.com/connect v1.14.0 h1:PDS+J7uoz5Oui2VEOMcfz6Qft7opQM9hPiKvtGC01pA= connectrpc.com/connect v1.14.0/go.mod h1:uoAq5bmhhn43TwhaKdGKN/bZcGtzPW1v+ngDTn5u+8s= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= @@ -20,6 +21,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -77,6 +79,7 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= 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/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -110,6 +113,7 @@ github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/slack-go/slack v0.12.3 h1:92/dfFU8Q5XP6Wp5rr5/T5JHLM5c5Smtn53fhToAP88= github.com/slack-go/slack v0.12.3/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -125,12 +129,14 @@ 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.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= +go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= From 152f5741e1130c4cb62860cdbabc4aacaf7fc4ee Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 5 Feb 2024 08:59:25 -0700 Subject: [PATCH 2/8] chore: bump go version Signed-off-by: Tyler Gillson --- go.mod | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 40fae7da..27741a68 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/spectrocloud-labs/validator -go 1.22 - -toolchain go1.22rc2 +go 1.22rc2 require ( buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.14.0-20231213011348-5645e27c876a.1 From 4535a1e7a8d8f9139f67b456d9920038a2aa43db Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 5 Feb 2024 09:04:22 -0700 Subject: [PATCH 3/8] chore: bump go version Signed-off-by: Tyler Gillson --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 27741a68..899bd9e7 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/spectrocloud-labs/validator -go 1.22rc2 +go 1.21.6 require ( buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.14.0-20231213011348-5645e27c876a.1 From b255fefbdec633e9677788adbd26336d79e856cb Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 5 Feb 2024 09:07:01 -0700 Subject: [PATCH 4/8] ci: install go-licenses after setup-go Signed-off-by: Tyler Gillson --- .github/workflows/bulwark-golicences.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bulwark-golicences.yaml b/.github/workflows/bulwark-golicences.yaml index d71d9c7c..82bd53d5 100644 --- a/.github/workflows/bulwark-golicences.yaml +++ b/.github/workflows/bulwark-golicences.yaml @@ -15,9 +15,6 @@ jobs: - name: install-git run: sudo apt-get install -y git - - name: install-golicenses - run: GOBIN=/usr/local/bin go install github.com/google/go-licenses@v1.6.0 - - name: checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 @@ -26,6 +23,9 @@ jobs: with: go-version-file: go.mod + - name: install-golicenses + run: go install github.com/google/go-licenses@v1.6.0 + - name: golicense-scan run: | go-licenses check ./... \ No newline at end of file From 4e7fac59951d7dbf1c2e705452e48daad4604ecc Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 5 Feb 2024 09:12:13 -0700 Subject: [PATCH 5/8] ci: update go-version Signed-off-by: Tyler Gillson --- .github/workflows/build_container.yaml | 2 +- .github/workflows/bulwark-gitleaks.yaml | 1 - .github/workflows/bulwark-gosec.yaml | 1 - .github/workflows/release.yaml | 2 -- .github/workflows/test.yaml | 5 +---- 5 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_container.yaml b/.github/workflows/build_container.yaml index 1d06c794..dc4a413b 100644 --- a/.github/workflows/build_container.yaml +++ b/.github/workflows/build_container.yaml @@ -5,8 +5,8 @@ on: workflow_dispatch: env: - GO_VERSION: "~1.20" IMAGE_NAME: "validator" + defaults: run: shell: bash diff --git a/.github/workflows/bulwark-gitleaks.yaml b/.github/workflows/bulwark-gitleaks.yaml index 0d67f06e..7daca554 100644 --- a/.github/workflows/bulwark-gitleaks.yaml +++ b/.github/workflows/bulwark-gitleaks.yaml @@ -18,7 +18,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITLEAKS_CONFIG: /workspace/config.toml steps: - - name: run-bulwark-gitleaks-scan shell: sh env: diff --git a/.github/workflows/bulwark-gosec.yaml b/.github/workflows/bulwark-gosec.yaml index b64c9e71..6f73a741 100644 --- a/.github/workflows/bulwark-gosec.yaml +++ b/.github/workflows/bulwark-gosec.yaml @@ -16,7 +16,6 @@ jobs: env: REPO: ${{ github.event.repository.name }} steps: - - name: Set up Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 01e53fd2..6b1313ba 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,8 +8,6 @@ on: workflow_dispatch: env: - # Default minimum version of Go to support. - DEFAULT_GO_VERSION: 1.19 REGISTRY: quay.io GITHUB_PAGES_BRANCH: gh_pages diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 41ac5a46..f32cd9df 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,9 +7,6 @@ on: pull_request: workflow_dispatch: -env: - GO_VERSION: "~1.20" - jobs: test: name: Run Unit & Integration Tests @@ -20,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: go.mod - name: Set up Helm run: make helm From f7af499b7ea628d4e1c15cb1d4cb329506eea088 Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 5 Feb 2024 09:19:21 -0700 Subject: [PATCH 6/8] chore: bump go version Signed-off-by: Tyler Gillson --- .github/workflows/build_container.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/build_container.yaml b/.github/workflows/build_container.yaml index dc4a413b..86990c4b 100644 --- a/.github/workflows/build_container.yaml +++ b/.github/workflows/build_container.yaml @@ -65,6 +65,11 @@ jobs: - name: Check out code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - name: Set up Go + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 + with: + go-version-file: go.mod + - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3 @@ -110,6 +115,11 @@ jobs: - name: Check out code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - name: Set up Go + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 + with: + go-version-file: go.mod + - name: Login to GitHub Container Registry uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3 with: From 014c88c4c3f34166c324a293e9f433d7357d3c5f Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 5 Feb 2024 09:24:56 -0700 Subject: [PATCH 7/8] chore: bump go version Signed-off-by: Tyler Gillson --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 02872800..cce985f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$TARGETPLATFORM golang:alpine3.17 AS builder +FROM --platform=$TARGETPLATFORM golang:alpine3.19 AS builder ARG TARGETOS ARG TARGETARCH From 553effcfa86f2ee2032fceeed11042683bf6b9bd Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Mon, 5 Feb 2024 09:50:19 -0700 Subject: [PATCH 8/8] chore: bump spectro-cleanup Signed-off-by: Tyler Gillson --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 899bd9e7..ed39b4f7 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/spectrocloud-labs/validator go 1.21.6 require ( - buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.14.0-20231213011348-5645e27c876a.1 - buf.build/gen/go/spectrocloud/spectro-cleanup/protocolbuffers/go v1.32.0-20231213011348-5645e27c876a.1 + buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.14.0-20240205164452-95dfd137cb54.1 + buf.build/gen/go/spectrocloud/spectro-cleanup/protocolbuffers/go v1.32.0-20240205164452-95dfd137cb54.1 connectrpc.com/connect v1.14.0 github.com/go-logr/logr v1.4.1 github.com/onsi/ginkgo/v2 v2.15.0 diff --git a/go.sum b/go.sum index 1a6e337e..214bf0eb 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.14.0-20231213011348-5645e27c876a.1 h1:gFg4rEDJCG7wsEMTCIvUcaRNY6Ce4kgGxWcVrgl6a8o= -buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.14.0-20231213011348-5645e27c876a.1/go.mod h1:OokgG79jTMFTkzv0rZIF/7zjuZw+4lVppKn+u68JM+Y= -buf.build/gen/go/spectrocloud/spectro-cleanup/protocolbuffers/go v1.32.0-20231213011348-5645e27c876a.1 h1:LhkzasJgluUTXNJLYjbVnuUcN7CmGMy2JrFSSEKPcQ8= -buf.build/gen/go/spectrocloud/spectro-cleanup/protocolbuffers/go v1.32.0-20231213011348-5645e27c876a.1/go.mod h1:PRbE52FMZxLF1VV+ev+c0MlfVmGGn911UXrZRom+G5s= +buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.14.0-20240205164452-95dfd137cb54.1 h1:f8eLFiG9rFL1RvK9ke3yHEa16rnRmcBeFJlkxBr3Cvw= +buf.build/gen/go/spectrocloud/spectro-cleanup/connectrpc/go v1.14.0-20240205164452-95dfd137cb54.1/go.mod h1:OfxwgFVflGM1qNjUrNwMO6u2BNMRLbImR7iguNzFGIw= +buf.build/gen/go/spectrocloud/spectro-cleanup/protocolbuffers/go v1.32.0-20240205164452-95dfd137cb54.1 h1:n/9pJVRCLFns13YaOUJzJMj1w18vLXJzMuXiBqwTAZA= +buf.build/gen/go/spectrocloud/spectro-cleanup/protocolbuffers/go v1.32.0-20240205164452-95dfd137cb54.1/go.mod h1:PRbE52FMZxLF1VV+ev+c0MlfVmGGn911UXrZRom+G5s= connectrpc.com/connect v1.14.0 h1:PDS+J7uoz5Oui2VEOMcfz6Qft7opQM9hPiKvtGC01pA= connectrpc.com/connect v1.14.0/go.mod h1:uoAq5bmhhn43TwhaKdGKN/bZcGtzPW1v+ngDTn5u+8s= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=