Skip to content

Commit ec0911c

Browse files
feat!: add Terraform 0.13 constraint and module attribution (#202)
* feat!: add Terraform 0.13 constraint and module attribution * Update versions.tf * Update versions.tf * Update versions.tf Co-authored-by: Morgante Pell <[email protected]>
1 parent 2619b42 commit ec0911c

File tree

21 files changed

+294
-229
lines changed

21 files changed

+294
-229
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
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 := 0.4.3
21+
DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
2222
DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323
REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ This module consists of the following submodules:
1010
See more details in each module's README.
1111

1212
## Compatibility
13-
14-
This module is meant for use with Terraform 0.12. If you haven't
15-
[upgraded](https://www.terraform.io/upgrade-guides/0-12.html)
16-
and need a Terraform 0.11.x-compatible version of this module, the last
17-
released version intended for Terraform 0.11.x is
18-
[v1.2.0](https://registry.terraform.io/modules/GoogleCloudPlatform/sql-db/google/1.2.0).
13+
This module is meant for use with Terraform 0.13. If you haven't
14+
[upgraded](https://www.terraform.io/upgrade-guides/0-13.html) and need a Terraform
15+
0.12.x-compatible version of this module, the last released version
16+
intended for Terraform 0.12.x is [v4.5.0](https://registry.terraform.io/modules/terraform-google-modules/-sql-db/google/v4.5.0).
1917

2018
## Upgrading
2119

@@ -32,7 +30,7 @@ The root module has been deprecated. Please switch to using one of the submodule
3230

3331
### Installation Dependencies
3432

35-
- [terraform](https://www.terraform.io/downloads.html) 0.12.x
33+
- [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0
3634
- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) plugin v2.5.x
3735

3836
The following dependency must be available for SQL Server module:

build/int.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,4 @@ tags:
188188
- 'integration'
189189
substitutions:
190190
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
191-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.4.3'
191+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'

build/lint.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
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: '0.4.3'
24+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'

examples/mssql-public/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ This example shows how create MS SQL Server database using the Terraform module.
66
## Inputs
77

88
| Name | Description | Type | Default | Required |
9-
|------|-------------|:----:|:-----:|:-----:|
10-
| name | The name for Cloud SQL instance | string | `"tf-mssql-public"` | no |
11-
| project\_id | The project to run tests against | string | n/a | yes |
12-
| region | | string | `"us-central1"` | no |
9+
|------|-------------|------|---------|:--------:|
10+
| name | The name for Cloud SQL instance | `string` | `"tf-mssql-public"` | no |
11+
| project\_id | The project to run tests against | `string` | n/a | yes |
12+
| region | n/a | `string` | `"us-central1"` | no |
1313

1414
## Outputs
1515

1616
| Name | Description |
1717
|------|-------------|
1818
| instance\_name | The name for Cloud SQL instance |
1919
| mssql\_connection | The connection name of the master instance to be used in connection strings |
20-
| project\_id | |
20+
| project\_id | n/a |
2121
| public\_ip\_address | Public ip address |
2222

2323
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/mysql-ha/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ terraform destroy
2222
## Inputs
2323

2424
| Name | Description | Type | Default | Required |
25-
|------|-------------|:----:|:-----:|:-----:|
26-
| mysql\_ha\_external\_ip\_range | The ip range to allow connecting from/to Cloud SQL | string | `"192.10.10.10/32"` | no |
27-
| mysql\_ha\_name | The name for Cloud SQL instance | string | `"tf-mysql-ha"` | no |
28-
| project\_id | The project to run tests against | string | n/a | yes |
25+
|------|-------------|------|---------|:--------:|
26+
| mysql\_ha\_external\_ip\_range | The ip range to allow connecting from/to Cloud SQL | `string` | `"192.10.10.10/32"` | no |
27+
| mysql\_ha\_name | The name for Cloud SQL instance | `string` | `"tf-mysql-ha"` | no |
28+
| project\_id | The project to run tests against | `string` | n/a | yes |
2929

3030
## Outputs
3131

3232
| Name | Description |
3333
|------|-------------|
34-
| authorized\_network | |
34+
| authorized\_network | n/a |
3535
| name | The name for Cloud SQL instance |
36-
| project\_id | |
36+
| project\_id | n/a |
3737

3838
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/mysql-private/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ terraform destroy
8383
## Inputs
8484

8585
| Name | Description | Type | Default | Required |
86-
|------|-------------|:----:|:-----:|:-----:|
87-
| db\_name | The name of the SQL Database instance | string | `"example-mysql-private"` | no |
88-
| network\_name | | string | `"mysql-privat"` | no |
89-
| project\_id | The project to run tests against | string | n/a | yes |
86+
|------|-------------|------|---------|:--------:|
87+
| db\_name | The name of the SQL Database instance | `string` | `"example-mysql-private"` | no |
88+
| network\_name | n/a | `string` | `"mysql-privat"` | no |
89+
| project\_id | The project to run tests against | `string` | n/a | yes |
9090

9191
## Outputs
9292

9393
| Name | Description |
9494
|------|-------------|
9595
| mysql\_conn | The connection name of the master instance to be used in connection strings |
96-
| mysql\_user\_pass | The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable. |
96+
| mysql\_user\_pass | The password for the default user. If not set, a random one will be generated and available in the generated\_user\_password output variable. |
9797
| name | The name for Cloud SQL instance |
9898
| private\_ip\_address | The first private (PRIVATE) IPv4 address assigned for the master instance |
9999
| project\_id | The project to run tests against |

examples/mysql-public/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ terraform destroy
2222
## Inputs
2323

2424
| Name | Description | Type | Default | Required |
25-
|------|-------------|:----:|:-----:|:-----:|
26-
| authorized\_networks | List of mapped public networks authorized to access to the instances. Default - short range of GCP health-checkers IPs | list(map(string)) | `<list>` | no |
27-
| db\_name | The name of the SQL Database instance | string | `"example-mysql-public"` | no |
28-
| project\_id | The ID of the project in which resources will be provisioned. | string | n/a | yes |
25+
|------|-------------|------|---------|:--------:|
26+
| authorized\_networks | List of mapped public networks authorized to access to the instances. Default - short range of GCP health-checkers IPs | `list(map(string))` | <pre>[<br> {<br> "name": "sample-gcp-health-checkers-range",<br> "value": "130.211.0.0/28"<br> }<br>]</pre> | no |
27+
| db\_name | The name of the SQL Database instance | `string` | `"example-mysql-public"` | no |
28+
| project\_id | The ID of the project in which resources will be provisioned. | `string` | n/a | yes |
2929

3030
## Outputs
3131

3232
| Name | Description |
3333
|------|-------------|
3434
| mysql\_conn | The connection name of the master instance to be used in connection strings |
35-
| mysql\_user\_pass | The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable. |
35+
| mysql\_user\_pass | The password for the default user. If not set, a random one will be generated and available in the generated\_user\_password output variable. |
3636
| name | The name for Cloud SQL instance |
3737
| private\_ip\_address | The first private (PRIVATE) IPv4 address assigned for the master instance |
3838
| project\_id | The project to run tests against |

examples/postgresql-ha/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ terraform destroy
2222
## Inputs
2323

2424
| Name | Description | Type | Default | Required |
25-
|------|-------------|:----:|:-----:|:-----:|
26-
| pg\_ha\_external\_ip\_range | The ip range to allow connecting from/to Cloud SQL | string | `"192.10.10.10/32"` | no |
27-
| pg\_ha\_name | The name for Cloud SQL instance | string | `"tf-pg-ha"` | no |
28-
| project\_id | The project to run tests against | string | n/a | yes |
25+
|------|-------------|------|---------|:--------:|
26+
| pg\_ha\_external\_ip\_range | The ip range to allow connecting from/to Cloud SQL | `string` | `"192.10.10.10/32"` | no |
27+
| pg\_ha\_name | The name for Cloud SQL instance | `string` | `"tf-pg-ha"` | no |
28+
| project\_id | The project to run tests against | `string` | n/a | yes |
2929

3030
## Outputs
3131

3232
| Name | Description |
3333
|------|-------------|
34-
| authorized\_network | |
34+
| authorized\_network | n/a |
3535
| name | The name for Cloud SQL instance |
36-
| project\_id | |
36+
| project\_id | n/a |
3737

3838
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

examples/postgresql-public/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ terraform destroy
2222
## Inputs
2323

2424
| Name | Description | Type | Default | Required |
25-
|------|-------------|:----:|:-----:|:-----:|
26-
| authorized\_networks | List of mapped public networks authorized to access to the instances. Default - short range of GCP health-checkers IPs | list(map(string)) | `<list>` | no |
27-
| db\_name | The name of the SQL Database instance | string | `"example-postgres-public"` | no |
28-
| project\_id | The ID of the project in which resources will be provisioned. | string | n/a | yes |
25+
|------|-------------|------|---------|:--------:|
26+
| authorized\_networks | List of mapped public networks authorized to access to the instances. Default - short range of GCP health-checkers IPs | `list(map(string))` | <pre>[<br> {<br> "name": "sample-gcp-health-checkers-range",<br> "value": "130.211.0.0/28"<br> }<br>]</pre> | no |
27+
| db\_name | The name of the SQL Database instance | `string` | `"example-postgres-public"` | no |
28+
| project\_id | The ID of the project in which resources will be provisioned. | `string` | n/a | yes |
2929

3030
## Outputs
3131

@@ -34,7 +34,7 @@ terraform destroy
3434
| name | The name for Cloud SQL instance |
3535
| project\_id | The project to run tests against |
3636
| psql\_conn | The connection name of the master instance to be used in connection strings |
37-
| psql\_user\_pass | The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable. |
37+
| psql\_user\_pass | The password for the default user. If not set, a random one will be generated and available in the generated\_user\_password output variable. |
3838
| public\_ip\_address | The first public (PRIMARY) IPv4 address assigned for the master instance |
3939

4040
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

0 commit comments

Comments
 (0)