apigee: fix org_id doubled prefix in google_apigee_sharedflow_deployment#16948
Open
xuchenma wants to merge 1 commit intoGoogleCloudPlatform:mainfrom
Open
apigee: fix org_id doubled prefix in google_apigee_sharedflow_deployment#16948xuchenma wants to merge 1 commit intoGoogleCloudPlatform:mainfrom
xuchenma wants to merge 1 commit intoGoogleCloudPlatform:mainfrom
Conversation
When users reference google_apigee_organization.id as org_id in google_apigee_sharedflow_deployment, the value already contains the 'organizations/' prefix (e.g. 'organizations/my-project'). After import, the import regex captures just 'my-project' into org_id. This causes a state diff: config has 'organizations/my-project', state has 'my-project'. Since org_id has ForceNew:true, Terraform destroys and recreates the deployment. Undeploying a sharedflow with dependent API proxies fails with 400 'undeployment validations failed'. Fix by adding a StateFunc and DiffSuppressFunc to the org_id field that strip the 'organizations/' prefix if present, so both bare project IDs and fully-qualified organization IDs are normalized consistently. Fixes: hashicorp/terraform-provider-google#25852
modular-magician
added
the
awaiting-approval
|
Googlers: For automatic test runs see go/terraform-auto-test-runs. @hao-nan-li, 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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes a bug where importing
google_apigee_sharedflow_deploymentwould trigger an unwanted destroy+recreate cycle whenorg_iduses agoogle_apigee_organization.idreference.Root cause:
google_apigee_organization.idreturns"organizations/<project-id>". The import regex captures only<project-id>intoorg_id. After import, the state hasorg_id = "project-id"but the config hasorg_id = "organizations/project-id". This diff triggers ForceNew → destroy → undeploy → 400 error if dependent API proxies are attached:Fix: Added a
StateFuncandDiffSuppressFuncto theorg_idfield that strip theorganizations/prefix if present, so both bare project IDs and fully-qualified organization IDs normalize to the same value and no spurious diff is produced.Fixes: hashicorp/terraform-provider-google#25852
Tests
TestAccApigeeSharedflowDeployment_apigeeSharedflowDeploymentTestExamplepassed locally (1323s), includingImportStateVerifysteps: