fix the china extra stack deletion issue.

Author: danxie1999

src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/china-support/create_s3_cn.py

@@ -14,14 +14,14 @@
 REGION_DEFAULT = os.environ["AWS_REGION"]
 MANAGEMENT_ACCOUNT_ID = os.environ["MANAGEMENT_ACCOUNT_ID"]
 LOGGER = configure_logger(__name__)
-
+ADF_GLOBAL_BOOTSTRAP_CHINA_BUCKET_STACK_NAME = "adf-regional-base-china-bucket"
 
 def _create_s3_bucket(bucket_name):
     try:
         LOGGER.info("Deploy S3 bucket %s...", bucket_name)
         extra_deploy_region = "cn-northwest-1"
         template_path = "adf-build/china-support/cn_northwest_bucket.yml"
-        stack_name = "adf-regional-base-china-bucket"
+        stack_name = ADF_GLOBAL_BOOTSTRAP_CHINA_BUCKET_STACK_NAME
         parameters = [
             {
                 "ParameterKey": "BucketName",

src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/cloudformation.py

@@ -16,6 +16,8 @@
 from errors import InvalidTemplateError, GenericAccountConfigureError
 from logger import configure_logger
 from paginator import paginator
+from partition import get_partition
+
 
 LOGGER = configure_logger(__name__)
 STACK_TERMINATION_PROTECTION = os.environ.get('TERMINATION_PROTECTION', False)
@@ -29,7 +31,8 @@
 CFN_UNACCEPTED_CHARS = re.compile(r"[^-a-zA-Z0-9]")
 ADF_GLOBAL_IAM_STACK_NAME = 'adf-global-base-iam'
 ADF_GLOBAL_BOOTSTRAP_STACK_NAME = 'adf-global-base-bootstrap'
-
+ADF_GLOBAL_BOOTSTRAP_CHINA_BUCKET_STACK_NAME = "adf-regional-base-china-bucket"
+ADF_GLOBAL_BOOTSTRAP_CHINA_EXTRA_STACK_NAME = "adf-regional-base-china-extra"
 
 class StackProperties:
     clean_stack_status = [
@@ -148,6 +151,10 @@ def _get_valid_stack_names(self):
             valid_stack_names.append(ADF_GLOBAL_IAM_STACK_NAME)
             valid_stack_names.append(ADF_GLOBAL_BOOTSTRAP_STACK_NAME)
 
+        if self.partition == "aws-cn":
+            valid_stack_names.append(ADF_GLOBAL_BOOTSTRAP_CHINA_BUCKET_STACK_NAME)
+            valid_stack_names.append(ADF_GLOBAL_BOOTSTRAP_CHINA_EXTRA_STACK_NAME)
+
         return valid_stack_names
 
 
@@ -197,6 +204,7 @@ def __init__(
             if template_file_prefix else None
         self.template_url = template_url or self.template_url_from_template_file_prefix
         self.local_template_path = local_template_path
+        self.partition = get_partition(region)
 
     def validate_template(self):
         try: