From bd431805bec52ea8f2b9de9019f20f3cb6640a3a Mon Sep 17 00:00:00 2001 From: Jiashuo Li Date: Thu, 29 Oct 2020 20:08:55 +0800 Subject: [PATCH 1/4] Override preview and experimental message --- src/azure-cli-core/azure/cli/core/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py index d3b858a961c..bcd38bbf298 100644 --- a/src/azure-cli-core/azure/cli/core/__init__.py +++ b/src/azure-cli-core/azure/cli/core/__init__.py @@ -80,6 +80,18 @@ def __init__(self, **kwargs): self.progress_controller = None + cli_status_msg = "See https://aka.cli/cli-command-status to learn more about Azure CLI command status " \ + "and support." + # Override the experimental message + import knack.experimental + knack.experimental.EXPERIMENTAL_MESSAGE = "This {} is experimental. " + cli_status_msg + knack.experimental.IMPLICIT_EXPERIMENTAL_MESSAGE = "Command group '{}' is experimental. " + cli_status_msg + + # Override the preview message + import knack.preview + knack.preview.PREVIEW_MESSAGE = "This {} is in preview. " + cli_status_msg + knack.preview.IMPLICIT_PREVIEW_MESSAGE = "Command group '{}' is in preview. " + cli_status_msg + def refresh_request_id(self): """Assign a new random GUID as x-ms-client-request-id From 374c69896387e1e66c1e67c7f4e7e1a10320fc8b Mon Sep 17 00:00:00 2001 From: Jiashuo Li Date: Fri, 30 Oct 2020 11:12:45 +0800 Subject: [PATCH 2/4] Unify direct and implicit message --- src/azure-cli-core/azure/cli/core/__init__.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py index bcd38bbf298..d25d45d57fe 100644 --- a/src/azure-cli-core/azure/cli/core/__init__.py +++ b/src/azure-cli-core/azure/cli/core/__init__.py @@ -80,17 +80,14 @@ def __init__(self, **kwargs): self.progress_controller = None - cli_status_msg = "See https://aka.cli/cli-command-status to learn more about Azure CLI command status " \ - "and support." + ref_message = "Reference and support levels: https://aka.cli/cli-command-status" # Override the experimental message import knack.experimental - knack.experimental.EXPERIMENTAL_MESSAGE = "This {} is experimental. " + cli_status_msg - knack.experimental.IMPLICIT_EXPERIMENTAL_MESSAGE = "Command group '{}' is experimental. " + cli_status_msg + knack.experimental.EXPERIMENTAL_MESSAGE = "{} is experimental. " + ref_message # Override the preview message import knack.preview - knack.preview.PREVIEW_MESSAGE = "This {} is in preview. " + cli_status_msg - knack.preview.IMPLICIT_PREVIEW_MESSAGE = "Command group '{}' is in preview. " + cli_status_msg + knack.preview.PREVIEW_MESSAGE = "{} is in preview. " + ref_message def refresh_request_id(self): """Assign a new random GUID as x-ms-client-request-id From afa7bdb2bed04040426964bca7207f81cad8efe0 Mon Sep 17 00:00:00 2001 From: Jiashuo Li Date: Fri, 20 Nov 2020 14:45:50 +0800 Subject: [PATCH 3/4] Update message --- src/azure-cli-core/azure/cli/core/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py index d25d45d57fe..c8f0d4828ff 100644 --- a/src/azure-cli-core/azure/cli/core/__init__.py +++ b/src/azure-cli-core/azure/cli/core/__init__.py @@ -80,14 +80,14 @@ def __init__(self, **kwargs): self.progress_controller = None - ref_message = "Reference and support levels: https://aka.cli/cli-command-status" + ref_message = "Reference and support levels: https://aka.ms/CLI_refstatus" # Override the experimental message import knack.experimental - knack.experimental.EXPERIMENTAL_MESSAGE = "{} is experimental. " + ref_message + knack.experimental.EXPERIMENTAL_MESSAGE = "{} is experimental and under development. " + ref_message # Override the preview message import knack.preview - knack.preview.PREVIEW_MESSAGE = "{} is in preview. " + ref_message + knack.preview.PREVIEW_MESSAGE = "{} is in preview and under development. " + ref_message def refresh_request_id(self): """Assign a new random GUID as x-ms-client-request-id From 03bdae94f519da1e19311668d9a13ed493346cf1 Mon Sep 17 00:00:00 2001 From: Jiashuo Li Date: Fri, 11 Dec 2020 14:15:48 +0800 Subject: [PATCH 4/4] Use status_tag_messages dict --- src/azure-cli-core/azure/cli/core/__init__.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py index c8f0d4828ff..7c22b0a89ee 100644 --- a/src/azure-cli-core/azure/cli/core/__init__.py +++ b/src/azure-cli-core/azure/cli/core/__init__.py @@ -80,14 +80,7 @@ def __init__(self, **kwargs): self.progress_controller = None - ref_message = "Reference and support levels: https://aka.ms/CLI_refstatus" - # Override the experimental message - import knack.experimental - knack.experimental.EXPERIMENTAL_MESSAGE = "{} is experimental and under development. " + ref_message - - # Override the preview message - import knack.preview - knack.preview.PREVIEW_MESSAGE = "{} is in preview and under development. " + ref_message + _configure_knack() def refresh_request_id(self): """Assign a new random GUID as x-ms-client-request-id @@ -860,3 +853,13 @@ def get_default_cli(): logging_cls=AzCliLogging, output_cls=AzOutputProducer, help_cls=AzCliHelp) + + +def _configure_knack(): + """Override consts defined in knack to make them Azure CLI-specific.""" + from knack.util import status_tag_messages + ref_message = "Reference and support levels: https://aka.ms/CLI_refstatus" + # Override the preview message + status_tag_messages['preview'] = "{} is in preview and under development. " + ref_message + # Override the experimental message + status_tag_messages['experimental'] = "{} is experimental and under development. " + ref_message