Support Cloud SQL Address Range Picker for Clones and Read replicas #5664

shuyama1 · 2022-01-28T23:50:07Z

Fixes hashicorp/terraform-provider-google#11000

Also removed the ForceNew for allocated_ip_range field for primary instance update, as currently allocated IP range can not be updated only within a VPC - the field can be updated in place if we also update the private network. Therefore, recreation functionality should be added to this field in a general case. We could add a CustomizeDiff to only add ForceNew if allocated_ip_range is changed within a VPC, but I am not sure if that's something we want to add, as the API may change to include the update feature anytime, plus the allocated ip range does not support updating after creation using UI and I also wonder if users would appreciate recreation for sql instances in general.

If this PR is for Terraform, I acknowledge that I have:

Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
Generated Terraform, and ran make test and make lint to ensure it passes unit and linter tests.
Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

sql: added field `clone.allocated_ip_range` to support address range picker for clone for resource `google_sql_database_instance`

sql: added support for address range picker for read replicas for resource `google_sql_database_instance`

modular-magician · 2022-01-29T00:04:14Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 222 insertions(+), 3 deletions(-))
Terraform Beta: Diff ( 5 files changed, 222 insertions(+), 3 deletions(-))
TF Validator: Diff ( 7 files changed, 244 insertions(+), 14 deletions(-))

modular-magician · 2022-01-29T02:08:23Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccApigeeEnvironmentIamBindingGenerated|TestAccApigeeEnvironmentIamMemberGenerated|TestAccApigeeEnvironmentIamPolicyGenerated|TestAccCloudbuildWorkerPool_basic|TestAccComputeGlobalForwardingRule_externalCndLbWithBackendBucketExample|TestAccContainerCluster_withAddons|TestAccServiceNetworkingPeeredDNSDomain_basic|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRange_replica|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRange_clone You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=249753

modular-magician · 2022-01-31T17:55:50Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 223 insertions(+), 5 deletions(-))
Terraform Beta: Diff ( 5 files changed, 223 insertions(+), 5 deletions(-))
TF Validator: Diff ( 7 files changed, 245 insertions(+), 16 deletions(-))

modular-magician · 2022-01-31T19:56:39Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccApigeeEnvironmentIamBindingGenerated|TestAccApigeeEnvironmentIamMemberGenerated|TestAccApigeeEnvironmentIamPolicyGenerated|TestAccCloudbuildWorkerPool_basic|TestAccComputeGlobalForwardingRule_externalCndLbWithBackendBucketExample|TestAccContainerCluster_withAddons|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeReplica|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeClone|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRange You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=250521

shuyama1 · 2022-02-01T17:26:52Z

/gcbrun

modular-magician · 2022-02-01T17:40:39Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 223 insertions(+), 5 deletions(-))
Terraform Beta: Diff ( 5 files changed, 223 insertions(+), 5 deletions(-))
TF Validator: Diff ( 7 files changed, 245 insertions(+), 16 deletions(-))

shuyama1 · 2022-02-01T19:29:48Z

Clone: https://ci-oss.hashicorp.engineering/buildConfiguration/GoogleCloudBeta_ProviderGoogleCloudBetaMmUpstream/251010?buildTab=tests&status=passed

Read replica: https://ci-oss.hashicorp.engineering/buildConfiguration/GoogleCloudBeta_ProviderGoogleCloudBetaMmUpstream/250533?buildTab=tests&status=passed

rileykarson · 2022-02-01T19:36:15Z

mmv1/third_party/terraform/resources/resource_sql_database_instance.go.erb

@@ -311,7 +311,6 @@ settings.backup_configuration.binary_log_enabled are both set to true.`,
 									"allocated_ip_range": {
 										Type:         schema.TypeString,
 										Optional:     true,
-										ForceNew:     true,


Is the update case for this field something we can add a test for, or is it too hard to orchestrate?

We can create a test on updating this field with a new private network, as I mentioned in the PR description, but just not within the same VPC. I will add one on this.

c2thorn · 2022-02-01T19:45:07Z

mmv1/third_party/terraform/tests/resource_sql_database_instance_test.go.erb

+func TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeClone(t *testing.T) {
+	t.Parallel()
+
+	databaseName := "tf-test-" + randString(t, 10)


Noting here that we cannot use the bootstrap db instance since this uses a private network. If more than one private network clone/backup test is needed, we should create a new bootstrap instance.

Agree! Looks like this is the only one now. We will probably need to create a bootstrap instance with private networks if more tests need it.

c2thorn · 2022-02-01T19:45:59Z

mmv1/third_party/terraform/tests/resource_sql_database_instance_test.go.erb

+resource "google_sql_database_instance" "instance" {
+  depends_on = [google_service_networking_connection.foobar]
+  name                = "%s"
+  region              = "europe-west4"


I'm assuming this region is one of the limited regions available for this feature?

Yes, correct

rileykarson · 2022-02-01T19:50:19Z

(also note: we should hold merging on confirmation of full rollout)

modular-magician · 2022-02-01T20:26:20Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccApigeeEnvironmentIamBindingGenerated|TestAccApigeeEnvironmentIamMemberGenerated|TestAccApigeeEnvironmentIamPolicyGenerated|TestAccComputeBackendServiceIamBindingGenerated|TestAccComputeBackendServiceIamMemberGenerated|TestAccComputeBackendServiceIamPolicyGenerated|TestAccComputeBackendServiceIamBindingGenerated_withCondition|TestAccComputeBackendServiceIamMemberGenerated_withCondition|TestAccComputeBackendServiceIamPolicyGenerated_withCondition|TestAccCloudbuildWorkerPool_basic|TestAccComputeGlobalForwardingRule_externalCndLbWithBackendBucketExample|TestAccComputeSecurityPolicy_withRateLimitOptions|TestAccContainerCluster_withAddons|TestAccContainerCluster_nodeAutoprovisioning|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeReplica|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRangeClone|TestAccSqlDatabaseInstance_withPrivateNetwork_withAllocatedIpRange You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=251051

modular-magician · 2022-02-01T20:57:04Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 236 insertions(+), 5 deletions(-))
Terraform Beta: Diff ( 5 files changed, 236 insertions(+), 5 deletions(-))
TF Validator: Diff ( 7 files changed, 258 insertions(+), 16 deletions(-))

modular-magician · 2022-02-01T21:13:35Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 236 insertions(+), 5 deletions(-))
Terraform Beta: Diff ( 5 files changed, 236 insertions(+), 5 deletions(-))
TF Validator: Diff ( 7 files changed, 258 insertions(+), 16 deletions(-))

modular-magician · 2022-02-02T01:51:21Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 233 insertions(+), 5 deletions(-))
Terraform Beta: Diff ( 5 files changed, 233 insertions(+), 5 deletions(-))
TF Validator: Diff ( 7 files changed, 256 insertions(+), 16 deletions(-))

modular-magician · 2022-02-02T03:27:46Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 234 insertions(+), 5 deletions(-))
Terraform Beta: Diff ( 5 files changed, 234 insertions(+), 5 deletions(-))
TF Validator: Diff ( 7 files changed, 256 insertions(+), 16 deletions(-))

shuyama1 · 2022-02-02T17:02:13Z

Created separate private networks for each test (primary, read replica and clone). Should be fine to run tests in parallel now. As the networks are created as bootstrap (basically two extra bootstrap Networks are added), it should not hit the quota issue.
Triggered these tests in an independent run, and tests passed https://ci-oss.hashicorp.engineering/buildConfiguration/GoogleCloudBeta_ProviderGoogleCloudBetaMmUpstream/251554?buildTab=tests&status=passed

modular-magician · 2022-02-07T21:44:24Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 214 insertions(+), 5 deletions(-))
Terraform Beta: Diff ( 5 files changed, 214 insertions(+), 5 deletions(-))
TF Validator: Diff ( 2 files changed, 11 insertions(+), 10 deletions(-))

modular-magician · 2022-02-08T20:07:14Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 5 files changed, 214 insertions(+), 5 deletions(-))
Terraform Beta: Diff ( 5 files changed, 214 insertions(+), 5 deletions(-))
TF Validator: Diff ( 2 files changed, 11 insertions(+), 10 deletions(-))

shuyama1 · 2022-02-08T20:59:34Z

https://ci-oss.hashicorp.engineering/buildConfiguration/GoogleCloudBeta_ProviderGoogleCloudBetaMmUpstream/254239?buildTab=tests&status=passed

…oogleCloudPlatform#5664)

shuyama1 requested review from c2thorn and rileykarson February 1, 2022 19:31

rileykarson approved these changes Feb 1, 2022

View reviewed changes

c2thorn reviewed Feb 1, 2022

View reviewed changes

c2thorn approved these changes Feb 1, 2022

View reviewed changes

shuyama1 force-pushed the range_picker_clone_replica branch from 7d7f84e to 65d5376 Compare February 1, 2022 20:43

shuyama1 force-pushed the range_picker_clone_replica branch from 1b1786a to 363aa17 Compare February 2, 2022 01:36

shuyama1 force-pushed the range_picker_clone_replica branch from 2696036 to 366d4cb Compare February 7, 2022 21:30

shuyama1 added 6 commits February 8, 2022 11:40

added address range picker for clone

7499e7a

rename test, clean up and remove forceNew

fa66f4c

added update test

79f4257

fix typo

df65e2d

using separate private networks

35c3f06

rebase and update location

2260e35

shuyama1 force-pushed the range_picker_clone_replica branch from 366d4cb to 2260e35 Compare February 8, 2022 19:53

shuyama1 merged commit 40e8735 into GoogleCloudPlatform:master Feb 8, 2022

shuyama1 deleted the range_picker_clone_replica branch February 8, 2022 21:02

lcaggio pushed a commit to lcaggio/magic-modules that referenced this pull request Mar 16, 2022

Support Cloud SQL Address Range Picker for Clones and Read replicas (G…

af9daec

…oogleCloudPlatform#5664)

lcaggio pushed a commit to lcaggio/magic-modules that referenced this pull request Mar 17, 2022

Support Cloud SQL Address Range Picker for Clones and Read replicas (G…

063d6a2

…oogleCloudPlatform#5664)

lcaggio pushed a commit to lcaggio/magic-modules that referenced this pull request Mar 18, 2022

Support Cloud SQL Address Range Picker for Clones and Read replicas (G…

3366495

…oogleCloudPlatform#5664)

betsy-lichtenberg pushed a commit to betsy-lichtenberg/magic-modules that referenced this pull request Apr 25, 2022

Support Cloud SQL Address Range Picker for Clones and Read replicas (G…

e7bc2c0

…oogleCloudPlatform#5664)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Cloud SQL Address Range Picker for Clones and Read replicas #5664

Support Cloud SQL Address Range Picker for Clones and Read replicas #5664

shuyama1 commented Jan 28, 2022 •

edited

Loading

modular-magician commented Jan 29, 2022

modular-magician commented Jan 29, 2022

modular-magician commented Jan 31, 2022

modular-magician commented Jan 31, 2022

shuyama1 commented Feb 1, 2022

modular-magician commented Feb 1, 2022

shuyama1 commented Feb 1, 2022

rileykarson Feb 1, 2022

shuyama1 Feb 1, 2022

c2thorn Feb 1, 2022

shuyama1 Feb 1, 2022

c2thorn Feb 1, 2022

shuyama1 Feb 1, 2022

rileykarson commented Feb 1, 2022

modular-magician commented Feb 1, 2022

modular-magician commented Feb 1, 2022

modular-magician commented Feb 1, 2022

modular-magician commented Feb 2, 2022

modular-magician commented Feb 2, 2022

shuyama1 commented Feb 2, 2022 •

edited

Loading

modular-magician commented Feb 7, 2022

modular-magician commented Feb 8, 2022

shuyama1 commented Feb 8, 2022

Support Cloud SQL Address Range Picker for Clones and Read replicas #5664

Support Cloud SQL Address Range Picker for Clones and Read replicas #5664

Conversation

shuyama1 commented Jan 28, 2022 • edited Loading

modular-magician commented Jan 29, 2022

Diff report:

modular-magician commented Jan 29, 2022

modular-magician commented Jan 31, 2022

Diff report:

modular-magician commented Jan 31, 2022

shuyama1 commented Feb 1, 2022

modular-magician commented Feb 1, 2022

Diff report:

shuyama1 commented Feb 1, 2022

rileykarson Feb 1, 2022

Choose a reason for hiding this comment

shuyama1 Feb 1, 2022

Choose a reason for hiding this comment

c2thorn Feb 1, 2022

Choose a reason for hiding this comment

shuyama1 Feb 1, 2022

Choose a reason for hiding this comment

c2thorn Feb 1, 2022

Choose a reason for hiding this comment

shuyama1 Feb 1, 2022

Choose a reason for hiding this comment

rileykarson commented Feb 1, 2022

modular-magician commented Feb 1, 2022

modular-magician commented Feb 1, 2022

Diff report:

modular-magician commented Feb 1, 2022

Diff report:

modular-magician commented Feb 2, 2022

Diff report:

modular-magician commented Feb 2, 2022

Diff report:

shuyama1 commented Feb 2, 2022 • edited Loading

modular-magician commented Feb 7, 2022

Diff report:

modular-magician commented Feb 8, 2022

Diff report:

shuyama1 commented Feb 8, 2022

shuyama1 commented Jan 28, 2022 •

edited

Loading

shuyama1 commented Feb 2, 2022 •

edited

Loading