From ecdb2f70e7d499bda9e97494f78486c9ca21223b Mon Sep 17 00:00:00 2001 From: DrPsychick Date: Wed, 18 Dec 2024 11:15:01 +0100 Subject: [PATCH 1/8] SYSENG-1820: update to go 1.22 Ginkgo PR depends on go 1.22, so we create this separate PR to make this change visible in git history. --- go.mod | 4 +++- go.sum | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e2f06353..18b8d2c0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module go.anx.io/go-anxcloud -go 1.20 +go 1.22 + +toolchain go1.23.3 require ( github.com/go-logr/logr v1.4.2 diff --git a/go.sum b/go.sum index 0a75698d..8134b2aa 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,5 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -19,9 +20,11 @@ github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VF github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM= github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= @@ -31,6 +34,7 @@ golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= From 40467d4301724317d7ca9553bd52ee8b5bc64c9c Mon Sep 17 00:00:00 2001 From: DrPsychick Date: Wed, 18 Dec 2024 11:18:25 +0100 Subject: [PATCH 2/8] SYSENG-1820: update to go 1.22 Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7bdf05f..6e7e782c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,10 @@ Some examples, more below in the actual changelog (newer entries are more likely * api/mock/mock_api_implementation: panic when trying to fake `ResourceWithTag` (#419, @drpsychick) +### Changed + +* go-anxcloud is now tested with Go versions 1.22 and 1.23 (#428, @drpsychick) + ## [0.7.6] -- 2024-11-04 ### Added From 453d0a579b0bee9f6019804dad7962b82cf56b42 Mon Sep 17 00:00:00 2001 From: DrPsychick Date: Wed, 18 Dec 2024 11:19:38 +0100 Subject: [PATCH 3/8] SYSENG-1820: update to go 1.22 Update Go versions in GitHub Actions --- .github/workflows/code.yml | 4 ++-- .github/workflows/documentation.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 50f6165f..c190b619 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -24,9 +24,9 @@ jobs: strategy: matrix: go: - - version: "1.21" + - version: "1.22" name: target - - version: "1.22.0" + - version: "1.23" name: latest name: "Static checks with ${{ matrix.go.name }} Go" steps: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index badd9483..e05ba721 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -25,9 +25,9 @@ jobs: strategy: matrix: go: - - version: "1.21" + - version: "1.22" name: target - - version: "1.22.0" + - version: "1.23" name: latest name: "Spell check with ${{ matrix.go.name }} Go" steps: From c702802340304a8185aade76457df9d5caed6994 Mon Sep 17 00:00:00 2001 From: DrPsychick Date: Wed, 18 Dec 2024 11:29:47 +0100 Subject: [PATCH 4/8] SYSENG-1820: update to go 1.22 DRY Go versions via env in GitHub Actions --- .github/workflows/code.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index c190b619..a92a0652 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -18,15 +18,19 @@ on: - "CHANGELOG.md" - ".github/workflows/**" +env: + GO_CURRENT: 1.22 + GO_LATEST: 1.23 + jobs: static-checks: runs-on: ubuntu-latest strategy: matrix: go: - - version: "1.22" + - version: "$GO_CURRENT" name: target - - version: "1.23" + - version: "$GO_LATEST" name: latest name: "Static checks with ${{ matrix.go.name }} Go" steps: @@ -55,9 +59,9 @@ jobs: strategy: matrix: go: - - version: "1.21" + - version: "$GO_CURRENT" name: target - - version: "1.22.0" + - version: "$GO_LATEST" name: latest name: "Unit tests with ${{ matrix.go.name }} Go" steps: @@ -85,7 +89,7 @@ jobs: strategy: matrix: go: - - version: "1.21" + - version: "$GO_CURRENT" name: target name: "Integration tests with ${{ matrix.go.name }} Go (trusted)" steps: From 6373fcfbf61e3a720889d08262fcb2b3a482b0f7 Mon Sep 17 00:00:00 2001 From: DrPsychick Date: Wed, 18 Dec 2024 11:29:58 +0100 Subject: [PATCH 5/8] SYSENG-1820: update to go 1.22 DRY Go versions via env in GitHub Actions --- .github/workflows/documentation.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index e05ba721..cd8e79fd 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,6 +9,8 @@ on: - main env: + GO_CURRENT: "1.22" + GO_LATEST: "1.23" GO111MODULE: on jobs: @@ -25,9 +27,9 @@ jobs: strategy: matrix: go: - - version: "1.22" + - version: "$GO_CURRENT" name: target - - version: "1.23" + - version: "$GO_LATEST" name: latest name: "Spell check with ${{ matrix.go.name }} Go" steps: From 85537c12de20ffa972af30f304c0afb32af423b1 Mon Sep 17 00:00:00 2001 From: DrPsychick Date: Wed, 18 Dec 2024 11:40:01 +0100 Subject: [PATCH 6/8] SYSENG-1820: update to go 1.22 DRY Go versions via env in GitHub Actions --- .github/workflows/code.yml | 10 +++++----- .github/workflows/documentation.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index a92a0652..70735e1b 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -28,9 +28,9 @@ jobs: strategy: matrix: go: - - version: "$GO_CURRENT" + - version: "${{ env.GO_CURRENT }}" name: target - - version: "$GO_LATEST" + - version: "${{ env.GO_LATEST }}" name: latest name: "Static checks with ${{ matrix.go.name }} Go" steps: @@ -59,9 +59,9 @@ jobs: strategy: matrix: go: - - version: "$GO_CURRENT" + - version: "${{ env.GO_CURRENT }}" name: target - - version: "$GO_LATEST" + - version: "${{ env.GO_LATEST }}" name: latest name: "Unit tests with ${{ matrix.go.name }} Go" steps: @@ -89,7 +89,7 @@ jobs: strategy: matrix: go: - - version: "$GO_CURRENT" + - version: "${{ env.GO_CURRENT }}" name: target name: "Integration tests with ${{ matrix.go.name }} Go (trusted)" steps: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index cd8e79fd..24f221eb 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -27,9 +27,9 @@ jobs: strategy: matrix: go: - - version: "$GO_CURRENT" + - version: "${{ env.GO_CURRENT }}" name: target - - version: "$GO_LATEST" + - version: "${{ env.GO_LATEST }}" name: latest name: "Spell check with ${{ matrix.go.name }} Go" steps: From 08b7eb145b558a5083fdccfa5610209400a42933 Mon Sep 17 00:00:00 2001 From: DrPsychick Date: Wed, 18 Dec 2024 11:50:25 +0100 Subject: [PATCH 7/8] SYSENG-1820: update to go 1.22 GitHub actions do not support anchors (yet) https://github.com/actions/runner/issues/1182, back to repeating versions :( --- .github/workflows/code.yml | 22 +++++++++------------- .github/workflows/documentation.yml | 10 ++++------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 70735e1b..8c6d0741 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -18,20 +18,16 @@ on: - "CHANGELOG.md" - ".github/workflows/**" -env: - GO_CURRENT: 1.22 - GO_LATEST: 1.23 - jobs: static-checks: runs-on: ubuntu-latest strategy: matrix: go: - - version: "${{ env.GO_CURRENT }}" - name: target - - version: "${{ env.GO_LATEST }}" - name: latest + - version: "1.22" + name: "target" + - version: "1.23" + name: "latest" name: "Static checks with ${{ matrix.go.name }} Go" steps: - uses: actions/checkout@v4 @@ -59,10 +55,10 @@ jobs: strategy: matrix: go: - - version: "${{ env.GO_CURRENT }}" - name: target - - version: "${{ env.GO_LATEST }}" - name: latest + - version: "1.22" + name: "target" + - version: "1.23" + name: "latest" name: "Unit tests with ${{ matrix.go.name }} Go" steps: - uses: actions/checkout@v4 @@ -89,7 +85,7 @@ jobs: strategy: matrix: go: - - version: "${{ env.GO_CURRENT }}" + - version: "1.22" name: target name: "Integration tests with ${{ matrix.go.name }} Go (trusted)" steps: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 24f221eb..40086e78 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -9,8 +9,6 @@ on: - main env: - GO_CURRENT: "1.22" - GO_LATEST: "1.23" GO111MODULE: on jobs: @@ -27,10 +25,10 @@ jobs: strategy: matrix: go: - - version: "${{ env.GO_CURRENT }}" - name: target - - version: "${{ env.GO_LATEST }}" - name: latest + - version: "1.22" + name: "target" + - version: "1.23" + name: "latest" name: "Spell check with ${{ matrix.go.name }} Go" steps: - uses: actions/checkout@v4 From 5af653546a54e0d8b867019b4c28be72d6dc2176 Mon Sep 17 00:00:00 2001 From: DrPsychick Date: Wed, 18 Dec 2024 11:55:56 +0100 Subject: [PATCH 8/8] SYSENG-1820: update to go 1.22 Update ./tools go.mod --- tools/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/go.mod b/tools/go.mod index 28e3a20d..ea07fd97 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -2,7 +2,7 @@ module go.anx.io/go-anxcloud/tools go 1.22.1 -toolchain go1.22.5 +toolchain go1.23.3 require ( github.com/client9/misspell v0.3.4