Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanzhudd merged 6 commits into from
Aug 26, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e676ac
use cluster location instead of rg location for keyvault creation
iliu816 Jun 23, 2025
169d915
style nit
iliu816 Jun 23, 2025
e1863e5
use cluster location instead of rg location for keyvault creation
iliu816 Jun 23, 2025
2a5902e
style nit
iliu816 Jun 23, 2025
f581814
test coverage
iliu816 Jul 28, 2025
d5767de
Merge branch 'user/iliu/keyvaultLocation' of https://github.com/iliu8…
iliu816 Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/azure-cli/azure/cli/command_modules/servicefabric/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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,
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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]
Expand All @@ -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]
Expand Down
Loading
Loading