Skip to content

Commit 44d624c

Browse files
BBBmauBBBmau
authored
Update to Go 1.23 (#12176)
1 parent 13c97ee commit 44d624c

File tree

28 files changed

+54
-48
lines changed

28 files changed

+54
-48
lines changed

‎.ci/containers/build-environment/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1: Building Go dependencies
2-
FROM golang:1.21-bullseye AS builder
2+
FROM golang:1.23-bullseye AS builder
33

44
# Set working directory
55
WORKDIR /app

‎.ci/magician/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module magician
22

3-
go 1.21
3+
go 1.23
44

55
replace github.com/GoogleCloudPlatform/magic-modules/tools/issue-labeler => ../../tools/issue-labeler
66

‎.ci/unit-tests/gcb-membership-checker-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
steps:
3-
- name: 'golang:1.21'
3+
- name: 'golang:1.23'
44
args:
55
- '-c'
66
- |

‎.github/workflows/build-downstream.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Set up Go
4848
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
4949
with:
50-
go-version: '^1.21'
50+
go-version: '^1.23'
5151

5252
# Cache Go modules
5353
- name: Cache Go modules

‎.github/workflows/changelog-checker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Go
1919
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2020
with:
21-
go-version: '^1.21.0'
21+
go-version: '^1.23.0'
2222

2323
- name: Build
2424
run: |

‎.github/workflows/gofmt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
2828
with:
2929
cache: false
30-
go-version: '^1.21'
30+
go-version: '^1.23'
3131
- name: gofmt
3232
run: |
3333
GOFMT_OUTPUT="$(gofmt -l .)"

‎.github/workflows/request-reviewer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set up Go
3030
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3131
with:
32-
go-version: '^1.21'
32+
go-version: '^1.23'
3333
# Disable caching for now due to issues with large provider dependency caches
3434
cache: false
3535
- name: Build magician

‎.github/workflows/scheduled-pr-reminders.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2222
with:
23-
go-version: '^1.21'
23+
go-version: '^1.23'
2424
# Disable caching for now due to issues with large provider dependency caches
2525
cache: false
2626
- name: Build magician

‎.github/workflows/test-tgc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
if: ${{ !failure() && steps.pull_request.outputs.has_changes == 'true' }}
7878
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
7979
with:
80-
go-version: '^1.21'
80+
go-version: '^1.23'
8181
- name: Build Terraform Google Conversion
8282
if: ${{ !failure() && steps.pull_request.outputs.has_changes == 'true' }}
8383
run: |

‎.github/workflows/test-tpg.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
if: ${{ !failure() && steps.pull_request.outputs.has_changes == 'true' }}
7474
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
7575
with:
76-
go-version: '^1.21'
76+
go-version: '^1.23'
7777
- name: Build Provider
7878
if: ${{ !failure() && steps.pull_request.outputs.has_changes == 'true' }}
7979
run: |

‎.github/workflows/unit-test-magician.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
1717
with:
18-
go-version: '^1.21'
18+
go-version: '^1.23'
1919
- name: Run magician unit tests
2020
run: |
2121
cd .ci/magician

‎.github/workflows/unit-test-tgc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up Go
3131
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3232
with:
33-
go-version: '^1.21'
33+
go-version: '^1.23'
3434

3535
- name: Build Terraform Google Conversion
3636
run: |

‎.github/workflows/unit-test-tools.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
1919
with:
20-
go-version: '^1.21.0'
20+
go-version: '^1.23.0'
2121

2222
- name: Build diff-processor with TPG
2323
run: |
@@ -53,7 +53,7 @@ jobs:
5353
- name: Set up Go
5454
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
5555
with:
56-
go-version: '^1.21.0'
56+
go-version: '^1.23.0'
5757

5858
- name: Build go-changelog
5959
run: |
@@ -73,7 +73,7 @@ jobs:
7373
- name: Set up Go
7474
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
7575
with:
76-
go-version: '^1.21.0'
76+
go-version: '^1.23.0'
7777

7878
- name: Build issue-labeler
7979
run: |
@@ -93,7 +93,7 @@ jobs:
9393
- name: Set up Go
9494
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
9595
with:
96-
go-version: '^1.21.0'
96+
go-version: '^1.23.0'
9797

9898
- name: Build template-check
9999
run: |
@@ -113,7 +113,7 @@ jobs:
113113
- name: Set up Go
114114
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
115115
with:
116-
go-version: '^1.21.0'
116+
go-version: '^1.23.0'
117117

118118
- name: Build test-reader
119119
run: |

‎.github/workflows/unit-test-tpg.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Go
2929
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3030
with:
31-
go-version: '^1.21'
31+
go-version: '^1.23'
3232

3333
- name: Build Provider
3434
run: |

‎docs/go.mod

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
module github.com/GoogleCloudPlatform/magic-modules/docs
22

3-
go 1.21
4-
5-
require (
6-
github.com/alex-shpak/hugo-book v0.0.0-20230424134111-d86d5e70c7c0 // indirect
7-
github.com/h-enk/doks-child-theme v0.5.0 // indirect
8-
github.com/theNewDynamic/gohugo-theme-ananke v0.0.0-20221031153459-b393088d0930 // indirect
9-
)
3+
go 1.23

‎docs/go.sum

-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +0,0 @@
1-
github.com/alex-shpak/hugo-book v0.0.0-20221111100854-d5b75f4fb3aa h1:VthswmcR+7NtpamidIRuFq+8JRAz4v+s7xVJ0MmeLqM=
2-
github.com/alex-shpak/hugo-book v0.0.0-20221111100854-d5b75f4fb3aa/go.mod h1:L4NMyzbn15fpLIpmmtDg9ZFFyTZzw87/lk7M2bMQ7ds=
3-
github.com/alex-shpak/hugo-book v0.0.0-20230424134111-d86d5e70c7c0 h1:Bj/rhvEOix4TXwbzlZttiIi+5fTOqT3aQs1zMsprIXQ=
4-
github.com/alex-shpak/hugo-book v0.0.0-20230424134111-d86d5e70c7c0/go.mod h1:L4NMyzbn15fpLIpmmtDg9ZFFyTZzw87/lk7M2bMQ7ds=
5-
github.com/h-enk/doks-child-theme v0.5.0 h1:OrLbcGv6GfhDMs8O2OK93e0hUMvV1aygJWeAdKMcdiU=
6-
github.com/h-enk/doks-child-theme v0.5.0/go.mod h1:SCLBJIX7W4LH6rbaY9v31i1fwk0DRYoVwDWNMiRpE78=
7-
github.com/theNewDynamic/gohugo-theme-ananke v0.0.0-20221031153459-b393088d0930 h1:HH3nIivNlAVSYE9dvB0MD/cWunI1FpN6RDS6FziSFcs=
8-
github.com/theNewDynamic/gohugo-theme-ananke v0.0.0-20221031153459-b393088d0930/go.mod h1:yY14BLqqh5G61rO81YcJKMHY1rClY5iIiUK+K2JKSUM=

‎mmv1/go.mod

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleCloudPlatform/magic-modules/mmv1
22

3-
go 1.21
3+
go 1.23
44

55
require (
66
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
@@ -9,10 +9,12 @@ require (
99

1010
require github.com/golang/glog v1.2.0
1111

12-
require github.com/otiai10/copy v1.9.0
12+
require (
13+
github.com/getkin/kin-openapi v0.127.0
14+
github.com/otiai10/copy v1.9.0
15+
)
1316

1417
require (
15-
github.com/getkin/kin-openapi v0.127.0 // indirect
1618
github.com/go-openapi/jsonpointer v0.21.0 // indirect
1719
github.com/go-openapi/swag v0.23.0 // indirect
1820
github.com/invopop/yaml v0.3.1 // indirect

‎mmv1/go.sum

+19-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
13
github.com/getkin/kin-openapi v0.127.0 h1:Mghqi3Dhryf3F8vR370nN67pAERW+3a95vomb3MAREY=
24
github.com/getkin/kin-openapi v0.127.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM=
35
github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
46
github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
57
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
68
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
9+
github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
10+
github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
711
github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
812
github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
913
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -12,6 +16,10 @@ github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso=
1216
github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA=
1317
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
1418
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
19+
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
20+
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
21+
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
22+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
1523
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
1624
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
1725
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
@@ -21,15 +29,25 @@ github.com/otiai10/copy v1.9.0/go.mod h1:hsfX19wcn0UWIHUQ3/4fHuehhk2UyArQ9dVFAn3
2129
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
2230
github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
2331
github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
32+
github.com/otiai10/mint v1.4.0 h1:umwcf7gbpEwf7WFzqmWwSv0CzbeMsae2u9ZvpP8j2q4=
2433
github.com/otiai10/mint v1.4.0/go.mod h1:gifjb2MYOoULtKLqUAEILUG/9KONW6f7YsJ6vQLTlFI=
2534
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
2635
github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
36+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
37+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
38+
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
39+
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
40+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
41+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
42+
github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
43+
github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
2744
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
2845
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
2946
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
3047
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
31-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
3248
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
49+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
50+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
3351
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
3452
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
3553
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎mmv1/third_party/terraform/.go-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.21
1+
1.23

‎mmv1/third_party/terraform/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hashicorp/terraform-provider-google
22

3-
go 1.21
3+
go 1.23
44

55
require (
66
cloud.google.com/go/bigtable v1.33.0

‎mmv1/third_party/terraform/scripts/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/hashicorp/terraform-provider-google/scripts
22

3-
go 1.21
3+
go 1.23

‎scripts/doctor

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ if [ $found -eq 0 ]; then
4040
else
4141
version=($(go version))
4242
version=${version[2]}
43-
if [[ "$version" < "go1.21.0" ]]; then
43+
if [[ "$version" < "go1.23.0" ]]; then
4444
exitcode=1
45-
warn "yel" " $version is installed, but go 1.21 or later is required. See https://golang.org/doc/install for information on installing it."
45+
warn "yel" " $version is installed, but go 1.23 or later is required. See https://golang.org/doc/install for information on installing it."
4646
fi
4747
if [[ -z "${GOPATH}" ]]; then
4848
exitcode=1

‎tools/diff-processor/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleCloudPlatform/magic-modules/tools/diff-processor
22

3-
go 1.21
3+
go 1.23
44

55
replace google/provider/old => ./old
66

‎tools/issue-labeler/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleCloudPlatform/magic-modules/tools/issue-labeler
22

3-
go 1.21
3+
go 1.23
44

55
require (
66
github.com/golang/glog v1.1.1

‎tools/teamcity-generator/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/GoogleCloudPlatform/magic-modules/tools/teamcity-generator
22

3-
go 1.21
3+
go 1.23
44

55
require golang.org/x/text v0.11.0

‎tools/template-check/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/GoogleCloudPlatform/magic-modules/tools/template-check
22

3-
go 1.21
3+
go 1.23

‎tools/test-reader/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleCloudPlatform/magic-modules/tools/test-reader
22

3-
go 1.21
3+
go 1.23
44

55
require (
66
github.com/hashicorp/hcl/v2 v2.20.1

‎tpgtools/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/GoogleCloudPlatform/magic-modules/tpgtools
22

3-
go 1.21
3+
go 1.23
44

55
require (
66
bitbucket.org/creachadair/stringset v0.0.11

0 commit comments

Comments
 (0)