Skip to content

Commit

Permalink
Merge pull request #36996 from hashicorp/upgrade-go-version-122
Browse files Browse the repository at this point in the history
bump go version to 1.22
  • Loading branch information
johnsonaj committed Apr 19, 2024
2 parents 6e64c8e + b9fd2e2 commit f1d8b2e
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 28 deletions.
3 changes: 3 additions & 0 deletions .changelog/36996.txt
@@ -0,0 +1,3 @@
```release-note:note
provider: Updates to Go 1.22. This is the last Go release that will run on macOS 10.15 Catalina
```
2 changes: 1 addition & 1 deletion .ci/providerlint/go.mod
@@ -1,6 +1,6 @@
module github.com/hashicorp/terraform-provider-aws/ci/providerlint

go 1.21
go 1.22

require (
github.com/aws/aws-sdk-go v1.51.24
Expand Down
4 changes: 1 addition & 3 deletions .ci/tools/go.mod
@@ -1,8 +1,6 @@
module github.com/hashicorp/terraform-provider-aws/tools

go 1.21.1

toolchain go1.21.5
go 1.22

require (
github.com/YakDriver/tfproviderdocs v0.12.0
Expand Down
2 changes: 1 addition & 1 deletion .go-version
@@ -1 +1 @@
1.21.8
1.22.2
2 changes: 1 addition & 1 deletion docs/development-environment.md
Expand Up @@ -3,7 +3,7 @@
## Requirements

- [Terraform](https://www.terraform.io/downloads.html) 0.12.26+ (to run acceptance tests)
- [Go](https://golang.org/doc/install) 1.21+ (to build the provider plugin)
- [Go](https://golang.org/doc/install) 1.22+ (to build the provider plugin)

## Quick Start

Expand Down
2 changes: 1 addition & 1 deletion go.mod
@@ -1,6 +1,6 @@
module github.com/hashicorp/terraform-provider-aws

go 1.21
go 1.22

require (
github.com/ProtonMail/go-crypto v1.1.0-alpha.2
Expand Down
2 changes: 1 addition & 1 deletion skaff/go.mod
@@ -1,6 +1,6 @@
module github.com/hashicorp/terraform-provider-aws/skaff

go 1.21
go 1.22

require (
github.com/YakDriver/regexache v0.23.0
Expand Down
2 changes: 1 addition & 1 deletion tools/awssdkpatch/go.mod
@@ -1,6 +1,6 @@
module github.com/hashicorp/terraform-provider-aws/tools/awssdkpatch

go 1.21
go 1.22

require (
github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220322001452-8f7a597d0c24
Expand Down
14 changes: 7 additions & 7 deletions tools/tfsdk2fw/go.mod
@@ -1,6 +1,6 @@
module github.com/hashicorp/terraform-provider-aws/tools/tfsdk2fw

go 1.21
go 1.22

require (
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
Expand All @@ -18,7 +18,7 @@ require (
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.51.23 // indirect
github.com/aws/aws-sdk-go v1.51.24 // indirect
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect
Expand All @@ -44,7 +44,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/athena v1.40.4 // indirect
github.com/aws/aws-sdk-go-v2/service/auditmanager v1.32.4 // indirect
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.5 // indirect
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.20.4 // indirect
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.20.5 // indirect
github.com/aws/aws-sdk-go-v2/service/batch v1.37.0 // indirect
github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.3.4 // indirect
github.com/aws/aws-sdk-go-v2/service/bedrock v1.7.7 // indirect
Expand Down Expand Up @@ -98,7 +98,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.23.4 // indirect
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.30.5 // indirect
github.com/aws/aws-sdk-go-v2/service/emr v1.39.5 // indirect
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.18.0 // indirect
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.19.0 // indirect
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.30.4 // indirect
github.com/aws/aws-sdk-go-v2/service/evidently v1.19.4 // indirect
github.com/aws/aws-sdk-go-v2/service/finspace v1.24.1 // indirect
Expand Down Expand Up @@ -157,10 +157,10 @@ require (
github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.10.5 // indirect
github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.22.0 // indirect
github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.4 // indirect
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.10.0 // indirect
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.11.0 // indirect
github.com/aws/aws-sdk-go-v2/service/route53domains v1.23.4 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect
github.com/aws/aws-sdk-go-v2/service/s3control v1.44.5 // indirect
github.com/aws/aws-sdk-go-v2/service/s3control v1.44.6 // indirect
github.com/aws/aws-sdk-go-v2/service/scheduler v1.8.4 // indirect
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 // indirect
github.com/aws/aws-sdk-go-v2/service/securityhub v1.47.2 // indirect
Expand Down Expand Up @@ -188,7 +188,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.13.1 // indirect
github.com/aws/aws-sdk-go-v2/service/vpclattice v1.7.5 // indirect
github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.30.0 // indirect
github.com/aws/aws-sdk-go-v2/service/workspaces v1.38.4 // indirect
github.com/aws/aws-sdk-go-v2/service/workspaces v1.39.0 // indirect
github.com/aws/aws-sdk-go-v2/service/xray v1.25.4 // indirect
github.com/aws/smithy-go v1.20.2 // indirect
github.com/beevik/etree v1.3.0 // indirect
Expand Down
24 changes: 12 additions & 12 deletions tools/tfsdk2fw/go.sum
Expand Up @@ -22,8 +22,8 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
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/aws/aws-sdk-go v1.51.23 h1:/3TEdsEE/aHmdKGw2NrOp7Sdea76zfffGkTTSXTsDxY=
github.com/aws/aws-sdk-go v1.51.23/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
github.com/aws/aws-sdk-go v1.51.24 h1:nwL5MaommPkwb7Ixk24eWkdx5HY4of1gD10kFFVAl6A=
github.com/aws/aws-sdk-go v1.51.24/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA=
github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to=
Expand Down Expand Up @@ -74,8 +74,8 @@ github.com/aws/aws-sdk-go-v2/service/auditmanager v1.32.4 h1:45+KYpnG8ZKoqLkQSIg
github.com/aws/aws-sdk-go-v2/service/auditmanager v1.32.4/go.mod h1:WHURzIps29VZSUz9jxpGeShOhGuf/SqQmNJLs3Ytfns=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.5 h1:vhdJymxlWS2qftzLiuCjSswjXBRLGfzo/BEE9LDveBA=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.40.5/go.mod h1:ZErgk/bPaaZIpj+lUWGlwI1A0UFhSIscgnCPzTLnb2s=
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.20.4 h1:LIQN+2GGZHwWksR6cVQtEF7xdLZUEsmUqy+4fStrZcE=
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.20.4/go.mod h1:5orNWB4auLR1UJ6MUrRpAwne7uZ84Y6cq/0sB6F6LA4=
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.20.5 h1:Wy39+Mw1tByk2tkq5li1pHW/Qh0FyFotpHC2mbj9w5Q=
github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.20.5/go.mod h1:5orNWB4auLR1UJ6MUrRpAwne7uZ84Y6cq/0sB6F6LA4=
github.com/aws/aws-sdk-go-v2/service/batch v1.37.0 h1:KsCQLOMecKTAIznlGCz5Lupddk1nc3E2XXlt63+8l54=
github.com/aws/aws-sdk-go-v2/service/batch v1.37.0/go.mod h1:JuPGVm7DzXD73vZBQsZwlDzoJeZewN08swLBGiU47K8=
github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.3.4 h1:WJEEIYSDCqNeG/q0OU99AovoS2lHTwyV+yYoQcwI+i8=
Expand Down Expand Up @@ -182,8 +182,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.30.5 h1:/x2u/TOx+
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.30.5/go.mod h1:e1McVqsud0JOERidvppLEHnuCdh/X6MRyL5L0LseAUk=
github.com/aws/aws-sdk-go-v2/service/emr v1.39.5 h1:ni+E9GfbQ8CzjYSlJ+WbNYX7SAsLiTWH0OMNiG9XprM=
github.com/aws/aws-sdk-go-v2/service/emr v1.39.5/go.mod h1:7WusX+O5pwTnx2yobUO/P1C5HlBibmrQb5gKEPFjTYM=
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.18.0 h1:kmGNN309RZDADHT5II3AwgR+nQBjR6YmGD9MxWhLJ0c=
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.18.0/go.mod h1:TZrahLcSXIN/kO96kvxUzfLNLH8E6t3xodv8Zv5DHGs=
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.19.0 h1:pahvDMOunlMdsWbAXJI+TspKLuW5/t4AWNnkfeLa+0c=
github.com/aws/aws-sdk-go-v2/service/emrserverless v1.19.0/go.mod h1:TZrahLcSXIN/kO96kvxUzfLNLH8E6t3xodv8Zv5DHGs=
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.30.4 h1:Vz4ilZcVXCR9yatX5yfMrkBldYggtkih3h7woHvzu5Q=
github.com/aws/aws-sdk-go-v2/service/eventbridge v1.30.4/go.mod h1:aIINXlt2xXhMeRsyCsLDUDohI8AdDm92gY9nIB6pv0M=
github.com/aws/aws-sdk-go-v2/service/evidently v1.19.4 h1:DcRQTdvIQs+v+rQJ598v7WmgLSsla9C90mY4J+rccrU=
Expand Down Expand Up @@ -300,14 +300,14 @@ github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.22.0 h1:YHfTTnVdsaOX5n4Bl
github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.22.0/go.mod h1:+Kmpl4w+kCRyagQIIUWpnj0RWYHeBuZELNGu4G1COtY=
github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.4 h1:c1jtPWZSmgMmPkCgwv67GE0ugdEgnLVo/BHR1wl3Dm0=
github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.21.4/go.mod h1:FWw+Jnx+SlpsrU/NQ/f7f+1RdixTApZiU2o9FOubiDQ=
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.10.0 h1:3RsRnhgYzD05lB9md8h59Lggd7eJgwFm3vxcDwVqRHs=
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.10.0/go.mod h1:RHFmC9Lds1jS1zBvnFq1GDh3yxFXH++n+2sI9TE53Cc=
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.11.0 h1:znBjrg7qGF7DOXpJ1ZKS9BLI045+z0UnKSml6MsL4WQ=
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.11.0/go.mod h1:RHFmC9Lds1jS1zBvnFq1GDh3yxFXH++n+2sI9TE53Cc=
github.com/aws/aws-sdk-go-v2/service/route53domains v1.23.4 h1:Qb7EiHvGJZGU43aCMahEJrP5sJjV62gGXm4y9x/syRQ=
github.com/aws/aws-sdk-go-v2/service/route53domains v1.23.4/go.mod h1:8wjITSWOCR+G7DhS2WraZnZ/geFYxXLLP0KKTfZtRGQ=
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 h1:6cnno47Me9bRykw9AEv9zkXE+5or7jz8TsskTTccbgc=
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1/go.mod h1:qmdkIIAC+GCLASF7R2whgNrJADz0QZPX+Seiw/i4S3o=
github.com/aws/aws-sdk-go-v2/service/s3control v1.44.5 h1:5IGyIMqxk5otMwIj+vYWyyegacuC/Y7NxoRzjfQOzCk=
github.com/aws/aws-sdk-go-v2/service/s3control v1.44.5/go.mod h1:xywJi2/waU8+fglbs5ASVHKr5y7OAYsEBOyQwgQgTIc=
github.com/aws/aws-sdk-go-v2/service/s3control v1.44.6 h1:J6weNKyH2/bVlQ4dWpfprtIGf1tor3Ht5xurx+GXJjs=
github.com/aws/aws-sdk-go-v2/service/s3control v1.44.6/go.mod h1:xywJi2/waU8+fglbs5ASVHKr5y7OAYsEBOyQwgQgTIc=
github.com/aws/aws-sdk-go-v2/service/scheduler v1.8.4 h1:1yvLbEatGZ18H3KmRNowvfHDlgqidyus0JopRiZDQHg=
github.com/aws/aws-sdk-go-v2/service/scheduler v1.8.4/go.mod h1:fkeoDzkVpr1vBMmow05/twn57pI93m0egpJYIigqbd8=
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.28.6 h1:TIOEjw0i2yyhmhRry3Oeu9YtiiHWISZ6j/irS1W3gX4=
Expand Down Expand Up @@ -362,8 +362,8 @@ github.com/aws/aws-sdk-go-v2/service/vpclattice v1.7.5 h1:k7JPfsAWnc4vbO/6nksfKd
github.com/aws/aws-sdk-go-v2/service/vpclattice v1.7.5/go.mod h1:lwuOe4SF+wdRnUrcPt1tukhJCj4gklxBV6xlD03Uo/8=
github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.30.0 h1:rsvoTrDs5jCAGbBPX+1kJWFVVTPE7QgUFVK9QNWAg6o=
github.com/aws/aws-sdk-go-v2/service/wellarchitected v1.30.0/go.mod h1:MRT/P9Cwn+7xCCVpD1sTvUESiWMAc9hA+FooRsW5fe8=
github.com/aws/aws-sdk-go-v2/service/workspaces v1.38.4 h1:SvHYikdxmnyptMebU3zFfXbfU96SHzdUX+KXqa6pjYE=
github.com/aws/aws-sdk-go-v2/service/workspaces v1.38.4/go.mod h1:1XK49PATLHBd7mpKqO91GqRuV7bEsmyQ8Lslvn3fFj4=
github.com/aws/aws-sdk-go-v2/service/workspaces v1.39.0 h1:dbVilmO4TcbLVmI4b1e5y4G7xParu0CA8+aFTP7TDUs=
github.com/aws/aws-sdk-go-v2/service/workspaces v1.39.0/go.mod h1:1XK49PATLHBd7mpKqO91GqRuV7bEsmyQ8Lslvn3fFj4=
github.com/aws/aws-sdk-go-v2/service/xray v1.25.4 h1:56m1lnJbOSjGposPRmCAAJ8uBM/4DWzTy1bILQ54La0=
github.com/aws/aws-sdk-go-v2/service/xray v1.25.4/go.mod h1:B8TaYUDF5rQxS1t3KxrMNu074VGbxxgi/2YYsUBDsbA=
github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
Expand Down

0 comments on commit f1d8b2e

Please sign in to comment.