Skip to content

Presentation aks fix: The name displayed for the storage is inreality everything before -hcp-, this fix helps clearing that confusion. #1451

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
qwordy merged 4 commits into from
Apr 3, 2020
Merged

Presentation aks fix: The name displayed for the storage is inreality everything before -hcp-, this fix helps clearing that confusion. #1451

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89b0dd4
Presentation fix: The name displayed for the storage is inreality eve…
Tatsinnit Mar 25, 2020
7c6c12e
Moving to helper + Test following existing pattern.
Tatsinnit Mar 27, 2020
5306412
Pylint issue fixed.
Mar 30, 2020
0e28a1d
Merge branch 'master' into fix_storage_name_presentation_issue
qwordy Apr 3, 2020
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
18 changes: 16 additions & 2 deletions src/aks-preview/azext_aks_preview/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,7 @@ def aks_kollect(cmd, # pylint: disable=too-many-statements,too-many-locals
normalized_fqdn = mc.fqdn.replace('.', '-')
token_in_storage_account_url = readonly_sas_token if readonly_sas_token is not None else sas_token
log_storage_account_url = f"https://{storage_account_name}.blob.core.windows.net/" \
f"{normalized_fqdn}?{token_in_storage_account_url}"
f"{_trim_fqdn_name_containing_hcp(normalized_fqdn)}?{token_in_storage_account_url}"

print(f'{colorama.Fore.GREEN}Your logs are being uploaded to storage account {format_bright(storage_account_name)}')

Expand All @@ -1500,7 +1500,21 @@ def aks_kollect(cmd, # pylint: disable=too-many-statements,too-many-locals
else:
display_diagnostics_report(temp_kubeconfig_path)

return

def _trim_fqdn_name_containing_hcp(normalized_fqdn: str) -> str:
Comment thread
Tatsinnit marked this conversation as resolved.
Outdated
"""
Trims the storage blob name and takes everything prior to "-hcp-".
Currently it is displayed wrong: i.e. at time of creation cli has
following limitation:
https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/
Comment thread
Tatsinnit marked this conversation as resolved.
Outdated
error-storage-account-name

:param normalized_fqdn: storage blob name
:return: storage_name_without_hcp: Storage name without the hcp value
attached
"""
storage_name_without_hcp, _, _ = normalized_fqdn.partition('-hcp-')
return storage_name_without_hcp


def aks_kanalyze(cmd, client, resource_group_name, name):
Expand Down