Skip to content

Revert "fix: IAM Policy 409 concurrent changes error (#15825)"#15972

Merged
slevenick merged 1 commit intoGoogleCloudPlatform:mainfrom
slevenick:revert-err-unwrap
Dec 17, 2025
Merged

Revert "fix: IAM Policy 409 concurrent changes error (#15825)"#15972
slevenick merged 1 commit intoGoogleCloudPlatform:mainfrom
slevenick:revert-err-unwrap

Conversation

@slevenick
Copy link
Copy Markdown
Contributor

This reverts commit 518ba7b.

This seems to be causing problems with wrapped errors that are using errwrap which is commonly used across the provider. @ScottSuarez notes that maybe upgrading our version of errwrap would fix this issue down the line, but for safety and speed of resolution I'm reverting for now

Release Note Template for Downstream PRs (will be copied)

See Write release notes for guidance.

all: fixed an issue where error type 409 and 412 were not being correctly retried. This commonly shows up in IAM resources, but can appear in other resources as well

@ScottSuarez
Copy link
Copy Markdown
Contributor

@BBBmau

We are using errwrap@v1.0.0 which doesn't support err.As

https://github.com/hashicorp/terraform-provider-google-beta/blob/cd21393b5aaea25ce0fce422f72b34c49945a69e/go.mod#L16

This was added in v1.1.0
https://github.com/hashicorp/errwrap/blob/v1.1.0/errwrap.go
hashicorp/errwrap#9

I would recommend verifying functionality after upgrading the package to ensure another regression does not occur.

@modular-magician
Copy link
Copy Markdown
Collaborator

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

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 2 files changed, 10 insertions(+), 5 deletions(-))
google-beta provider: Diff ( 2 files changed, 10 insertions(+), 5 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 7 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 5870
Passed tests: 5248
Skipped tests: 606
Affected tests: 16

Click here to see the affected service packages

All service packages are affected

Action taken

Found 16 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccAccessContextManager__gcp_user_access_binding
  • TestAccAccessContextManager__service_perimeter_dry_run_egress_policy
  • TestAccComputeFutureReservation_sharedFutureReservationExample
  • TestAccComputeRegionBackendService_withNetworkPassThroughLbTrafficPolicy
  • TestAccContainerCluster_networkPerformanceConfig
  • TestAccContainerCluster_withTPUConfig
  • TestAccContainerCluster_withTpu
  • TestAccContainerNodePool_secondaryBootDisks
  • TestAccDataFusionInstance_dataFusionInstanceCmekExample
  • TestAccDataplexEntry_dataplexEntryBigqueryTableExample
  • TestAccDialogflowCXTestCase_dialogflowcxTestCaseFullExample
  • TestAccDialogflowCXTestCase_update
  • TestAccDiscoveryEngineCmekConfig_discoveryengineCmekconfigDefaultExample_update
  • TestAccGKEHubFeature_FleetDefaultMemberConfigPolicyController
  • TestAccHealthcarePipelineJob_healthcarePipelineJobBackfillExample
  • TestAccSqlDatabaseInstance_activationPolicy

Get to know how VCR tests work

@modular-magician
Copy link
Copy Markdown
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccAccessContextManager__access_level [Debug log]
TestAccAccessContextManager__access_level_condition [Debug log]
TestAccAccessContextManager__access_level_custom [Debug log]
TestAccAccessContextManager__access_level_full [Debug log]
TestAccAccessContextManager__access_levels [Debug log]
TestAccAccessContextManager__access_policy [Debug log]
TestAccAccessContextManager__access_policy_scoped [Debug log]
TestAccAccessContextManager__authorized_orgs_desc [Debug log]
TestAccAccessContextManager__service_perimeter [Debug log]
TestAccAccessContextManager__service_perimeter_dry_run_egress_policy [Debug log]
TestAccAccessContextManager__service_perimeter_dry_run_ingress_policy [Debug log]
TestAccAccessContextManager__service_perimeter_update [Debug log]
TestAccAccessContextManager__service_perimeters [Debug log]
TestAccComputeRegionBackendService_withNetworkPassThroughLbTrafficPolicy [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.


🔴 Tests failed during RECORDING mode:
TestAccAccessContextManager__gcp_user_access_binding [Error message] [Debug log]
TestAccComputeFutureReservation_sharedFutureReservationExample [Error message] [Debug log]
TestAccContainerCluster_networkPerformanceConfig [Error message] [Debug log]
TestAccContainerCluster_withTPUConfig [Error message] [Debug log]
TestAccContainerCluster_withTpu [Error message] [Debug log]
TestAccContainerNodePool_secondaryBootDisks [Error message] [Debug log]
TestAccDataFusionInstance_dataFusionInstanceCmekExample [Error message] [Debug log]
TestAccDataplexEntry_dataplexEntryBigqueryTableExample [Error message] [Debug log]
TestAccDialogflowCXTestCase_dialogflowcxTestCaseFullExample [Error message] [Debug log]
TestAccDialogflowCXTestCase_update [Error message] [Debug log]
TestAccDiscoveryEngineCmekConfig_discoveryengineCmekconfigDefaultExample_update [Error message] [Debug log]
TestAccGKEHubFeature_FleetDefaultMemberConfigPolicyController [Error message] [Debug log]
TestAccHealthcarePipelineJob_healthcarePipelineJobBackfillExample [Error message] [Debug log]
TestAccSqlDatabaseInstance_activationPolicy [Error message] [Debug log]

🔴 Errors occurred during RECORDING mode. Please fix them to complete your PR.

View the build log or the debug log for each test

@slevenick slevenick added this pull request to the merge queue Dec 17, 2025
Merged via the queue into GoogleCloudPlatform:main with commit fcd18cd Dec 17, 2025
25 of 26 checks passed
@slevenick slevenick deleted the revert-err-unwrap branch December 17, 2025 16:52
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.

3 participants