apigee: fix TestAccApigeeOrganization_apigeeOrganizationCloudFullDisableVpcPeeringTestExample

[xuchenma]

Summary

Fixed two root causes that caused TestAccApigeeOrganization_apigeeOrganizationCloudFullDisableVpcPeeringTestExample to fail:

1. Properties ordering mismatch: The Apigee API returns properties.property entries in alphabetical order, while Terraform compares lists order-sensitively. Added a custom_flatten that uses SortMapsByConfigOrder to sort the API response in config-specified order before storing in state. This fix was already present in the GA provider via custom_flatten/apigee_organization_property.go.tmpl, but the test_check_destroy template was needed to also fix CheckDestroy.

2. Async org deletion race: Apigee Organization deletion is asynchronous. CheckDestroy ran immediately after the delete API call returned, finding the org still in DELETING state. Added a test_check_destroy custom template that polls up to 10 minutes, treating both HTTP 404 (fully deleted) and state == DELETING (deletion in progress) as success.

The apigee_organization_cloud_full_disable_vpc_peering_test.tf.tmpl also had template issues (unsupported deletion_policy field in beta, and using .member attribute which is only in GA); these are fixed in this PR.

Test evidence

--- PASS: TestAccApigeeOrganization_apigeeOrganizationCloudFullDisableVpcPeeringTestExample (1160.98s)

Fixes: hashicorp/terraform-provider-google#24143

apigee: fixed `google_apigee_organization` perpetual plan diff caused by API returning properties in non-deterministic order and flaky CheckDestroy caused by async organization deletion

[github-actions]

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

@BBBmau, 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.

[xuchenma]

Fixes hashicorp/terraform-provider-google#22528

Fixes: hashicorp/terraform-provider-google#25281

[modular-magician]

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 ( 1 file changed, 26 insertions(+), 9 deletions(-))
google-beta provider: Diff ( 1 file changed, 28 insertions(+), 13 deletions(-))

[modular-magician]

Tests analytics

Total tests: 72
Passed tests: 33
Skipped tests: 37
Affected tests: 2

Click here to see the affected service packages

• apigee

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

• TestAccApigeeOrganization_apigeeOrganizationCloudFullDisableVpcPeeringTestExample
• TestAccApigeeOrganization_apigeeOrganizationCloudFullTestExample

Get to know how VCR tests work

[modular-magician]

🔴 Tests failed during RECORDING mode:
TestAccApigeeOrganization_apigeeOrganizationCloudFullDisableVpcPeeringTestExample [Error message] [Debug log]
TestAccApigeeOrganization_apigeeOrganizationCloudFullTestExample [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

[BBBmau]

what's the reason for removing this? This resulted in the following error to occur as by default we prevent deleitons from occurring with deletion_policy having the default value of "PREVENT"

=== CONT  TestAccApigeeOrganization_apigeeOrganizationCloudFullDisableVpcPeeringTestExample
    resource_apigee_organization_generated_test.go:501: Error running post-test destroy, there may be dangling resources: exit status 1
        
        Error: Cannot destroy project as deletion_policy is set to PREVENT.

[xuchenma]

Agreed — removing deletion_policy = "DELETE" was unintentional. The actual fix in this PR is adding a test_check_destroy template that properly polls for the async Apigee org deletion; the deletion_policy lines were accidentally dropped during that edit.

I've restored deletion_policy = "DELETE" in both template files:

• apigee_organization_cloud_full_disable_vpc_peering_test.tf.tmpl
• apigee_organization_cloud_full_test.tf.tmpl

[modular-magician]

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 ( 1 file changed, 26 insertions(+), 9 deletions(-))
google-beta provider: Diff ( 1 file changed, 28 insertions(+), 11 deletions(-))

[modular-magician]

Tests analytics

Total tests: 72
Passed tests: 32
Skipped tests: 37
Affected tests: 3

Click here to see the affected service packages

• apigee

Action taken

Found 3 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

• TestAccApigeeEnvironmentAddonsConfig_apigeeEnvAddonsAnalyticsTestExample
• TestAccApigeeOrganization_apigeeOrganizationCloudBasicDisableVpcPeeringTestExample
• TestAccApigeeOrganization_apigeeOrganizationCloudFullDisableVpcPeeringTestExample

Get to know how VCR tests work

[modular-magician]

🟢 Tests passed during RECORDING mode:
TestAccApigeeEnvironmentAddonsConfig_apigeeEnvAddonsAnalyticsTestExample [Debug log]
TestAccApigeeOrganization_apigeeOrganizationCloudBasicDisableVpcPeeringTestExample [Debug log]
TestAccApigeeOrganization_apigeeOrganizationCloudFullDisableVpcPeeringTestExample [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.

---

🟢 All tests passed!

View the build log or the debug log for each test

[github-actions]

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

[BBBmau]

How confident are we to accept any error from the API meaning that the org is gone? I'm not sure why we can't explicitly check for when the status response is a 404 have 100% confirmation of the apigee org not existing.