Move filestore enterprise features out of beta and add support for cu… #5875

garcia42 · 2022-03-31T00:21:53Z

Move Filestore enterprise features out of beta and add support for cmek for filestore instances

fixes hashicorp/terraform-provider-google#11173

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

[X ] 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.
[X ] 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).
[X ] Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
[X ] Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

filestore: promoted enterprise features to GA
filestore: added `kms_key_name` field to `google_filestore_instance` resource to support CMEK

…stomer managed encryption keys

modular-magician · 2022-03-31T00:37:19Z

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.

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

modular-magician · 2022-03-31T00:50:26Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 359 insertions(+), 7 deletions(-))
Terraform Beta: Diff ( 3 files changed, 72 insertions(+), 7 deletions(-))
TF Validator: Diff ( 3 files changed, 101 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 1 file changed, 1 deletion(-))

shuyama1 · 2022-04-04T21:54:24Z

/gcbrun

modular-magician · 2022-04-04T22:09:33Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 359 insertions(+), 7 deletions(-))
Terraform Beta: Diff ( 3 files changed, 72 insertions(+), 7 deletions(-))
TF Validator: Diff ( 3 files changed, 101 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 1 file changed, 1 deletion(-))

modular-magician · 2022-04-04T22:39:34Z

Tests rerun

modular-magician · 2022-04-04T23:18:06Z

Tests count:
Total tests: 1962
Passed tests 1722
Skipped tests: 234
Failed tests: 6

modular-magician · 2022-04-04T23:18:07Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccServiceNetworkingPeeredDNSDomain_basic|TestAccFirebaserulesRelease_BasicRelease|TestAccContainerCluster_withAuthenticatorGroupsConfig|TestAccComputeServiceAttachment_serviceAttachmentBasicExample|TestAccComputeForwardingRule_update|TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic

modular-magician · 2022-04-04T23:39:20Z

Tests passed during RECORDING mode:
TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic
TestAccServiceNetworkingPeeredDNSDomain_basic
TestAccFirebaserulesRelease_BasicRelease
TestAccComputeServiceAttachment_serviceAttachmentBasicExample
TestAccComputeForwardingRule_update

Tests failed during RECORDING mode:
TestAccContainerCluster_withAuthenticatorGroupsConfig
TestAccComputeServiceAttachment_serviceAttachmentBasicExampleUpdate

Please fix these to complete your PR
You can view the build log here: https://storage.cloud.google.com/vcr-test-logs/beta/refs/heads/auto-pr-5875/artifacts/6897140a-5b81-477b-a3a8-bbfdb54b36bd/build-log/recording_test.log and the debug log for each test here: https://console.cloud.google.com/storage/browser/vcr-test-logs/beta/refs/heads/auto-pr-5875/artifacts/6897140a-5b81-477b-a3a8-bbfdb54b36bd/recording

shuyama1 · 2022-04-04T21:45:33Z

mmv1/products/filestore/terraform.yaml

+      - !ruby/object:Provider::Terraform::Examples
+        name: "filestore_instance_enterprise"
+        primary_resource_id: "instance"
+        skip_test: true


Question: Any particular reason we want to skip the test here?

Followed up offline, this was following an example pubsub_topic_cmek.tf.erb and because the test creates cmek keys that aren't managed by terraform and break the test on subsequent runs

Built and tested it locally, but looks like I am having quota issues Quota limit 'EnterpriseStorageGibPerRegion' has been exceeded. Limit: 0 in region us-central1. Already request the quota increase.

Tested it locally and tests passed!

shuyama1 · 2022-04-08T20:39:34Z

Triggered test against GA provider: https://ci-oss.hashicorp.engineering/buildConfiguration/GoogleCloud_ProviderGoogleCloudMmUpstream/278018?buildTab=tests&status=passed

Rereunning VCR tests /gcbrun

modular-magician · 2022-04-08T20:54:20Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 359 insertions(+), 7 deletions(-))
Terraform Beta: Diff ( 3 files changed, 72 insertions(+), 7 deletions(-))
TF Validator: Diff ( 3 files changed, 101 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 1 file changed, 1 deletion(-))

modular-magician · 2022-04-08T21:31:10Z

Tests analytics

Total tests: 1971
Passed tests 1728
Skipped tests: 238
Failed tests: 5

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccAccessContextManager|TestAccOSConfigPatchDeployment_osConfigPatchDeploymentFullExample|TestAccContainerCluster_withAuthenticatorGroupsConfig|TestAccBigtableAppProfile_bigtableAppProfileMulticlusterExample|TestAccBigtableAppProfile_bigtableAppProfileSingleclusterExample

modular-magician · 2022-04-08T21:40:15Z

Tests passed during RECORDING mode:
TestAccBigtableAppProfile_bigtableAppProfileSingleclusterExample[view]
TestAccOSConfigPatchDeployment_osConfigPatchDeploymentFullExample[view]
TestAccContainerCluster_withAuthenticatorGroupsConfig[view]
TestAccBigtableAppProfile_bigtableAppProfileMulticlusterExample[view]

Tests failed during RECORDING mode:
TestAccAccessContextManager[view]

Please fix these to complete your PR
View the build log or the debug log for each test

modular-magician · 2022-04-08T22:47:59Z

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic|TestAccRedisInstanceDatasource_basic|TestAccComposerEnvironment_update|TestAccComposerEnvironment_ComposerV2|TestAccComposerEnvironment_UpdateComposerV2|TestAccComposerEnvironment_composerV2PrivateServiceConnect|TestAccComposerEnvironment_composerV1MasterAuthNetworks|TestAccComposerEnvironment_composerV2MasterAuthNetworks|TestAccComposerEnvironment_composerV2MasterAuthNetworksUpdate|TestAccComposerEnvironment_composerV1MasterAuthNetworksUpdate|TestAccComposerEnvironmentAirflow2_withSoftwareConfig|TestAccComposerEnvironment_withSoftwareConfig|TestAccContainerCluster_withAuthenticatorGroupsConfig|TestAccServiceNetworkingPeeredDNSDomain_basic|TestAccRedisInstance_redisInstanceBasicExample|TestAccRedisInstance_update|TestAccRedisInstance_redisInstanceFullExample|TestAccRedisInstance_regionFromLocation|TestAccRedisInstance_redisInstanceAuthEnabled|TestAccRedisInstance_downgradeRedisVersion You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=278035

shuyama1

Sorry for taking so long to test and review this PR!

shuyama1 · 2022-04-12T20:35:30Z

mmv1/products/filestore/api.yaml

@@ -250,3 +248,7 @@ objects:
          Server-specified ETag for the instance resource to prevent
          simultaneous updates from overwriting each other.
        output: true
+      - !ruby/object:Api::Type::String
+        name: 'kmsKeyName'


We probably need to add input: true here, as this field can not be updated. Adding input: true will generate ForceNew: true in provider, which means if user want update this field, terraform will delete and recreate the resource.

shuyama1 · 2022-04-12T20:35:30Z

mmv1/products/filestore/api.yaml

@@ -250,3 +248,7 @@ objects:
          Server-specified ETag for the instance resource to prevent
          simultaneous updates from overwriting each other.
        output: true
+      - !ruby/object:Api::Type::String
+        name: 'kmsKeyName'


We probably need to add input: true here, as this field can not be updated. Adding input: true will generate ForceNew: true in provider, which means if user want update this field, terraform will delete and recreate the resource.

modular-magician · 2022-04-12T23:39:44Z

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

Diff report:

Terraform GA: Diff ( 3 files changed, 350 insertions(+), 7 deletions(-))
Terraform Beta: Diff ( 3 files changed, 63 insertions(+), 7 deletions(-))
TF Validator: Diff ( 3 files changed, 101 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 1 file changed, 1 deletion(-))

modular-magician · 2022-04-13T00:27:18Z

Tests analytics

Total tests: 1982
Passed tests 1739
Skipped tests: 240
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccFirebaserulesRelease_BasicRelease|TestAccServiceNetworkingPeeredDNSDomain_basic|TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic

modular-magician · 2022-04-13T00:40:00Z

Tests passed during RECORDING mode:
TestAccDatasourceGoogleServiceNetworkingPeeredDnsDomain_basic[view]
TestAccServiceNetworkingPeeredDNSDomain_basic[view]
TestAccFirebaserulesRelease_BasicRelease[view]

All tests passed
View the build log or the debug log for each test

shuyama1

LGTM! Thanks for your contribution!

GoogleCloudPlatform#5875)

Move filestore enterprise features out of beta and add support for cu…

8c38155

…stomer managed encryption keys

modular-magician requested a review from shuyama1 March 31, 2022 00:37

shuyama1 reviewed Apr 5, 2022

View reviewed changes

shuyama1 self-requested a review April 5, 2022 17:43

shuyama1 requested changes Apr 12, 2022

View reviewed changes

Add input:true to the kms key

e16a31b

shuyama1 self-requested a review April 13, 2022 16:49

shuyama1 approved these changes Apr 13, 2022

View reviewed changes

shuyama1 merged commit c54bb25 into GoogleCloudPlatform:main Apr 13, 2022

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

Move filestore enterprise features out of beta and add support for cu… (

a3a23a6

GoogleCloudPlatform#5875)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move filestore enterprise features out of beta and add support for cu… #5875

Move filestore enterprise features out of beta and add support for cu… #5875

garcia42 commented Mar 31, 2022 •

edited by shuyama1

Loading

modular-magician commented Mar 31, 2022

modular-magician commented Mar 31, 2022

shuyama1 commented Apr 4, 2022

modular-magician commented Apr 4, 2022

modular-magician commented Apr 4, 2022

modular-magician commented Apr 4, 2022

modular-magician commented Apr 4, 2022

modular-magician commented Apr 4, 2022

shuyama1 Apr 4, 2022

garcia42 Apr 6, 2022

shuyama1 Apr 8, 2022

shuyama1 Apr 12, 2022

shuyama1 commented Apr 8, 2022

modular-magician commented Apr 8, 2022

modular-magician commented Apr 8, 2022

modular-magician commented Apr 8, 2022

modular-magician commented Apr 8, 2022

shuyama1 left a comment

shuyama1 Apr 12, 2022

shuyama1 Apr 12, 2022

modular-magician commented Apr 12, 2022

modular-magician commented Apr 13, 2022

modular-magician commented Apr 13, 2022

shuyama1 left a comment

Move filestore enterprise features out of beta and add support for cu… #5875

Move filestore enterprise features out of beta and add support for cu… #5875

Conversation

garcia42 commented Mar 31, 2022 • edited by shuyama1 Loading

modular-magician commented Mar 31, 2022

modular-magician commented Mar 31, 2022

Diff report:

shuyama1 commented Apr 4, 2022

modular-magician commented Apr 4, 2022

Diff report:

modular-magician commented Apr 4, 2022

modular-magician commented Apr 4, 2022

modular-magician commented Apr 4, 2022

modular-magician commented Apr 4, 2022

shuyama1 Apr 4, 2022

Choose a reason for hiding this comment

garcia42 Apr 6, 2022

Choose a reason for hiding this comment

shuyama1 Apr 8, 2022

Choose a reason for hiding this comment

shuyama1 Apr 12, 2022

Choose a reason for hiding this comment

shuyama1 commented Apr 8, 2022

modular-magician commented Apr 8, 2022

Diff report:

modular-magician commented Apr 8, 2022

Tests analytics

Action taken

modular-magician commented Apr 8, 2022

modular-magician commented Apr 8, 2022

shuyama1 left a comment

Choose a reason for hiding this comment

shuyama1 Apr 12, 2022

Choose a reason for hiding this comment

shuyama1 Apr 12, 2022

Choose a reason for hiding this comment

modular-magician commented Apr 12, 2022

Diff report:

modular-magician commented Apr 13, 2022

Tests analytics

Action taken

modular-magician commented Apr 13, 2022

shuyama1 left a comment

Choose a reason for hiding this comment

garcia42 commented Mar 31, 2022 •

edited by shuyama1

Loading