Support ability to create "non-custom" services #6604

etruong42 · 2022-09-27T15:38:46Z

Allow users to create various Service Monitoring services: App Engine, Cloud Run, etc.

hashicorp/terraform-provider-google#11935

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)

google_monitoring_generic_service

Allow users to create various Service Monitoring services: App Engine, Cloud Run, etc. hashicorp/terraform-provider-google#11935

modular-magician · 2022-09-27T15:39:46Z

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

I've detected that you're a community contributor. @slevenick, a repository maintainer, has been assigned to assist you and help review your changes.

❓ First time contributing? Click here for more details

Your assigned reviewer will help review your code by:

Ensuring it's backwards compatible, covers common error cases, etc.
Summarizing the change into a user-facing changelog note.
Passes tests, either our "VCR" suite, a set of presubmit tests, or with manual test runs.

You can help make sure that review is quick by running local tests and ensuring they're passing in between each push you make to your PR's branch. Also, try to leave a comment with each push you make, as pushes generally don't generate emails.

If your reviewer doesn't get back to you within a week after your most recent change, please feel free to leave a comment on the issue asking them to take a look! In the absence of a dedicated review dashboard most maintainers manage their pending reviews through email, and those will sometimes get lost in their inbox.

etruong42 · 2022-09-27T15:44:01Z

FYI, the underlying API changes that are prerequisites to these client changes are supported in staging (https://staging-monitoring.sandbox.googleapis.com/)

Full rollout to the production API should complete this week.

modular-magician · 2022-09-27T15:51:09Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 907 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 5 files changed, 907 insertions(+), 2 deletions(-))
TF Validator: Diff ( 3 files changed, 156 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 117 insertions(+))

modular-magician · 2022-09-27T17:01:33Z

Tests analytics

Total tests: 2182
Passed tests 1919
Skipped tests: 238
Failed tests: 25

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccMonitoringGenericService_monitoringServiceExampleExample|TestAccFirebaserulesRelease_BasicRelease|TestAccStorageTransferJob_transferOptions|TestAccComputeServiceAttachment_serviceAttachmentBasicExample|TestAccComputeInstance_soleTenantNodeAffinities|TestAccComputeGlobalForwardingRule_internalLoadBalancing|TestAccComputeGlobalForwardingRule_labels|TestAccComputeForwardingRule_update|TestAccComputeGlobalForwardingRule_ipv6|TestAccComputeGlobalForwardingRule_updateTarget|TestAccComputeGlobalForwardingRule_privateServiceConnectGoogleApisExample|TestAccComputeRoute_routeIlbVipExample|TestAccComputeRoute_routeIlbExample|TestAccComputeGlobalForwardingRule_globalForwardingRuleHybridExample|TestAccComputeGlobalForwardingRule_globalForwardingRuleInternalExample|TestAccComputeForwardingRule_internalHttpLbWithMigBackendExample|TestAccComputePacketMirroring_computePacketMirroringFullExample|TestAccCGCSnippet_eventarcWorkflowsExample|TestAccComputeForwardingRule_serviceDirectoryRegistrations|TestAccPrivatecaCaPoolIamPolicyGenerated_withCondition|TestAccComputeBackendServiceIamPolicyGenerated_withCondition|TestAccComputeVpnTunnel_regionFromGateway|TestAccComputeMachineImageIamPolicyGenerated_withCondition|TestAccComputeInstanceIamPolicyGenerated_withCondition|TestAccComputeRegionBackendServiceIamPolicyGenerated_withCondition

modular-magician · 2022-09-27T17:10:58Z

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[Debug log]
TestAccStorageTransferJob_transferOptions[Debug log]
TestAccComputeServiceAttachment_serviceAttachmentBasicExample[Debug log]
TestAccComputeGlobalForwardingRule_labels[Debug log]
TestAccComputeForwardingRule_update[Debug log]
TestAccComputeGlobalForwardingRule_ipv6[Debug log]
TestAccComputeGlobalForwardingRule_updateTarget[Debug log]
TestAccComputeGlobalForwardingRule_privateServiceConnectGoogleApisExample[Debug log]
TestAccComputeRoute_routeIlbVipExample[Debug log]
TestAccComputeRoute_routeIlbExample[Debug log]
TestAccComputeGlobalForwardingRule_globalForwardingRuleHybridExample[Debug log]
TestAccComputeGlobalForwardingRule_globalForwardingRuleInternalExample[Debug log]
TestAccComputeForwardingRule_internalHttpLbWithMigBackendExample[Debug log]
TestAccComputePacketMirroring_computePacketMirroringFullExample[Debug log]
TestAccComputeForwardingRule_serviceDirectoryRegistrations[Debug log]
TestAccPrivatecaCaPoolIamPolicyGenerated_withCondition[Debug log]
TestAccComputeBackendServiceIamPolicyGenerated_withCondition[Debug log]
TestAccComputeVpnTunnel_regionFromGateway[Debug log]
TestAccComputeMachineImageIamPolicyGenerated_withCondition[Debug log]
TestAccComputeInstanceIamPolicyGenerated_withCondition[Debug log]
TestAccComputeRegionBackendServiceIamPolicyGenerated_withCondition[Debug log]

Tests failed during RECORDING mode:
TestAccMonitoringGenericService_monitoringServiceExampleExample[Error message] [Debug log]
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]
TestAccCGCSnippet_eventarcWorkflowsExample[Error message] [Debug log]

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

slevenick · 2022-09-27T19:01:06Z

Ok, we'll need to wait for the rollout to complete to review further. Can you ping me when this is ready?

etruong42 · 2022-09-27T21:38:44Z

Sounds good. I wanted to put this up for review in case there was anything reasonable to address immediately. I will ping you when it is fully rolled out.

…

On Tue, Sep 27, 2022 at 3:01 PM Sam Levenick ***@***.***> wrote: Ok, we'll need to wait for the rollout to complete to review further. Can you ping me when this is ready? — Reply to this email directly, view it on GitHub <#6604 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AADEJUTQPCRWL5MRKYVWKE3WAM773ANCNFSM6AAAAAAQW5HBNE> . You are receiving this because you authored the thread.Message ID: ***@***.***>

modular-magician · 2022-09-29T18:07:48Z

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

Diff report:

Terraform GA: Diff ( 5 files changed, 900 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 5 files changed, 900 insertions(+), 2 deletions(-))
TF Validator: Diff ( 3 files changed, 156 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 117 insertions(+))

modular-magician · 2022-09-29T19:15:43Z

Tests analytics

Total tests: 2193
Passed tests 1939
Skipped tests: 240
Failed tests: 14

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccMonitoringGenericService_monitoringServiceExampleExample|TestAccComputeVpnTunnel_vpnTunnelBetaExample|TestAccComputeRouterInterface_basic|TestAccComputeForwardingRule_networkTier|TestAccComputeInstance_soleTenantNodeAffinities|TestAccComputeForwardingRule_update|TestAccComputeGlobalForwardingRule_externalTcpProxyLbMigBackendExample|TestAccComputeForwardingRule_forwardingRuleRegionalHttpXlbExample|TestAccComputeForwardingRule_forwardingRuleExternallbExample|TestAccComputeForwardingRule_internalTcpUdpLbWithMigBackendExample|TestAccClouddeployDeliveryPipeline_DeliveryPipeline|TestAccSqlDatabaseInstance_mysqlMajorVersionUpgrade|TestAccComputeFirewallPolicy_update|TestAccComputeFirewallPolicyRule_update

modular-magician · 2022-09-29T19:48:37Z

Tests passed during RECORDING mode:
TestAccMonitoringGenericService_monitoringServiceExampleExample[Debug log]
TestAccComputeVpnTunnel_vpnTunnelBetaExample[Debug log]
TestAccComputeRouterInterface_basic[Debug log]
TestAccComputeForwardingRule_networkTier[Debug log]
TestAccComputeForwardingRule_update[Debug log]
TestAccComputeGlobalForwardingRule_externalTcpProxyLbMigBackendExample[Debug log]
TestAccComputeForwardingRule_forwardingRuleRegionalHttpXlbExample[Debug log]
TestAccComputeForwardingRule_forwardingRuleExternallbExample[Debug log]
TestAccComputeForwardingRule_internalTcpUdpLbWithMigBackendExample[Debug log]
TestAccClouddeployDeliveryPipeline_DeliveryPipeline[Debug log]
TestAccSqlDatabaseInstance_mysqlMajorVersionUpgrade[Debug log]
TestAccComputeFirewallPolicy_update[Debug log]
TestAccComputeFirewallPolicyRule_update[Debug log]

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]

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

mmv1/products/monitoring/api.yaml

mmv1/products/monitoring/terraform.yaml

mmv1/templates/terraform/encoders/monitoring_service_generic.go.erb

modular-magician · 2022-09-30T20:01:52Z

Hi there, I'm the Modular magician - !

modular-magician · 2022-09-30T20:38:39Z

Tests analytics

Total tests: 2197
Passed tests 1952
Skipped tests: 240
Failed tests: 5

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccMonitoringGenericService_monitoringServiceExampleExample|TestAccFirebaserulesRelease_BasicRelease|TestAccSqlDatabaseInstance_mysqlMajorVersionUpgrade|TestAccComputeInstance_soleTenantNodeAffinities|TestAccCGCSnippet_eventarcWorkflowsExample

modular-magician · 2022-09-30T21:11:26Z

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[Debug log]
TestAccSqlDatabaseInstance_mysqlMajorVersionUpgrade[Debug log]

Tests failed during RECORDING mode:
TestAccMonitoringGenericService_monitoringServiceExampleExample[Error message] [Debug log]
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]
TestAccCGCSnippet_eventarcWorkflowsExample[Error message] [Debug log]

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

modular-magician · 2022-10-03T19:49:37Z

Hi there, I'm the Modular magician - !

Diff report

Terraform GA: Diff ( 6 files changed, 947 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 947 insertions(+), 2 deletions(-))
TF Validator: Diff ( 3 files changed, 156 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 117 insertions(+))

modular-magician · 2022-10-03T19:52:40Z

Tests analytics

Total tests: 0
Passed tests 0
Skipped tests: 0
Failed tests: 0

Errors occurred during REPLAYING mode. Please fix them to complete your PR
View the build log

modular-magician · 2022-10-03T20:43:07Z

Hi there, I'm the Modular magician - !

Diff report

Terraform GA: Diff ( 6 files changed, 906 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 906 insertions(+), 2 deletions(-))
TF Validator: Diff ( 3 files changed, 130 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 117 insertions(+))

modular-magician · 2022-10-03T20:45:42Z

Tests analytics

Total tests: 0
Passed tests 0
Skipped tests: 0
Failed tests: 0

Errors occurred during REPLAYING mode. Please fix them to complete your PR
View the build log

modular-magician · 2022-10-03T20:59:32Z

Hi there, I'm the Modular magician - !

Diff report

Terraform GA: Diff ( 6 files changed, 906 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 906 insertions(+), 2 deletions(-))
TF Validator: Diff ( 3 files changed, 130 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 117 insertions(+))

modular-magician · 2022-10-03T21:41:07Z

Tests analytics

Total tests: 2198
Passed tests 1955
Skipped tests: 240
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccMonitoringGenericService_monitoringServiceExampleExample|TestAccComputeInstance_soleTenantNodeAffinities|TestAccCGCSnippet_eventarcWorkflowsExample

modular-magician · 2022-10-03T21:42:06Z

Tests failed during RECORDING mode:
TestAccMonitoringGenericService_monitoringServiceExampleExample[Error message] [Debug log]
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]
TestAccCGCSnippet_eventarcWorkflowsExample[Error message] [Debug log]

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

mmv1/products/monitoring/terraform.yaml

modular-magician · 2022-10-06T02:41:53Z

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

Diff report:

Terraform GA: Diff ( 6 files changed, 916 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 916 insertions(+), 2 deletions(-))
TF Validator: Diff ( 3 files changed, 130 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 117 insertions(+))

modular-magician · 2022-10-06T03:20:14Z

Tests analytics

Total tests: 2207
Passed tests 1962
Skipped tests: 240
Failed tests: 5

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccMonitoringGenericService_monitoringServiceExampleExample|TestAccBillingSubaccount_basic|TestAccBillingSubaccount_renameOnDestroy|TestAccComputeInstance_soleTenantNodeAffinities|TestAccCGCSnippet_eventarcWorkflowsExample

modular-magician · 2022-10-06T03:22:05Z

Tests passed during RECORDING mode:
TestAccMonitoringGenericService_monitoringServiceExampleExample[Debug log]
TestAccBillingSubaccount_basic[Debug log]
TestAccBillingSubaccount_renameOnDestroy[Debug log]

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]
TestAccCGCSnippet_eventarcWorkflowsExample[Error message] [Debug log]

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

mmv1/third_party/terraform/tests/resource_monitoring_slo_test.go

modular-magician · 2022-10-10T16:36:31Z

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

Diff report:

Terraform GA: Diff ( 6 files changed, 916 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 916 insertions(+), 2 deletions(-))
TF Validator: Diff ( 3 files changed, 130 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 117 insertions(+))

modular-magician · 2022-10-10T17:24:41Z

Tests analytics

Total tests: 2209
Passed tests 1965
Skipped tests: 240
Failed tests: 4

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccComputeInstance_soleTenantNodeAffinities|TestAccComputeForwardingRule_internalTcpUdpLbWithMigBackendExample|TestAccCGCSnippet_eventarcWorkflowsExample|TestAccMonitoringSlo_genericService

modular-magician · 2022-10-10T17:32:15Z

Tests passed during RECORDING mode:
TestAccComputeForwardingRule_internalTcpUdpLbWithMigBackendExample[Debug log]

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]
TestAccCGCSnippet_eventarcWorkflowsExample[Error message] [Debug log]
TestAccMonitoringSlo_genericService[Error message] [Debug log]

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

modular-magician · 2022-10-10T18:39:41Z

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

Diff report:

Terraform GA: Diff ( 6 files changed, 918 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 6 files changed, 918 insertions(+), 2 deletions(-))
TF Validator: Diff ( 3 files changed, 130 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 117 insertions(+))

modular-magician · 2022-10-10T19:20:19Z

Tests analytics

Total tests: 2209
Passed tests 1966
Skipped tests: 240
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccMonitoringSlo_genericService|TestAccComputeInstance_soleTenantNodeAffinities|TestAccCGCSnippet_eventarcWorkflowsExample

modular-magician · 2022-10-10T19:25:29Z

Tests passed during RECORDING mode:
TestAccMonitoringSlo_genericService[Debug log]

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]
TestAccCGCSnippet_eventarcWorkflowsExample[Error message] [Debug log]

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

modular-magician · 2022-10-10T23:06:22Z

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

Diff report:

Terraform GA: Diff ( 7 files changed, 970 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 7 files changed, 970 insertions(+), 2 deletions(-))
TF Validator: Diff ( 3 files changed, 130 insertions(+), 3 deletions(-))
TF OiCS: Diff ( 4 files changed, 117 insertions(+))

modular-magician · 2022-10-10T23:53:10Z

Tests analytics

Total tests: 2216
Passed tests 1973
Skipped tests: 240
Failed tests: 3

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests

TestAccComputeInstance_soleTenantNodeAffinities|TestAccCGCSnippet_eventarcWorkflowsExample|TestAccMonitoringService_basic

modular-magician · 2022-10-10T23:58:31Z

Tests passed during RECORDING mode:
TestAccMonitoringService_basic[Debug log]

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]
TestAccCGCSnippet_eventarcWorkflowsExample[Error message] [Debug log]

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

slevenick

Can we remove legacy_name & rename the whole thing to Service? Legacy_name can cause some tricky issues down the line, so it's better to just standardize on the name we want to display in magic-modules

etruong42 · 2022-10-14T13:04:49Z

Sadly, a resource has already been named Service: https://github.com/GoogleCloudPlatform/magic-modules/blob/main/mmv1/products/monitoring/api.yaml#L1032. I'm not aware of a way to safely take over this name, but perhaps there's a way?

slevenick

Hm, ok. Odd that the other resource wasn't just named CustomService from the start

Support ability to create "non-custom" services

33fb69d

Allow users to create various Service Monitoring services: App Engine, Cloud Run, etc. hashicorp/terraform-provider-google#11935

modular-magician requested a review from slevenick September 27, 2022 15:39

Specify BasicService is immutable

1b20e4d

slevenick requested changes Sep 30, 2022

View reviewed changes

Responding to review comments.

df278a0

modular-magician requested a review from slevenick September 30, 2022 19:50

Add test; make service_id required

cbba57b

labels still need input: true; remove encoder

4098923

Correct typo

070e802

Ignore service fields in SLO import test

aa4b570

slevenick reviewed Oct 5, 2022

View reviewed changes

mmv1/products/monitoring/terraform.yaml Outdated Show resolved Hide resolved

Remove custom code

fb3796b

modular-magician requested a review from slevenick October 6, 2022 02:30

slevenick reviewed Oct 6, 2022

View reviewed changes

mmv1/third_party/terraform/tests/resource_monitoring_slo_test.go Outdated Show resolved Hide resolved

Correct test typo

3ae1db3

modular-magician requested a review from slevenick October 10, 2022 16:24

service is actually input-only

633ff25

Add resource test

37de522

slevenick approved these changes Oct 13, 2022

View reviewed changes

slevenick requested changes Oct 13, 2022

View reviewed changes

slevenick self-requested a review October 14, 2022 23:01

slevenick approved these changes Oct 14, 2022

View reviewed changes

slevenick merged commit c8cee6c into GoogleCloudPlatform:main Oct 14, 2022

Support ability to create "non-custom" services #6604

Support ability to create "non-custom" services #6604

Conversation

etruong42 commented Sep 27, 2022 • edited by slevenick

modular-magician commented Sep 27, 2022

etruong42 commented Sep 27, 2022

modular-magician commented Sep 27, 2022

Diff report:

modular-magician commented Sep 27, 2022

Tests analytics

Action taken

modular-magician commented Sep 27, 2022

slevenick commented Sep 27, 2022

etruong42 commented Sep 27, 2022 via email

modular-magician commented Sep 29, 2022

Diff report:

modular-magician commented Sep 29, 2022

Tests analytics

Action taken

modular-magician commented Sep 29, 2022

modular-magician commented Sep 30, 2022

modular-magician commented Sep 30, 2022

Tests analytics

Action taken

modular-magician commented Sep 30, 2022

modular-magician commented Oct 3, 2022

Diff report

modular-magician commented Oct 3, 2022

Tests analytics

modular-magician commented Oct 3, 2022

Diff report

modular-magician commented Oct 3, 2022

Tests analytics

modular-magician commented Oct 3, 2022

Diff report

modular-magician commented Oct 3, 2022

Tests analytics

Action taken

modular-magician commented Oct 3, 2022

modular-magician commented Oct 6, 2022

Diff report:

modular-magician commented Oct 6, 2022

Tests analytics

Action taken

modular-magician commented Oct 6, 2022

modular-magician commented Oct 10, 2022

Diff report:

modular-magician commented Oct 10, 2022

Tests analytics

Action taken

modular-magician commented Oct 10, 2022

modular-magician commented Oct 10, 2022

Diff report:

modular-magician commented Oct 10, 2022

Tests analytics

Action taken

modular-magician commented Oct 10, 2022

modular-magician commented Oct 10, 2022

Diff report:

modular-magician commented Oct 10, 2022

Tests analytics

Action taken

modular-magician commented Oct 10, 2022

slevenick left a comment

Choose a reason for hiding this comment

etruong42 commented Oct 14, 2022

slevenick left a comment

Choose a reason for hiding this comment

etruong42 commented Sep 27, 2022 •

edited by slevenick