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

Add support for checker_type in uptime_check_config #5987

Merged
merged 2 commits into from
May 11, 2022

Conversation

jrbarnard
Copy link
Contributor

This PR adds in support for the checker_type field on the google_monitoring_uptime_check_config resource.

fixes hashicorp/terraform-provider-google#11537

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)

monitoring: Added `checker_type` field to `google_monitoring_uptime_check_config` resource

@jrbarnard
Copy link
Contributor Author

Sorry for the PR spam, trying to get my CLA email working correctly. I have not been able to run the acceptance tests

@modular-magician
Copy link
Collaborator

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

I've detected that you're a community contributor. @shuyama1, 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.


@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 ( 3 files changed, 44 insertions(+))
Terraform Beta: Diff ( 3 files changed, 44 insertions(+))
TF Validator: Diff ( 3 files changed, 13 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 1992
Passed tests 1746
Skipped tests: 241
Failed tests: 5

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccMonitoringUptimeCheckConfig_changeNonUpdatableFields|TestAccMonitoringUptimeCheckConfig_update|TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpsExample|TestAccMonitoringUptimeCheckConfig_uptimeCheckTcpExample|TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpExample

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpExample[view]
TestAccMonitoringUptimeCheckConfig_update[view]
TestAccMonitoringUptimeCheckConfig_changeNonUpdatableFields[view]
TestAccMonitoringUptimeCheckConfig_uptimeCheckTcpExample[view]
TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpsExample[view]

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

Copy link
Member

@shuyama1 shuyama1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay on reviewing this PR.

description: The checker type to use for the check. If the monitored resource type
is servicedirectory_service, checkerType must be set to VPC_CHECKERS. If set to
CHECKER_TYPE_UNSPECIFIED then checkerType defaults to STATIC_IP_CHECKERS.
default_value: :STATIC_IP_CHECKERS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on the API description here, it seems that the default value may change in the future and changing default value in Terraform provider would consider to be a breaking change. Therefore, can we remove the default value for this field and add default_from_api: true for this field in terraform.yaml file (it will generate optional + computed for this field in the provider, which means the field will accept whatever value returned by API when it is not set by user explicitly)?

@@ -1765,6 +1765,16 @@ objects:
message is returned. Not specifying this field will result in uptime checks
running from all regions.
item_type: Api::Type::String
- !ruby/object:Api::Type::Enum
name: checkerType
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this field updatable? If not, we probably need to add input: true.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested this and if you changed the monitoredResource away from servicedirectory_service to say uptime_url to be able to use the STATIC_IP_CHECKERS checkerType the api returns a 400 as you can't change the host. So I think it's fine to be not updateable. I'll set it to input: true

CHECKER_TYPE_UNSPECIFIED then checkerType defaults to STATIC_IP_CHECKERS.
default_value: :STATIC_IP_CHECKERS
values:
- :CHECKER_TYPE_UNSPECIFIED
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably want to remove this value.

@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 ( 6 files changed, 42 insertions(+), 8 deletions(-))
Terraform Beta: Diff ( 6 files changed, 46 insertions(+), 12 deletions(-))
TF Validator: Diff ( 3 files changed, 13 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2013
Passed tests 1766
Skipped tests: 242
Failed tests: 5

Action taken

Triggering VCR tests in RECORDING mode for the following tests that failed during VCR: TestAccFirebaserulesRelease_BasicRelease|TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpsExample|TestAccMonitoringUptimeCheckConfig_update|TestAccMonitoringUptimeCheckConfig_changeNonUpdatableFields|TestAccMonitoringUptimeCheckConfig_uptimeCheckTcpExample

@modular-magician
Copy link
Collaborator

Tests passed during RECORDING mode:
TestAccFirebaserulesRelease_BasicRelease[view]
TestAccMonitoringUptimeCheckConfig_update[view]
TestAccMonitoringUptimeCheckConfig_changeNonUpdatableFields[view]
TestAccMonitoringUptimeCheckConfig_uptimeCheckTcpExample[view]
TestAccMonitoringUptimeCheckConfig_uptimeCheckConfigHttpsExample[view]

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

@shuyama1 shuyama1 self-requested a review May 9, 2022 23:39
Copy link
Member

@shuyama1 shuyama1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error creating google_monitoring_uptime_check_config with private Service Directory service
3 participants