From 6ed8006df0b4eb049e87d4cf953baa68db3771b6 Mon Sep 17 00:00:00 2001 From: Cameron Thornton Date: Fri, 2 Apr 2021 14:29:00 -0500 Subject: [PATCH 1/2] Sql instance ip_configuration "either" -> "at least" --- .../terraform/resources/resource_sql_database_instance.go.erb | 4 ++-- .../website/docs/r/sql_database_instance.html.markdown | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mmv1/third_party/terraform/resources/resource_sql_database_instance.go.erb b/mmv1/third_party/terraform/resources/resource_sql_database_instance.go.erb index ec370fce8029..395d171de5c7 100644 --- a/mmv1/third_party/terraform/resources/resource_sql_database_instance.go.erb +++ b/mmv1/third_party/terraform/resources/resource_sql_database_instance.go.erb @@ -303,7 +303,7 @@ settings.backup_configuration.binary_log_enabled are both set to true.`, Optional: true, Default: true, AtLeastOneOf: ipConfigurationKeys, - Description: `Whether this Cloud SQL instance should be assigned a public IPV4 address. Either ipv4_enabled must be enabled or a private_network must be configured.`, + Description: `Whether this Cloud SQL instance should be assigned a public IPV4 address. At least ipv4_enabled must be enabled or a private_network must be configured.`, }, "require_ssl": { Type: schema.TypeBool, @@ -316,7 +316,7 @@ settings.backup_configuration.binary_log_enabled are both set to true.`, ValidateFunc: orEmpty(validateRegexp(privateNetworkLinkRegex)), DiffSuppressFunc: compareSelfLinkRelativePaths, AtLeastOneOf: ipConfigurationKeys, - Description: `The VPC network from which the Cloud SQL instance is accessible for private IP. For example, projects/myProject/global/networks/default. Specifying a network enables private IP. Either ipv4_enabled must be enabled or a private_network must be configured. This setting can be updated, but it cannot be removed after it is set.`, + Description: `The VPC network from which the Cloud SQL instance is accessible for private IP. For example, projects/myProject/global/networks/default. Specifying a network enables private IP. At least ipv4_enabled must be enabled or a private_network must be configured. This setting can be updated, but it cannot be removed after it is set.`, }, }, }, diff --git a/mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown b/mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown index 03960faa97b2..fe5fd770f76f 100644 --- a/mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown @@ -317,13 +317,13 @@ The optional `settings.backup_configuration.backup_retention_settings` subblock The optional `settings.ip_configuration` subblock supports: * `ipv4_enabled` - (Optional) Whether this Cloud SQL instance should be assigned -a public IPV4 address. Either `ipv4_enabled` must be enabled or a +a public IPV4 address. At least `ipv4_enabled` must be enabled or a `private_network` must be configured. * `private_network` - (Optional) The VPC network from which the Cloud SQL instance is accessible for private IP. For example, projects/myProject/global/networks/default. Specifying a network enables private IP. -Either `ipv4_enabled` must be enabled or a `private_network` must be configured. +At least `ipv4_enabled` must be enabled or a `private_network` must be configured. This setting can be updated, but it cannot be removed after it is set. * `require_ssl` - (Optional) Whether SSL connections over IP are enforced or not. From 298fdd03aa55142c1330db9e89e728ed6117f6bd Mon Sep 17 00:00:00 2001 From: Cameron Thornton Date: Fri, 2 Apr 2021 14:33:53 -0500 Subject: [PATCH 2/2] replica_configuration doc update --- .../website/docs/r/sql_database_instance.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown b/mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown index fe5fd770f76f..ba14021ddf0c 100644 --- a/mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown @@ -217,7 +217,7 @@ includes an up-to-date reference of supported versions. is not provided, the provider project is used. * `replica_configuration` - (Optional) The configuration for replication. The - configuration is detailed below. + configuration is detailed below. Valid only for MySQL instances. * `root_password` - (Optional) Initial root password. Required for MS SQL Server, ignored by MySQL and PostgreSQL.