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

Re-add monitoring monitored project, without metrics scope resource #3658

Conversation

modular-magician
Copy link
Collaborator

This is an unclean revert of #5229, which is itself a clean revert of #5218.

The unclean part is commit aa2a67614 (edit to add: also aa40f0a49) - which, if you like, you can review instead of re-looking at all the files in this, since almost none of them needed to change.

The only difference is that this does not include metrics scope, which was a no-op resource (not even a useful data source), now that we have extracted monitored project as a fine-grained resource.

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_monitored_project`

Derived from GoogleCloudPlatform/magic-modules#5235

…ashicorp#5235)

* Added monitoring metrics scope and monitored project resources. (hashicorp#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 <ScottSuarez@google.com>

* 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 <ScottSuarez@google.com>
Co-authored-by: Nathan Mckinley <nmckinley@google.com>

* 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 <thomasrodgers@google.com>
Co-authored-by: Scott Suarez <ScottSuarez@google.com>
Signed-off-by: Modular Magician <magic-modules@google.com>
@modular-magician modular-magician merged commit ad64073 into hashicorp:master Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant