From 66feadf77308e0300cf7a228b2fa1180d2e4f220 Mon Sep 17 00:00:00 2001 From: xuchenma <67921399+xuchenma@users.noreply.github.com> Date: Mon, 11 Apr 2022 15:02:13 -0700 Subject: [PATCH] Update mutex on google_apigee_instance_attachment to lock globally (#5911) * Add support IAM policy for the Environment of Apigee X * Add support IAM policy for the Environment of Apigee X * Add support IAM policy for the Environment of Apigee X * Add support IAM policy for the Environment of Apigee X * Revert all changes to test files. * Revert all changes to test files. * Revert all changes to test files. * Add primary_resource_name to fix tests. * Update iam_attributes.tf.erb to honor skip_test. * Don't reject skip_tests when example is nil. * Update mmv1/products/apigee/api.yaml Co-authored-by: Stephen Lewis (Burrows) * Fix primary_resource_name for apigee organization name. * Update mutex on google_apigee_instance_attachment to lock on org_id. * Create a global lock on instance attachments. * update mutex name to apigeeInstanceAttachments Co-authored-by: Stephen Lewis (Burrows) --- mmv1/products/apigee/terraform.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mmv1/products/apigee/terraform.yaml b/mmv1/products/apigee/terraform.yaml index bcb8e187276c..03daaadfe059 100644 --- a/mmv1/products/apigee/terraform.yaml +++ b/mmv1/products/apigee/terraform.yaml @@ -191,7 +191,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides autogen_async: true import_format: ["{{instance_id}}/attachments/{{name}}", "{{instance_id}}/{{name}}"] delete_url: '{{instance_id}}/attachments/{{name}}' - mutex: "{{instance_id}}" + # Creating a global lock on instance attachments. + mutex: "apigeeInstanceAttachments" examples: - !ruby/object:Provider::Terraform::Examples name: "apigee_instance_attachment_basic"