Skip to content

fix(recaptchaenterprise) Fix recaptchaenterprise action settings map canonicalization - #18443

Merged
rileykarson merged 1 commit into
GoogleCloudPlatform:mainfrom
Cory-Kramer:recaptcha-key-update
Aug 5, 2026
Merged

fix(recaptchaenterprise) Fix recaptchaenterprise action settings map canonicalization#18443
rileykarson merged 1 commit into
GoogleCloudPlatform:mainfrom
Cory-Kramer:recaptcha-key-update

Conversation

@Cory-Kramer

@Cory-Kramer Cory-Kramer commented Jul 29, 2026

Copy link
Copy Markdown
Member

Preserve live-only action-settings entries during canonicalization so updates that change action map keys are not skipped.

Fixes hashicorp/terraform-provider-google#28502

Release Note Template for Downstream PRs (will be copied)

See Write release notes for guidance.

recaptchaenterprise: fixed updates to `google_recaptcha_enterprise_key` so existing `challenge_settings.action_settings` entries are preserved when the action map changes.

@modular-magician modular-magician added the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Jul 29, 2026
@github-actions
github-actions Bot requested a review from rileykarson July 29, 2026 12:50
@github-actions

Copy link
Copy Markdown

Googlers: For automatic test runs see go/terraform-auto-test-runs.

@rileykarson, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look.

You can help make sure that review is quick by doing a self-review and by running impacted tests locally.

@github-actions

github-actions Bot commented Aug 3, 2026

Copy link
Copy Markdown

@rileykarson This PR has been waiting for review for 3 weekdays. Please take a look! Use the label disable-review-reminders to disable these notifications.

@modular-magician modular-magician removed the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Aug 3, 2026
@modular-magician

modular-magician commented Aug 3, 2026

Copy link
Copy Markdown
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes for commit 075ff3e:

Diff report

Your PR generated the following diffs in downstream repositories:

Repository Diff Link Changes
google provider View Diff 1 file changed, 4 insertions(+), 9 deletions(-)
google-beta provider View Diff 1 file changed, 4 insertions(+), 9 deletions(-)

Test report

Analytics

Total Tests Passed Skipped Affected
7 7 0 0
Affected Service Packages
  • recaptchaenterprise

Learn how VCR tests work


Step 1: Replaying Mode

🟢 All tests passed in Replaying mode! No Recording was needed.

View the replaying VCR build log

@Cory-Kramer, @rileykarson VCR tests complete for 075ff3e!

if cd != nil {
items[k] = *cd
}
items := make(map[string]KeyWebSettingsChallengeSettingsActionSettings)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could you add a test to exercise the corrected behaviour?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I've added a new unit test with the case described in the reported issue

…canonicalization

Preserve live-only action-settings entries during canonicalization so updates that change action map keys are not skipped.

Fix for hashicorp/terraform-provider-google#28502
@Cory-Kramer
Cory-Kramer force-pushed the recaptcha-key-update branch from 075ff3e to d1e9325 Compare August 4, 2026 15:42
@github-actions
github-actions Bot requested a review from rileykarson August 4, 2026 15:42
@modular-magician

modular-magician commented Aug 4, 2026

Copy link
Copy Markdown
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes for commit d1e9325:

Diff report

Your PR generated the following diffs in downstream repositories:

Repository Diff Link Changes
google provider View Diff 2 files changed, 98 insertions(+), 21 deletions(-)
google-beta provider View Diff 2 files changed, 98 insertions(+), 21 deletions(-)

Test report

Analytics

Total Tests Passed Skipped Affected
7 7 0 0
Affected Service Packages
  • recaptchaenterprise

Learn how VCR tests work


Step 1: Replaying Mode

🟢 All tests passed in Replaying mode! No Recording was needed.

View the replaying VCR build log

@Cory-Kramer, @rileykarson VCR tests complete for d1e9325!

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.

google_recaptcha_enterprise_key silently skips updates when challenge_settings.action_settings map keys change

3 participants