Skip to content

Commit 1f29092

Browse files
renovate[bot]apeabody
renovate[bot]
and
apeabody
authored
fix(TF>=1.3): Update go modules and dev-tools (#161)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Peabody <andrewpeabody@google.com>
1 parent 553cc68 commit 1f29092

File tree

9 files changed

+119
-49
lines changed

9 files changed

+119
-49
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Make will use bash instead of sh
1919
SHELL := /usr/bin/env bash
2020

21-
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.22
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.23
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The resources/services/activations/deletions that this module will create/trigge
99
- Create IAM role bindings for owners, encrypters, decrypters
1010

1111
## Compatibility
12-
This module is meant for use with Terraform 0.13+ and tested using Terraform 1.0+. If you find incompatibilities using Terraform >=0.13, please open an issue.
12+
This module is meant for use with Terraform v1.3+ and tested using Terraform v1.10+.
1313
If you haven't
1414
[upgraded](https://www.terraform.io/upgrade-guides/0-13.html) and need a Terraform
1515
0.12.x-compatible version of this module, the last released version
@@ -84,8 +84,8 @@ These sections describe requirements for using this module.
8484

8585
The following dependencies must be available:
8686

87-
- [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0
88-
- [Terraform Provider for GCP][terraform-provider-gcp] plugin v3.0
87+
- [Terraform](https://www.terraform.io/downloads.html) >= 1.3
88+
- [Terraform Provider for GCP][terraform-provider-gcp] plugin >= v5.31
8989

9090
### Service Account
9191

‎build/int.cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ tags:
4040
- 'integration'
4141
substitutions:
4242
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
43-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'
43+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'

‎build/lint.cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ tags:
2121
- 'lint'
2222
substitutions:
2323
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
24-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.22'
24+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.23'

‎modules/autokey/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.13"
18+
required_version = ">= 1.3"
1919
required_providers {
2020

2121
google = {

‎test/integration/go.mod

+42-40
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,86 @@
11
module github.com/terraform-google-modules/terraform-google-kms/test/integration
22

3-
go 1.22.0
3+
go 1.23.0
44

5-
toolchain go1.22.8
5+
toolchain go1.23.6
66

77
require (
8-
github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.16.2
9-
github.com/stretchr/testify v1.9.0
10-
golang.org/x/oauth2 v0.23.0
8+
github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test v0.17.5
9+
github.com/stretchr/testify v1.10.0
10+
github.com/tidwall/gjson v1.18.0
11+
golang.org/x/oauth2 v0.25.0
1112
)
1213

1314
require (
14-
cloud.google.com/go v0.110.7 // indirect
15-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
16-
cloud.google.com/go/iam v1.1.2 // indirect
17-
cloud.google.com/go/storage v1.33.0 // indirect
15+
cloud.google.com/go v0.116.0 // indirect
16+
cloud.google.com/go/compute/metadata v0.5.2 // indirect
17+
cloud.google.com/go/iam v1.2.2 // indirect
18+
cloud.google.com/go/storage v1.47.0 // indirect
1819
github.com/agext/levenshtein v1.2.3 // indirect
1920
github.com/alexflint/go-filemutex v1.3.0 // indirect
2021
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
2122
github.com/aws/aws-sdk-go v1.45.5 // indirect
2223
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2324
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2425
github.com/go-errors/errors v1.5.0 // indirect
25-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
26+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2627
github.com/go-openapi/jsonreference v0.20.2 // indirect
27-
github.com/go-openapi/swag v0.22.4 // indirect
28+
github.com/go-openapi/swag v0.23.0 // indirect
2829
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
29-
github.com/golang/protobuf v1.5.3 // indirect
30-
github.com/google/gnostic-models v0.6.8 // indirect
30+
github.com/golang/protobuf v1.5.4 // indirect
31+
github.com/google/gnostic-models v0.6.9 // indirect
3132
github.com/google/go-cmp v0.6.0 // indirect
32-
github.com/google/s2a-go v0.1.7 // indirect
33-
github.com/google/uuid v1.3.1 // indirect
34-
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
35-
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
36-
github.com/gruntwork-io/terratest v0.47.1 // indirect
33+
github.com/google/s2a-go v0.1.8 // indirect
34+
github.com/google/uuid v1.6.0 // indirect
35+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
36+
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
37+
github.com/gruntwork-io/terratest v0.48.1 // indirect
3738
github.com/hashicorp/errwrap v1.1.0 // indirect
3839
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
3940
github.com/hashicorp/go-getter v1.7.6 // indirect
41+
github.com/hashicorp/go-getter/v2 v2.2.3 // indirect
4042
github.com/hashicorp/go-multierror v1.1.1 // indirect
4143
github.com/hashicorp/go-safetemp v1.0.0 // indirect
42-
github.com/hashicorp/go-version v1.6.0 // indirect
44+
github.com/hashicorp/go-version v1.7.0 // indirect
4345
github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect
44-
github.com/hashicorp/hcl/v2 v2.20.1 // indirect
45-
github.com/hashicorp/terraform-config-inspect v0.0.0-20240801114854-6714b46f5fe4 // indirect
46-
github.com/hashicorp/terraform-json v0.22.1 // indirect
46+
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
47+
github.com/hashicorp/terraform-config-inspect v0.0.0-20241129133400-c404f8227ea6 // indirect
48+
github.com/hashicorp/terraform-json v0.24.0 // indirect
4749
github.com/jinzhu/copier v0.4.0 // indirect
4850
github.com/jmespath/go-jmespath v0.4.0 // indirect
4951
github.com/josharian/intern v1.0.0 // indirect
5052
github.com/klauspost/compress v1.16.7 // indirect
5153
github.com/mailru/easyjson v0.7.7 // indirect
54+
github.com/mattn/go-shellwords v1.0.12 // indirect
5255
github.com/mattn/go-zglob v0.0.4 // indirect
5356
github.com/mitchellh/go-homedir v1.1.0 // indirect
5457
github.com/mitchellh/go-testing-interface v1.14.2-0.20210821155943-2d9075ca8770 // indirect
5558
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
5659
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
57-
github.com/tidwall/gjson v1.17.3 // indirect
5860
github.com/tidwall/match v1.1.1 // indirect
5961
github.com/tidwall/pretty v1.2.1 // indirect
6062
github.com/tidwall/sjson v1.2.5 // indirect
61-
github.com/tmccombs/hcl2json v0.6.0 // indirect
63+
github.com/tmccombs/hcl2json v0.6.4 // indirect
6264
github.com/ulikunitz/xz v0.5.11 // indirect
63-
github.com/zclconf/go-cty v1.14.4 // indirect
65+
github.com/zclconf/go-cty v1.15.1 // indirect
6466
go.opencensus.io v0.24.0 // indirect
65-
golang.org/x/crypto v0.21.0 // indirect
66-
golang.org/x/mod v0.21.0 // indirect
67-
golang.org/x/net v0.23.0 // indirect
68-
golang.org/x/sync v0.4.0 // indirect
69-
golang.org/x/sys v0.18.0 // indirect
70-
golang.org/x/text v0.14.0 // indirect
71-
golang.org/x/tools v0.13.0 // indirect
67+
golang.org/x/crypto v0.31.0 // indirect
68+
golang.org/x/mod v0.22.0 // indirect
69+
golang.org/x/net v0.33.0 // indirect
70+
golang.org/x/sync v0.10.0 // indirect
71+
golang.org/x/sys v0.28.0 // indirect
72+
golang.org/x/text v0.21.0 // indirect
73+
golang.org/x/tools v0.26.0 // indirect
7274
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
73-
google.golang.org/api v0.138.0 // indirect
75+
google.golang.org/api v0.206.0 // indirect
7476
google.golang.org/appengine v1.6.8 // indirect
75-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
76-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
77-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
78-
google.golang.org/grpc v1.58.3 // indirect
79-
google.golang.org/protobuf v1.33.0 // indirect
77+
google.golang.org/genproto v0.0.0-20241113202542-65e8d215514f // indirect
78+
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
79+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
80+
google.golang.org/grpc v1.67.1 // indirect
81+
google.golang.org/protobuf v1.35.1 // indirect
8082
gopkg.in/yaml.v3 v3.0.1 // indirect
81-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
82-
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
83+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
84+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
8385
sigs.k8s.io/yaml v1.4.0 // indirect
8486
)

0 commit comments

Comments
 (0)