Skip to content

Commit 2465280

Browse files
g-awmalikg-awmalik
authored
chore: upgraded versions.tf to include minor bumps from tpg v5 (#95)
1 parent dd5f444 commit 2465280

File tree

19 files changed

+34
-42
lines changed

19 files changed

+34
-42
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.13
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.17
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ don't you run the risk of failing validation (at the least) or surfacing the
177177
dreaded `value of 'count' cannot be computed` error. Future versions of
178178
Terraform may change this fact, but this is the current limitation.
179179

180-
[^]: (autogen_docs_start)
180+
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
181181
## Inputs
182182

183183
| Name | Description | Type | Default | Required |
@@ -213,7 +213,7 @@ Terraform may change this fact, but this is the current limitation.
213213
| reverse\_dns\_fqdns | List of reverse DNS PTR records registered in Cloud DNS. (e.g. ["1.2.11.10.in-addr.arpa", "2.2.11.10.in-addr.arpa"]) |
214214
| self\_links | List of URIs of the created address resources |
215215

216-
[^]: (autogen_docs_end)
216+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
217217

218218

219219
## Requirements

‎build/int.cloudbuild.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ steps:
4343
args: ['/bin/bash', '-c', 'cft test run TestIpAddressOnly --verbose --stage teardown']
4444
- id: create ip-address-with-specific-ip-local
4545
waitFor:
46-
- prepare
46+
- destroy ip-address-only-local
4747
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
4848
args: ['/bin/bash', '-c', 'cft test run TestIpAddressWithSpecificIp --verbose --stage init']
4949
- id: converge ip-address-with-specific-ip-local
@@ -63,7 +63,7 @@ steps:
6363
args: ['/bin/bash', '-c', 'cft test run TestIpAddressWithSpecificIp --verbose --stage teardown']
6464
- id: create TestDnsForwardExample
6565
waitFor:
66-
- prepare
66+
- destroy ip-address-with-specific-ip-local
6767
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
6868
args: ['/bin/bash', '-c', 'cft test run TestDnsForwardExample --verbose --stage init']
6969
- id: converge TestDnsForwardExample
@@ -83,7 +83,7 @@ steps:
8383
args: ['/bin/bash', '-c', 'cft test run TestDnsForwardExample --verbose --stage teardown']
8484
- id: create TestDnsForwardExampleMultiNames
8585
waitFor:
86-
- prepare
86+
- destroy TestDnsForwardExample
8787
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
8888
args: ['/bin/bash', '-c', 'cft test run TestDnsForwardExampleMultiNames --verbose --stage init']
8989
- id: converge TestDnsForwardExampleMultiNames
@@ -103,7 +103,7 @@ steps:
103103
args: ['/bin/bash', '-c', 'cft test run TestDnsForwardExampleMultiNames --verbose --stage teardown']
104104
- id: create TestDnsForwardAndReverse
105105
waitFor:
106-
- prepare
106+
- destroy TestDnsForwardExampleMultiNames
107107
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
108108
args: ['/bin/bash', '-c', 'cft test run TestDnsForwardAndReverse --verbose --stage init ']
109109
- id: converge TestDnsForwardAndReverse
@@ -126,6 +126,6 @@ tags:
126126
- 'integration'
127127
substitutions:
128128
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
129-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
129+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
130130
options:
131131
machineType: 'N1_HIGHCPU_8'

‎build/lint.cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ tags:
2222
- 'lint'
2323
substitutions:
2424
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
25-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.13'
25+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.17'
2626
options:
2727
machineType: 'N1_HIGHCPU_8'

‎examples/dns_forward_and_reverse/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This example illustrates how to reserve multiple IP addresses at the same
44
time, and how to enable the Google Cloud DNS registration functionality for
55
both forward and reverse DNS lookup zones.
66

7-
[^]: (autogen_docs_start)
7+
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
88
## Inputs
99

1010
| Name | Description | Type | Default | Required |
@@ -32,7 +32,7 @@ both forward and reverse DNS lookup zones.
3232
| reverse\_dns\_fqdns | List of reverse DNS PTR records registered in Cloud DNS. |
3333
| reverse\_zone | The GCP name of the reverse lookup DNS zone being used |
3434

35-
[^]: (autogen_docs_end)
35+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
3636

3737
To provision this example, run the following from within this directory:
3838
- `terraform init` to get the plugins

‎examples/dns_forward_and_reverse/versions.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
22-
version = "~> 4.0"
21+
source = "hashicorp/google"
2322
}
2423
}
2524
}

‎examples/dns_forward_example/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ time, and how to enable the Google Cloud DNS registration functionality that
55
will register the IP addresses and their corresponding DNS names with Google
66
Cloud DNS.
77

8-
[^]: (autogen_docs_start)
8+
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
99
## Inputs
1010

1111
| Name | Description | Type | Default | Required |
@@ -30,7 +30,7 @@ Cloud DNS.
3030
| project\_id | ID of the project being used |
3131
| region | Region being used |
3232

33-
[^]: (autogen_docs_end)
33+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
3434

3535
To provision this example, run the following from within this directory:
3636
- `terraform init` to get the plugins

‎examples/dns_forward_example/versions.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
22-
version = "~> 4.0"
21+
source = "hashicorp/google"
2322
}
2423
}
2524
}

‎examples/global_external_address/versions.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
22-
version = "~> 4.0"
21+
source = "hashicorp/google"
2322
}
2423
null = {
2524
source = "hashicorp/null"

‎examples/internal_with_dynamic_ip/versions.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
22-
version = ">= 3.53, < 5.0"
21+
source = "hashicorp/google"
2322
}
2423
null = {
2524
source = "hashicorp/null"

‎examples/internal_with_specific_ip/versions.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
22-
version = ">= 3.53, < 5.0"
21+
source = "hashicorp/google"
2322
}
2423
null = {
2524
source = "hashicorp/null"

‎examples/ip_address_only/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This example illustrates how to simply reserve an IP address that is
44
dynamically assigned by GCP. Outputs have been provided to list the address
55
itself as well as the resource name that corresponds.
66

7-
[^]: (autogen_docs_start)
7+
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
88
## Inputs
99

1010
| Name | Description | Type | Default | Required |
@@ -23,7 +23,7 @@ itself as well as the resource name that corresponds.
2323
| project\_id | ID of the project being used |
2424
| region | Region being used |
2525

26-
[^]: (autogen_docs_end)
26+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2727

2828
To provision this example, run the following from within this directory:
2929
- `terraform init` to get the plugins

‎examples/ip_address_only/versions.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
22-
version = "~> 4.0"
21+
source = "hashicorp/google"
2322
}
2423
}
2524
}

‎examples/ip_address_with_specific_ip/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This example illustrates how to reserve a specific IP address (instead of
44
allowing GCP to dynamically assign it from the subnet provided).
55

6-
[^]: (autogen_docs_start)
6+
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
77
## Inputs
88

99
| Name | Description | Type | Default | Required |
@@ -23,7 +23,7 @@ allowing GCP to dynamically assign it from the subnet provided).
2323
| project\_id | ID of the project being used |
2424
| region | Region being used |
2525

26-
[^]: (autogen_docs_end)
26+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2727

2828
To provision this example, run the following from within this directory:
2929
- `terraform init` to get the plugins

‎examples/ip_address_with_specific_ip/versions.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
22-
version = "~> 4.0"
21+
source = "hashicorp/google"
2322
}
2423
}
2524
}

‎examples/regional_external_address/versions.tf

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ terraform {
1818
required_version = ">= 0.13"
1919
required_providers {
2020
google = {
21-
source = "hashicorp/google"
22-
version = ">= 3.53, < 5.0"
21+
source = "hashicorp/google"
2322
}
2423
null = {
2524
source = "hashicorp/null"

‎main.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ locals {
2424
dns_forward_record_count = var.enable_cloud_dns ? length(local.dns_fqdns) : 0
2525
dns_reverse_record_count = var.enable_reverse_dns ? length(local.dns_fqdns) : 0
2626
ip_addresses = concat(
27-
google_compute_address.ip.*.address,
28-
google_compute_global_address.global_ip.*.address,
27+
google_compute_address.ip[*].address,
28+
google_compute_global_address.global_ip[*].address,
2929
)
3030
ip_names = concat(
31-
google_compute_address.ip.*.name,
32-
google_compute_global_address.global_ip.*.name,
31+
google_compute_address.ip[*].name,
32+
google_compute_global_address.global_ip[*].name,
3333
)
3434
self_links = concat(
35-
google_compute_address.ip.*.self_link,
36-
google_compute_global_address.global_ip.*.self_link,
35+
google_compute_address.ip[*].self_link,
36+
google_compute_global_address.global_ip[*].self_link,
3737
)
3838
prefix_length = var.address_type == "EXTERNAL" || (var.address_type == "INTERNAL" && var.purpose == "PRIVATE_SERVICE_CONNECT") ? null : var.prefix_length
3939

‎test/setup/versions.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ terraform {
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"
22-
version = ">= 3.50, < 5.0"
22+
version = ">= 3.50, < 6"
2323
}
2424
google-beta = {
2525
source = "hashicorp/google-beta"
26-
version = ">= 3.50, < 5.0"
26+
version = ">= 3.50, < 6"
2727
}
2828
random = {
2929
source = "hashicorp/random"

‎versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ terraform {
2020

2121
google = {
2222
source = "hashicorp/google"
23-
version = ">= 3.53, < 5.0"
23+
version = ">= 3.53, < 6"
2424
}
2525
}
2626

0 commit comments

Comments
 (0)