jprdonnelly/terraform-google-sql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to Terraform 1.x (#68)

Browse Source 
* Bump tf to version 1.0
* Bump terraform-aws-ci
* Mark private key output as sensitive
* remove deprecated list() function
This commit is contained in:
Ben Whaley
2021-08-22 23:19:02 -07:00
committed by GitHub
parent 6128b76064
commit 5134a7b36d
17 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cloud-sql/README-MySQL.md
View File

@@ -12,7 +12,7 @@
# MySQL
[![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_google_cloudsql)
[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/terraform-google-sql.svg?label=latest)](http://github.com/gruntwork-io/terraform-google-sql/releases/latest)
![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.14.0-blue.svg)
![Terraform Version](https://img.shields.io/badge/tf-%3E%3D1.0.x-blue.svg)
This module deploys MySQL on top of Google's Cloud SQL Service. The cluster is managed by GCP and automatically handles
standby failover, read replicas, backups, patching, and encryption.

2
modules/cloud-sql/README-PostgreSQL.md
View File

@@ -12,7 +12,7 @@
# PostgreSQL
[![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_google_cloudsql)
[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/terraform-google-sql.svg?label=latest)](http://github.com/gruntwork-io/terraform-google-sql/releases/latest)
![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.14.0-blue.svg)
![Terraform Version](https://img.shields.io/badge/tf-%3E%3D1.0.x-blue.svg)
This module deploys PostgreSQL on top of Google's Cloud SQL Service. The cluster is managed by GCP and automatically handles
standby failover, read replicas, backups, patching, and encryption.

2
modules/cloud-sql/README.md
View File

@@ -2,7 +2,7 @@
[![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_google_cloudsql)
[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/terraform-google-sql.svg?label=latest)](http://github.com/gruntwork-io/terraform-google-sql/releases/latest)
![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.14.0-blue.svg)
![Terraform Version](https://img.shields.io/badge/tf-%3E%3D1.0.x-blue.svg)
<!-- NOTE: We use absolute linking here instead of relative linking, because the terraform registry does not support

8
modules/cloud-sql/main.tf
View File

@@ -5,9 +5,9 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
terraform {
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
# This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
# forwards compatible with 0.14.x code.
# forwards compatible with 1.0.x code.
required_version = ">= 0.12.26"
}
@@ -68,7 +68,7 @@ resource "google_sql_database_instance" "master" {
}
dynamic "location_preference" {
for_each = var.master_zone == null ? [] : list(var.master_zone)
for_each = var.master_zone == null ? [] : [var.master_zone]
content {
zone = location_preference.value
@@ -205,7 +205,7 @@ resource "google_sql_database_instance" "failover_replica" {
}
dynamic "location_preference" {
for_each = var.mysql_failover_replica_zone == null ? [] : list(var.mysql_failover_replica_zone)
for_each = var.mysql_failover_replica_zone == null ? [] : [var.mysql_failover_replica_zone]
content {
zone = location_preference.value