[Service Fabric] Fix #5338: az sf cluster create: Fix the bug where key-vault not placed in location specifed by --location (#31883)

Author: iliu816

src/azure-cli/azure/cli/command_modules/servicefabric/custom.py

@@ -204,7 +204,8 @@ def new_cluster(cmd,
                                      vault_resource_group_name,
                                      certificate_output_folder,
                                      certificate_subject_name,
-                                     secret_identifier)
+                                     secret_identifier,
+                                     location)
         vault_id = result[0]
         certificate_uri = result[1]
         cert_thumbprint = result[2]
@@ -284,6 +285,8 @@ def add_app_cert(cmd,
                  certificate_subject_name=None,
                  secret_identifier=None):
     cli_ctx = cmd.cli_ctx
+    cluster = client.get(resource_group_name, cluster_name)
+    location = cluster.location
     result = _create_certificate(cmd,
                                  cli_ctx,
                                  resource_group_name,
@@ -293,7 +296,8 @@ def add_app_cert(cmd,
                                  vault_resource_group_name,
                                  certificate_output_folder,
                                  certificate_subject_name,
-                                 secret_identifier)
+                                 secret_identifier,
+                                 location)
 
     _add_cert_to_all_vmss(cli_ctx, resource_group_name, None, result[0], result[1])
     return client.get(resource_group_name, cluster_name)
@@ -1072,17 +1076,17 @@ def _create_certificate(cmd,
                         vault_resource_group_name=None,
                         certificate_output_folder=None,
                         certificate_subject_name=None,
-                        secret_identifier=None):
+                        secret_identifier=None,
+                        location=None):
     _verify_cert_function_parameter(certificate_file, certificate_password,
                                     vault_name, vault_resource_group_name,
                                     certificate_output_folder,
                                     certificate_subject_name,
                                     secret_identifier)
 
     output_file = None
-    rg = _get_resource_group_by_name(cli_ctx, resource_group_name)
-    location = rg.location
-
+    if location is None:
+        location = _get_resource_group_by_name(cli_ctx, resource_group_name).location
     vault_id = None
     secret_url = None
     certificate_thumbprint = None
@@ -1778,6 +1782,9 @@ def _set_parameters_for_customize_template(cmd,
     parameters = get_file_json(parameter_file)['parameters']
     if parameters is None:
         raise CLIError('Invalid parameters file')
+
+    location = parameters['clusterLocation']['value']
+
     if SOURCE_VAULT_VALUE in parameters and CERTIFICATE_THUMBPRINT in parameters and CERTIFICATE_URL_VALUE in parameters:
         logger.info('Found primary certificate parameters in parameters file')
         result = _create_certificate(cmd,
@@ -1789,7 +1796,8 @@ def _set_parameters_for_customize_template(cmd,
                                      vault_resource_group_name,
                                      certificate_output_folder,
                                      certificate_subject_name,
-                                     secret_identifier)
+                                     secret_identifier,
+                                     location)
         parameters[SOURCE_VAULT_VALUE]['value'] = result[0]
         parameters[CERTIFICATE_URL_VALUE]['value'] = result[1]
         parameters[CERTIFICATE_THUMBPRINT]['value'] = result[2]
@@ -1810,7 +1818,8 @@ def _set_parameters_for_customize_template(cmd,
                                      vault_resource_group_name,
                                      certificate_output_folder,
                                      certificate_subject_name,
-                                     secret_identifier)
+                                     secret_identifier,
+                                     location)
         parameters[SOURCE_VAULT_VALUE]['value'] = result[0]
         parameters[CERTIFICATE_URL_VALUE]['value'] = result[1]
         parameters[CERTIFICATE_THUMBPRINT]['value'] = result[2]