Skip to content

Commit 903e617

Browse files
namusyakanamusyaka
committed
make -s
1 parent 39bca80 commit 903e617

File tree

7 files changed

+129
-39
lines changed

7 files changed

+129
-39
lines changed

‎modules/mysql/README.md‎

Lines changed: 60 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,61 @@
66

77
| Name | Description | Type | Default | Required |
88
|------|-------------|:----:|:-----:|:-----:|
9-
| authorized_gae_applications | The authorized gae applications for the Cloud SQL instances | list | `<list>` | no |
9+
| activation_policy | The activation policy for the master instance. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | string | `ALWAYS` | no |
10+
| authorized_gae_applications | The list of authorized App Engine project names | list | `<list>` | no |
1011
| backup_configuration | The backup configuration block of the Cloud SQL resources This argument will be passed through the master instance directrly.<br><br>See [more details](https://www.terraform.io/docs/providers/google/r/sql_database_instance.html). | map | `<map>` | no |
12+
| database_flags | The database flags for the master instance. See [more details](https://cloud.google.com/sql/docs/mysql/flags) | list | `<list>` | no |
1113
| database_version | The database version to use | string | - | yes |
1214
| databases | The list of databases for the instacne | list | `<list>` | no |
13-
| failover_replica | The failover replica settings of the Cloud SQL resources Following arguments are available:<br><br>tier - (Required) The tier for the failover replica instance.<br><br>zone - (Required) The zone for the failover replica instance, it should be something like: `a`, `c`.<br><br>activation_policy - (Optional) The activation policy for the failover replica instance. Defaults to `ALWAYS`. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`.<br><br>authorized_gae_applications - (Optional) The list of authorized App Engine project names<br><br>crash_safe_replication (Optional) The crash safe replication is to indicates when crash-safe replication flags are enabled. Defaults to `true`.<br><br>disk_autoresize - (Optional) Configuration to increase storage size. Defaults to `true`.<br><br>disk_size - (Optional) The disk size for the failover replica instance. Defaults to `10`.<br><br>disk_type - (Opitional) The disk type for the failover replica instance. Defaults to `PD_SSD`.<br><br>pricing_plan - (Optional) The pricing plan for the failover replica instance. Defaults to `PER_USE`.<br><br>database_flags - (Optional) The database flags for the failover replica instance. See [more details](https://cloud.google.com/sql/docs/mysql/flags)<br><br>maintenance_window_day - (Optional) The day of week (1-7) for the failover replica instance maintenance.<br><br>maintenance_window_hour - (Optional) The hour of day (0-23) maintenance window for the failover replica instance maintenance.<br><br>maintenance_window_update_track - (Optional) The update track of maintenance window for the failover replica instance maintenance. Defaults to `canary`. Can be either `canary` or `stable`. | map | `<map>` | no |
14-
| failover_replica_database_flags | The database flasgs to set on the failover replica instance | list | `<list>` | no |
15-
| failover_replica_labels | The key/value labels for the failover replica instance. | map | `<map>` | no |
16-
| ip_configuration | The ip configuration for the Cloud SQL instances. This argument will be passed through all instances as the settings.ip_configuration block. | map | `<map>` | no |
17-
| master | The master settings of the Cloud SQL resources. Following arguments are available:<br><br>tier - (Required) The tier for the master instance.<br><br>zone - (Required) The zone for the master instance, it should be something like: `a`, `c`.<br><br>activation_policy - (Optional) The activation policy for the master instance. Defaults to `ALWAYS`. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`.<br><br>authorized_gae_applications - (Optional) The list of authorized App Engine project names<br><br>disk_autoresize - (Optional) Configuration to increase storage size. Defaults to `true`.<br><br>disk_size - (Optional) The disk size for the master instance. Defaults to `10`.<br><br>disk_type - (Opitional) The disk type for the master instance. Defaults to `PD_SSD`.<br><br>pricing_plan - (Optional) The pricing plan for the master instance. Defaults to `PER_USE`.<br><br>database_flags - (Optional) The database flags for the master instance. See [more details](https://cloud.google.com/sql/docs/mysql/flags)<br><br>maintenance_window_day - (Optional) The day of week (1-7) for the master instance maintenance.<br><br>maintenance_window_hour - (Optional) The hour of day (0-23) maintenance window for the master instance maintenance.<br><br>maintenance_window_update_track - (Optional) The update track of maintenance window for the master instance maintenance. Defaults to `canary`. Can be either `canary` or `stable`. | map | `<map>` | no |
18-
| master_database_flags | The database flasgs to set on the master instance | list | `<list>` | no |
19-
| master_labels | The key/value labels for the master instances. | map | `<map>` | no |
15+
| disk_autoresize | Configuration to increase storage size | string | `true` | no |
16+
| disk_size | The disk size for the master instance | string | `10` | no |
17+
| disk_type | The disk type for the master instance. | string | `PD_SSD` | no |
18+
| failover_replica | Specify true if the failover instance is required | string | `false` | no |
19+
| failover_replica_activation_policy | The activation policy for the failover replica instance. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | string | `ALWAYS` | no |
20+
| failover_replica_configuration | The replica configuration for the failover replica instance. In order to create a failover instance, need to specify this argument. | map | `<map>` | no |
21+
| failover_replica_crash_safe_replication | The crash safe replication is to indicates when crash-safe replication flags are enabled. | string | `true` | no |
22+
| failover_replica_database_flags | The database flags for the failover replica instance. See [more details](https://cloud.google.com/sql/docs/mysql/flags) | list | `<list>` | no |
23+
| failover_replica_disk_autoresize | Configuration to increase storage size. | string | `true` | no |
24+
| failover_replica_disk_size | The disk size for the failover replica instance. | string | `10` | no |
25+
| failover_replica_disk_type | The disk type for the failover replica instance. | string | `PD_SSD` | no |
26+
| failover_replica_ip_configuration | The ip configuration for the failover replica instances. | map | `<map>` | no |
27+
| failover_replica_maintenance_window_day | The day of week (1-7) for the failover replica instance maintenance. | string | `1` | no |
28+
| failover_replica_maintenance_window_hour | The hour of day (0-23) maintenance window for the failover replica instance maintenance. | string | `23` | no |
29+
| failover_replica_maintenance_window_update_track | The update track of maintenance window for the failover replica instance maintenance. Can be either `canary` or `stable`. | string | `canary` | no |
30+
| failover_replica_pricing_plan | The pricing plan for the failover replica instance. | string | `PER_USE` | no |
31+
| failover_replica_replication_type | The replication type for the failover replica instance. Can be one of ASYNCHRONOUS or SYNCHRONOUS. | string | `SYNCHRONOUS` | no |
32+
| failover_replica_tier | The tier for the failover replica instance. | string | `` | no |
33+
| failover_replica_user_labels | The key/value labels for the failover replica instance. | map | `<map>` | no |
34+
| failover_replica_zone | The zone for the failover replica instance, it should be something like: `a`, `c`. | string | `` | no |
35+
| ip_configuration | The ip configuration for the master instance. | map | `<map>` | no |
36+
| maintenance_window_day | The day of week (1-7) for the master instance maintenance. | string | `1` | no |
37+
| maintenance_window_hour | The hour of day (0-23) maintenance window for the master instance maintenance. | string | `23` | no |
38+
| maintenance_window_update_track | The update track of maintenance window for the master instance maintenance. Can be either `canary` or `stable`. | string | `canary` | no |
2039
| name | The name of the Cloud SQL resources | string | - | yes |
40+
| pricing_plan | The pricing plan for the master instance. | string | `PER_USE` | no |
2141
| project_id | The project ID to manage the Cloud SQL resources | string | - | yes |
22-
| read_replica | The read replica settings of the Cloud SQL resources Following arguments are available:<br><br>tier - (Required) The tier for the read replica instances.<br><br>zones - (Required) The zones for the read replica instancess, it should be something like: `a,b,c`. Given zones are used rotationally for creating read replicas.<br><br>activation_policy - (Optional) The activation policy for the read replica instances. Defaults to `ALWAYS`. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`.<br><br>authorized_gae_applications - (Optional) The list of authorized App Engine project names<br><br>crash_safe_replication (Optional) The crash safe replication is to indicates when crash-safe replication flags are enabled. Defaults to `true`.<br><br>disk_autoresize - (Optional) Configuration to increase storage size. Defaults to `true`.<br><br>disk_size - (Optional) The disk size for the read replica instances. Defaults to `10`.<br><br>disk_type - (Opitional) The disk type for the read replica instances. Defaults to `PD_SSD`.<br><br>pricing_plan - (Optional) The pricing plan for the read replica instances. Defaults to `PER_USE`.<br><br>database_flags - (Optional) The database flags for the read replica instances. See [more details](https://cloud.google.com/sql/docs/mysql/flags)<br><br>maintenance_window_day - (Optional) The day of week (1-7) for the read replica instances maintenance.<br><br>maintenance_window_hour - (Optional) The hour of day (0-23) maintenance window for the read replica instances maintenance.<br><br>maintenance_window_update_track - (Optional) The update track of maintenance window for the read replica instances maintenance. Defaults to `canary`. Can be either `canary` or `stable`. | map | `<map>` | no |
23-
| read_replica_database_flags | The database flasgs to set on the read replica instances | list | `<list>` | no |
24-
| read_replica_labels | The key/value labels for the read replica instances. | map | `<map>` | no |
25-
| region | The region of the Cloud SQL resources | string | - | yes |
26-
| replica_configuration | The replica configuration for use in read replica and failover replica | map | `<map>` | no |
42+
| read_replica_activation_policy | The activation policy for the read replica instances. Can be either `ALWAYS`, `NEVER` or `ON_DEMAND`. | string | `ALWAYS` | no |
43+
| read_replica_configuration | The replica configuration for use in all read replica instances. | map | `<map>` | no |
44+
| read_replica_crash_safe_replication | The crash safe replication is to indicates when crash-safe replication flags are enabled. | string | `true` | no |
45+
| read_replica_database_flags | The database flags for the read replica instances. See [more details](https://cloud.google.com/sql/docs/mysql/flags) | list | `<list>` | no |
46+
| read_replica_disk_autoresize | Configuration to increase storage size. | string | `true` | no |
47+
| read_replica_disk_size | The disk size for the read replica instances. | string | `10` | no |
48+
| read_replica_disk_type | The disk type for the read replica instances. | string | `PD_SSD` | no |
49+
| read_replica_ip_configuration | The ip configuration for the read replica instances. | map | `<map>` | no |
50+
| read_replica_maintenance_window_day | The day of week (1-7) for the read replica instances maintenance. | string | `1` | no |
51+
| read_replica_maintenance_window_hour | The hour of day (0-23) maintenance window for the read replica instances maintenance. | string | `23` | no |
52+
| read_replica_maintenance_window_update_track | The update track of maintenance window for the read replica instances maintenance. Can be either `canary` or `stable`. | string | `canary` | no |
53+
| read_replica_pricing_plan | The pricing plan for the read replica instances. | string | `PER_USE` | no |
54+
| read_replica_replication_type | The replication type for read replica instances. Can be one of ASYNCHRONOUS or SYNCHRONOUS. | string | `SYNCHRONOUS` | no |
55+
| read_replica_size | The size of read replicas | string | `0` | no |
56+
| read_replica_tier | The tier for the read replica instances. | string | `` | no |
57+
| read_replica_user_labels | The key/value labels for the read replica instances. | map | `<map>` | no |
58+
| read_replica_zones | The zones for the read replica instancess, it should be something like: `a,b,c`. Given zones are used rotationally for creating read replicas. | string | `` | no |
59+
| region | The region of the Cloud SQL resources | string | `us-central1` | no |
60+
| tier | The tier for the master instance. | string | `db-n1-standard-1` | no |
61+
| user_labels | The key/value labels for the master instances. | map | `<map>` | no |
2762
| users | The list of users on the database | list | `<list>` | no |
63+
| zone | The zone for the master instance, it should be something like: `a`, `c`. | string | - | yes |
2864

2965
## Outputs
3066

@@ -36,16 +72,21 @@
3672
| database_self_links | The URIs of the databases |
3773
| failover-replica_instance_connection_name | The connection name of the failover-replica instance to be used in connection strings |
3874
| failover-replica_instance_first_ip_address | The first IPv4 address of the addesses assigned for the failover-replica instance |
75+
| failover-replica_instance_name | The instance name for the failover replica instance |
3976
| failover-replica_instance_self_link | The URI of the failover-replica instance |
4077
| failover-replica_instance_server_ca_cert | The CA certificate information used to connect to the failover-replica instance via SSL |
4178
| failover-replica_instance_service_account_email_address | The service account email addresses assigned to the failover-replica instance |
42-
| master_instance_connection_name | The connection name of the master instance to be used in connection strings |
43-
| master_instance_first_ip_address | The first IPv4 address of the addesses assigned for the master instance |
44-
| master_instance_self_link | The URI of the master instance |
45-
| master_instance_server_ca_cert | The CA certificate information used to connect to the SQL instance via SSL |
46-
| master_instance_service_account_email_address | The service account email address assigned to the master instance |
79+
| generated_user_password | The auto generated default user password if not input password was provided |
80+
| instance_connection_name | The connection name of the master instance to be used in connection strings |
81+
| instance_first_ip_address | The first IPv4 address of the addresses assigned for the master instance. |
82+
| instance_ip_address | The IPv4 address assigned for the master instance |
83+
| instance_name | The instance name for the master instance |
84+
| instance_self_link | The URI of the master instance |
85+
| instance_server_ca_cert | The CA certificate information used to connect to the SQL instance via SSL |
86+
| instance_service_account_email_address | The service account email address assigned to the master instance |
87+
| read_replica_instance_names | The instance names for the read replica instances |
4788
| replicas_instance_connection_names | The connection names of the replica instances to be used in connection strings |
48-
| replicas_instance_first_ip_addresses | The first IPv4 addresses of the addesses assigned for the replica instances |
89+
| replicas_instance_first_ip_addresses | The first IPv4 addresses of the addresses assigned for the replica instances |
4990
| replicas_instance_self_links | The URIs of the replica instances |
5091
| replicas_instance_server_ca_certs | The CA certificates information used to connect to the replica instances via SSL |
5192
| replicas_instance_service_account_email_addresses | The service account email addresses assigned to the replica instances |

‎modules/mysql/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
locals {
18-
default_user_host = "%"
18+
default_user_host = "%"
1919
}
2020

2121
resource "google_sql_database_instance" "default" {

‎modules/mysql/variables.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ EOF
111111

112112
variable "ip_configuration" {
113113
description = "The ip configuration for the master instance."
114-
default = {}
114+
default = {}
115115
}
116116

117117
// Read Replicas
@@ -198,7 +198,7 @@ variable "read_replica_user_labels" {
198198

199199
variable "read_replica_ip_configuration" {
200200
description = "The ip configuration for the read replica instances."
201-
default = {}
201+
default = {}
202202
}
203203

204204
// Failover replica
@@ -285,7 +285,7 @@ variable "failover_replica_user_labels" {
285285

286286
variable "failover_replica_ip_configuration" {
287287
description = "The ip configuration for the failover replica instances."
288-
default = {}
288+
default = {}
289289
}
290290

291291
// for google_sql_database

0 commit comments

Comments
 (0)