Redis MRR Support #5449

himanikh · 2021-11-12T19:42:04Z

Changes to support Multi read replica feature on Cloud Memorystor redis

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). - Unable to run these tests target testacc unavailable
[ X] Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

redis: Added Multi read replica field `replicaCount `, `nodes`,  `readEndpoint`, `readEndpointPort`, `readReplicasMode` in `google_redis_instance `

modular-magician · 2021-11-12T19:42:19Z

Oops! It looks like you're using an unknown release-note type in your changelog entries:

REPLACEME

Please only use the types listed in /~https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md.

modular-magician · 2021-11-12T19:43:29Z

Hello! I am a robot who works on Magic Modules PRs.

I have detected that you are a community contributor, so your PR will be assigned to someone with a commit-bit on this repo for initial review.

Thanks for your contribution! A human will be with you soon.

@melinath, please review this PR or find an appropriate assignee.

modular-magician · 2021-11-12T19:53:39Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 84 insertions(+), 1 deletion(-))
Terraform Beta: Diff ( 3 files changed, 323 insertions(+), 1 deletion(-))
TF OiCS: Diff ( 4 files changed, 135 insertions(+))

melinath

Please add a release note as described in the opening comment's template

melinath · 2021-11-12T22:38:09Z

mmv1/products/redis/terraform.yaml

    properties:
      alternativeLocationId: !ruby/object:Overrides::Terraform::PropertyOverride
        default_from_api: true
      authorizedNetwork: !ruby/object:Overrides::Terraform::PropertyOverride
        default_from_api: true
        custom_expand: 'templates/terraform/custom_expand/redis_instance_authorized_network.erb'
        diff_suppress_func: 'compareSelfLinkOrResourceName'
-      locationId: !ruby/object:Overrides::Terraform::PropertyOverride


This seems like an extraneous change

modular-magician · 2021-11-13T00:51:24Z

Oops! It looks like you're using an unknown release-note type in your changelog entries:

REPLACEME

Please only use the types listed in /~https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md.

modular-magician · 2021-11-13T01:02:04Z

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

Diff report:

Terraform GA: Diff ( 1 file changed, 84 insertions(+))
Terraform Beta: Diff ( 3 files changed, 323 insertions(+))
TF OiCS: Diff ( 4 files changed, 135 insertions(+))

melinath

In addition to the changes below, please update your release note per the guidelines and sign the CLA as described here: /~https://github.com/GoogleCloudPlatform/magic-modules/pull/5449/checks?check_run_id=4196015153

mmv1/products/redis/api.yaml

melinath · 2021-11-16T21:58:33Z

mmv1/products/redis/api.yaml

+        name: readReplicasMode
+        description: |
+          Optional. Read replica mode.
+          If not set, Memorystore Redis backend will pick the mode based on other fields in the request.


It looks from the docs like the default is always READ_REPLICAS_DISABLED - is that not the case?

https://cloud.google.com/memorystore/docs/redis/reference/rest/v1/projects.locations.instances#readreplicasmode

Updated the description.

mmv1/templates/terraform/examples/redis_instance_mrr.tf.erb

modular-magician · 2021-11-18T03:01:22Z

Oops! It looks like you're using an unknown release-note type in your changelog entries:

REPLACEME

Please only use the types listed in /~https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md.

modular-magician · 2021-11-18T03:12:26Z

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

Diff report:

Terraform GA: Diff ( 1 file changed, 84 insertions(+))
Terraform Beta: Diff ( 3 files changed, 323 insertions(+))
TF OiCS: Diff ( 4 files changed, 135 insertions(+))

melinath · 2021-11-18T17:15:11Z

/gcbrun

modular-magician · 2021-11-18T17:26:27Z

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

Diff report:

Terraform GA: Diff ( 1 file changed, 84 insertions(+))
Terraform Beta: Diff ( 3 files changed, 323 insertions(+))
TF OiCS: Diff ( 4 files changed, 135 insertions(+))

modular-magician · 2021-11-18T19:21:02Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccRedisInstanceDatasource_basic|TestAccCloudFunctionsFunction_vpcConnector|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccContainerNodePool_withInvalidUpgradeSettings|TestAccEventarcTrigger_BasicHandWritten|TestAccServiceNetworkingPeeredDNSDomain_basic|TestAccNetworkServicesEdgeCacheService_networkServicesEdgeCacheServiceAdvancedExample|TestAccRedisInstance_redisInstanceMrrExample|TestAccRedisInstance_redisInstanceBasicExample|TestAccRedisInstance_update|TestAccRedisInstance_redisInstanceFullExample|TestAccRedisInstance_redisInstanceAuthEnabled|TestAccRedisInstance_regionFromLocation|TestAccRedisInstance_downgradeRedisVersion|TestAccServiceDirectoryEndpoint_serviceDirectoryEndpointWithNetworkExample|TestAccSqlUser_postgresIAM You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=220806

modular-magician · 2021-11-18T19:53:28Z

Tests failed during RECORDING mode: TestAccRedisInstance_redisInstanceMrrExample|TestAccEventarcTrigger_BasicHandWritten|TestAccCloudFunctionsFunction_vpcConnector|TestAccRedisInstance_redisInstanceFullExample|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccContainerNodePool_withInvalidUpgradeSettings|TestAccSqlUser_postgresIAM Please fix these to complete your PR

melinath · 2021-11-19T18:29:17Z

TestAccRedisInstance_redisInstanceMrrExample is failing with the errors:

Error: Error creating Instance: googleapi: Error 400: Invalid IP range: 192.168.0.0/29. Require a minimum of /28 block size when read replica is enabled.
com.google.apps.framework.request.StatusException: <eye3 title='INVALID_ARGUMENT'/> generic::INVALID_ARGUMENT: Invalid IP range: 192.168.0.0/29. Require a minimum of /28 block size when read replica is enabled.
Details:
[
{
"@type": "type.googleapis.com/google.rpc.BadRequest",
"fieldViolations": [
{
"description": "Invalid value: 192.168.0.0/29",
"field": "instance.reserved_ip_range"
}
]
}
]
on terraform_plugin_test.tf line 2, in resource "google_redis_instance" "cache":
2: resource "google_redis_instance" "cache" {

Probably the test needs to be updated to have a valid value.

Additionally, TestAccRedisInstance_redisInstanceFullExample is failing with the error:

An execution plan has been generated and is shown below.
Resource actions are indicated with the following symbols:
~ update in-place
Terraform will perform the following actions:
# google_redis_instance.cache will be updated in-place
~ resource "google_redis_instance" "cache" {
id                       = "projects/project-id/locations/us-central1/instances/tf-test-ha-memory-cache7zfrzip0gk"
name                     = "tf-test-ha-memory-cache7zfrzip0gk"
- replica_count            = 1 -> null
# (23 unchanged attributes hidden)
}
Plan: 0 to add, 1 to change, 0 to destroy.

This probably means that the API server sets a default value of 1 if the replica_count isn't set in the request. If that field is likely to always default to 1, then you could resolve this by adding default_value: 1 to replica_count in api.yaml - otherwise, you could add default_from_api: true as an override in terraform.yaml (search the codebase for examples)

UPDATE: since the default depends on whether the user has a basic account or not, this will need to use default_from_api.

melinath

see above comment - forgot to leave it as a change request

modular-magician · 2021-11-19T18:57:47Z

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

Diff report:

Terraform GA: Diff ( 1 file changed, 84 insertions(+))
Terraform Beta: Diff ( 3 files changed, 323 insertions(+))
TF OiCS: Diff ( 4 files changed, 135 insertions(+))

mmv1/products/redis/api.yaml

modular-magician · 2021-11-19T20:00:16Z

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

Diff report:

Terraform GA: Diff ( 2 files changed, 88 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 3 files changed, 321 insertions(+), 2 deletions(-))
TF OiCS: Diff ( 4 files changed, 135 insertions(+))

modular-magician · 2021-11-19T21:50:22Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccCloudFunctionsFunction_vpcConnector|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccContainerNodePool_withWorkloadIdentityConfig|TestAccContainerNodePool_withInvalidUpgradeSettings|TestAccEventarcTrigger_BasicHandWritten|TestAccRedisInstance_redisInstanceMrrExample|TestAccRedisInstance_redisInstanceFullExample|TestAccRedisInstance_update|TestAccRedisInstance_redisInstanceAuthEnabled|TestAccSqlUser_postgresIAM You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=221572

modular-magician · 2021-11-19T22:16:49Z

Tests failed during RECORDING mode: TestAccEventarcTrigger_BasicHandWritten|TestAccCloudFunctionsFunction_vpcConnector|TestAccComputeRegionNetworkEndpointGroup_regionNetworkEndpointGroupAppengineExample|TestAccContainerNodePool_withInvalidUpgradeSettings|TestAccSqlUser_postgresIAM Please fix these to complete your PR

melinath

lgtm - remaining failures are unrelated

* Redis MRR Support * [Bug fix]Add locationId back to instance properties * Update api.yaml * Update redis_instance_mrr.tf.erb * Update api.yaml * Update terraform.yaml * Update api.yaml Co-authored-by: Himani Khanduja <khimani@google.com>

Redis MRR Support

7f18e82

google-cla bot added the cla: no label Nov 12, 2021

modular-magician requested a review from melinath November 12, 2021 19:43

melinath requested changes Nov 12, 2021

View reviewed changes

[Bug fix]Add locationId back to instance properties

8042420

melinath self-requested a review November 16, 2021 21:26

melinath requested changes Nov 16, 2021

View reviewed changes

google-cla bot added cla: yes and removed cla: no labels Nov 18, 2021

Update api.yaml

0df703f

melinath self-requested a review November 18, 2021 17:15

melinath requested changes Nov 19, 2021

View reviewed changes

Update redis_instance_mrr.tf.erb

4534b20

Update api.yaml

70cfab2

melinath reviewed Nov 19, 2021

View reviewed changes

mmv1/products/redis/api.yaml Show resolved Hide resolved

himanikh added 2 commits November 19, 2021 11:45

Update terraform.yaml

5566f43

Update api.yaml

96c4d01

melinath self-requested a review November 19, 2021 21:01

melinath approved these changes Nov 19, 2021

View reviewed changes

melinath merged commit 2df428d into GoogleCloudPlatform:master Nov 19, 2021

This was referenced Nov 19, 2021

Redis MRR Support hashicorp/terraform-provider-google-beta#3870

Merged

Redis MRR Support hashicorp/terraform-provider-google#10607

Merged

roaks3 mentioned this pull request Sep 20, 2022

google_redis_instance add support for Read replicas (beta) hashicorp/terraform-provider-google#10549

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Redis MRR Support #5449

Redis MRR Support #5449

himanikh commented Nov 12, 2021 •

edited

Loading

modular-magician commented Nov 12, 2021

modular-magician commented Nov 12, 2021

modular-magician commented Nov 12, 2021

melinath left a comment

melinath Nov 12, 2021

himanikh Nov 13, 2021

modular-magician commented Nov 13, 2021

modular-magician commented Nov 13, 2021

melinath left a comment

melinath Nov 16, 2021

himanikh Nov 18, 2021

modular-magician commented Nov 18, 2021

modular-magician commented Nov 18, 2021

melinath commented Nov 18, 2021

modular-magician commented Nov 18, 2021

modular-magician commented Nov 18, 2021

modular-magician commented Nov 18, 2021

melinath commented Nov 19, 2021 •

edited

Loading

melinath left a comment

modular-magician commented Nov 19, 2021

modular-magician commented Nov 19, 2021

modular-magician commented Nov 19, 2021

modular-magician commented Nov 19, 2021

melinath left a comment •

edited

Loading

Redis MRR Support #5449

Redis MRR Support #5449

Conversation

himanikh commented Nov 12, 2021 • edited Loading

modular-magician commented Nov 12, 2021

modular-magician commented Nov 12, 2021

modular-magician commented Nov 12, 2021

Diff report:

melinath left a comment

Choose a reason for hiding this comment

melinath Nov 12, 2021

Choose a reason for hiding this comment

himanikh Nov 13, 2021

Choose a reason for hiding this comment

modular-magician commented Nov 13, 2021

modular-magician commented Nov 13, 2021

Diff report:

melinath left a comment

Choose a reason for hiding this comment

melinath Nov 16, 2021

Choose a reason for hiding this comment

himanikh Nov 18, 2021

Choose a reason for hiding this comment

modular-magician commented Nov 18, 2021

modular-magician commented Nov 18, 2021

Diff report:

melinath commented Nov 18, 2021

modular-magician commented Nov 18, 2021

Diff report:

modular-magician commented Nov 18, 2021

modular-magician commented Nov 18, 2021

melinath commented Nov 19, 2021 • edited Loading

melinath left a comment

Choose a reason for hiding this comment

modular-magician commented Nov 19, 2021

Diff report:

modular-magician commented Nov 19, 2021

Diff report:

modular-magician commented Nov 19, 2021

modular-magician commented Nov 19, 2021

melinath left a comment • edited Loading

Choose a reason for hiding this comment

himanikh commented Nov 12, 2021 •

edited

Loading

melinath commented Nov 19, 2021 •

edited

Loading

melinath left a comment •

edited

Loading