Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added monitoring metrics scope and monitored project resources. #5218

Conversation

trodge
Copy link
Contributor

@trodge trodge commented Sep 20, 2021

fixes hashicorp/terraform-provider-google#10113

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_metrics_scope`
`google_monitoring_monitored_project`

@google-cla google-cla bot added the cla: yes label Sep 20, 2021
@modular-magician
Copy link
Collaborator

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.

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

tpgtools/go.mod Outdated Show resolved Hide resolved
@trodge trodge force-pushed the monitoring-monitoredproject-dcl branch from 6535714 to 94f6667 Compare September 20, 2021 21:01
@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 20 files changed, 959 insertions(+), 19 deletions(-))
Terraform Beta: Diff ( 20 files changed, 960 insertions(+), 19 deletions(-))

@nat-henderson
Copy link
Contributor

okay, let's kick off those tests. /gcbrun

@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 21 files changed, 960 insertions(+), 19 deletions(-))
Terraform Beta: Diff ( 21 files changed, 961 insertions(+), 20 deletions(-))

@slevenick
Copy link
Contributor

/gcbrun

mmv1/third_party/terraform/utils/provider.go.erb Outdated Show resolved Hide resolved
tpgtools/overrides/monitoring/beta/metrics_scope.yaml Outdated Show resolved Hide resolved
tpgtools/resource.go Show resolved Hide resolved
@ScottSuarez
Copy link
Contributor

/gcbrun

1 similar comment
@nat-henderson
Copy link
Contributor

/gcbrun

@nat-henderson
Copy link
Contributor

@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 20 files changed, 959 insertions(+), 19 deletions(-))
Terraform Beta: Diff ( 20 files changed, 960 insertions(+), 19 deletions(-))

@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 21 files changed, 959 insertions(+), 20 deletions(-))
Terraform Beta: Diff ( 21 files changed, 961 insertions(+), 20 deletions(-))

@rileykarson
Copy link
Member

Hmm- the product name in the website is off, but that's not unique to this change so it shouldn't block. Filed hashicorp/terraform-provider-google#10123. fyi @slevenick

@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 20 files changed, 959 insertions(+), 19 deletions(-))
Terraform Beta: Diff ( 21 files changed, 961 insertions(+), 20 deletions(-))

@modular-magician
Copy link
Collaborator

I have triggered VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccComputeServiceAttachment_serviceAttachmentBasicExample|TestAccMonitoringMetricsScope_BasicMetricsScope|TestAccMonitoringMonitoredProject_BasicMonitoredProject|TestAccOrgPolicyPolicy_EnforcePolicy|TestAccOrgPolicyPolicy_FolderPolicy|TestAccOrgPolicyPolicy_OrganizationPolicy|TestAccOrgPolicyPolicy_ProjectPolicy You can view the result here: https://ci-oss.hashicorp.engineering/viewQueued.html?itemId=206742

@nat-henderson
Copy link
Contributor

Going to check that test for a flake.

@trodge
Copy link
Contributor Author

trodge commented Sep 21, 2021

/gcbrun

@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 21 files changed, 971 insertions(+), 25 deletions(-))
Terraform Beta: Diff ( 21 files changed, 963 insertions(+), 20 deletions(-))

@modular-magician
Copy link
Collaborator

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

Diff report:

Terraform GA: Diff ( 21 files changed, 971 insertions(+), 25 deletions(-))
Terraform Beta: Diff ( 21 files changed, 964 insertions(+), 20 deletions(-))

@nat-henderson nat-henderson merged commit 243d91e into GoogleCloudPlatform:master Sep 22, 2021
@trodge trodge deleted the monitoring-monitoredproject-dcl branch September 22, 2021 16:20
nat-henderson added a commit that referenced this pull request Sep 22, 2021
nat-henderson added a commit that referenced this pull request Sep 22, 2021
nat-henderson added a commit that referenced this pull request Sep 23, 2021
* Added monitoring metrics scope and monitored project resources.

* Ran make upgrade-dcl

* Fixed indentation

* Copied tpgtools go.sum lines into mmv1 go.sum.

* Apply suggestions from code review

Co-authored-by: Scott Suarez <[email protected]>

* Attempted to fix strange downstream change in iam.go.

* Added missing custom serializer to GA version, upgraded DCL again.

* Update ID format so import is possible.

Co-authored-by: Scott Suarez <[email protected]>
Co-authored-by: Nathan Mckinley <[email protected]>
nat-henderson added a commit that referenced this pull request Sep 24, 2021
* Added monitoring metrics scope and monitored project resources.

* Ran make upgrade-dcl

* Fixed indentation

* Copied tpgtools go.sum lines into mmv1 go.sum.

* Apply suggestions from code review

Co-authored-by: Scott Suarez <[email protected]>

* Attempted to fix strange downstream change in iam.go.

* Added missing custom serializer to GA version, upgraded DCL again.

* Update ID format so import is possible.

Co-authored-by: Scott Suarez <[email protected]>
Co-authored-by: Nathan Mckinley <[email protected]>
nat-henderson added a commit that referenced this pull request Sep 24, 2021
…5235)

* Added monitoring metrics scope and monitored project resources. (#5218)

* Added monitoring metrics scope and monitored project resources.

* Ran make upgrade-dcl

* Fixed indentation

* Copied tpgtools go.sum lines into mmv1 go.sum.

* Apply suggestions from code review

Co-authored-by: Scott Suarez <[email protected]>

* Attempted to fix strange downstream change in iam.go.

* Added missing custom serializer to GA version, upgraded DCL again.

* Update ID format so import is possible.

Co-authored-by: Scott Suarez <[email protected]>
Co-authored-by: Nathan Mckinley <[email protected]>

* Revert reversion of metrics scopes

* Remove scope from provider.

* Remove from GA, remove metrics scope from provider.

* Added missing strings import for mmv1 dataproc cluster test.

* Ran make serialize.

* Removed unneeded overrides. Re-ran make serialize.

* Removed undeletable override.

Co-authored-by: Thomas Rodgers <[email protected]>
Co-authored-by: Scott Suarez <[email protected]>
trodge pushed a commit to trodge/magic-modules that referenced this pull request Sep 28, 2021
khajduczenia pushed a commit to khajduczenia/magic-modules that referenced this pull request Oct 12, 2021
…leCloudPlatform#5218)

* Added monitoring metrics scope and monitored project resources.

* Ran make upgrade-dcl

* Fixed indentation

* Copied tpgtools go.sum lines into mmv1 go.sum.

* Apply suggestions from code review

Co-authored-by: Scott Suarez <[email protected]>

* Attempted to fix strange downstream change in iam.go.

* Added missing custom serializer to GA version, upgraded DCL again.

* Update ID format so import is possible.

Co-authored-by: Scott Suarez <[email protected]>
Co-authored-by: Nathan Mckinley <[email protected]>
khajduczenia pushed a commit to khajduczenia/magic-modules that referenced this pull request Oct 12, 2021
khajduczenia pushed a commit to khajduczenia/magic-modules that referenced this pull request Oct 12, 2021
…oogleCloudPlatform#5235)

* Added monitoring metrics scope and monitored project resources. (GoogleCloudPlatform#5218)

* Added monitoring metrics scope and monitored project resources.

* Ran make upgrade-dcl

* Fixed indentation

* Copied tpgtools go.sum lines into mmv1 go.sum.

* Apply suggestions from code review

Co-authored-by: Scott Suarez <[email protected]>

* Attempted to fix strange downstream change in iam.go.

* Added missing custom serializer to GA version, upgraded DCL again.

* Update ID format so import is possible.

Co-authored-by: Scott Suarez <[email protected]>
Co-authored-by: Nathan Mckinley <[email protected]>

* Revert reversion of metrics scopes

* Remove scope from provider.

* Remove from GA, remove metrics scope from provider.

* Added missing strings import for mmv1 dataproc cluster test.

* Ran make serialize.

* Removed unneeded overrides. Re-ran make serialize.

* Removed undeletable override.

Co-authored-by: Thomas Rodgers <[email protected]>
Co-authored-by: Scott Suarez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implement monitoring metrics scope and monitored project resources
6 participants