Merge branch 'main' of https://github.com/Azure/azure-cli-extensions into sralluri-cli-ext-neon-ga-release

Author: Srinivas Alluri

.github/policies/resourceManagement.yml

@@ -1197,9 +1197,11 @@ configuration:
         - mentionUsers:
             mentionees:
             - toddysm
-            - luisdlp
             - northtyphoon
+            - luisdlp
             - terencet-dev
+            - shizhMSFT
+            - JXavierMSFT
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:

scripts/ci/release_version_cal.py

@@ -220,15 +220,16 @@ def extract_module_metadata_update_info(mod_update_info, mod):
     """
     mod_update_info["meta_updated"] = False
     # metadata is required for this task, (and also az extension *)
-    last_meta_data = find_module_metadata_of_latest_version(mod).get("metadata", {})
+    pre_release = find_module_metadata_of_latest_version(mod)
+    last_meta_data = pre_release.get("metadata", {}) if pre_release else None
     current_meta_data = find_module_metadata_of_current_version(mod)
     if not current_meta_data:
         raise Exception(f"Please check {mod}: azext_metadata.json file")
     if not last_meta_data:
         if current_meta_data.get("azext.isPreview", None):
             mod_update_info["meta_updated"] = True
             mod_update_info["preview_tag_diff"] = "add"
-            return
+        return
     if last_meta_data.get("azext.isExperimental", False) and not current_meta_data.get("azext.isExperimental", False):
         mod_update_info["exp_tag_diff"] = "remove"
         mod_update_info["meta_updated"] = True
@@ -249,16 +250,18 @@ def extract_module_version_info(mod_update_info, mod):
     print("next_version_pre_tag: ", next_version_pre_tag)
     print("next_version_segment_tag: ", next_version_segment_tag)
     pkg_name = get_mod_package_name(mod)
+    print(f"get pkg name: {pkg_name} for mod: {mod}")
     pre_release = get_module_metadata_of_max_version(pkg_name)
-    print(f"Get prerelease info for mod: {mod} as below:")
-    print(json.dumps(pre_release))
     clean_mod_of_azdev(mod)
-    print("Start generating base metadata")
-    install_mod_of_last_version(pkg_name, pre_release)
-    base_meta_folder = os.path.join(cli_ext_path, base_meta_path)
-    gen_metadata_from_whl(pkg_name, base_meta_folder)
-    remove_mod_of_last_version(pkg_name)
-    print("End generating base metadata")
+    if pre_release:
+        print(f"Get prerelease info for mod: {mod} as below:")
+        print(json.dumps(pre_release))
+        print("Start generating base metadata")
+        install_mod_of_last_version(pkg_name, pre_release)
+        base_meta_folder = os.path.join(cli_ext_path, base_meta_path)
+        gen_metadata_from_whl(pkg_name, base_meta_folder)
+        remove_mod_of_last_version(pkg_name)
+        print("End generating base metadata")
     base_meta_file = os.path.join(cli_ext_path, base_meta_path, "az_" + pkg_name + "_meta.json")
     diff_meta_file = os.path.join(cli_ext_path, diff_meta_path, "az_" + mod + "_meta.json")
     if not os.path.exists(base_meta_file) and not os.path.exists(diff_meta_file):

src/aks-preview/HISTORY.rst

@@ -11,6 +11,11 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
+
+
+14.0.0b2
++++++++
+* Update the `disable-egress-gateway` subcommand to fix `--help` output for the `az aks mesh` command.
 * Vendor new SDK and bump API version to 2025-01-02-preview.
 * Modify behavior for `--nodepool-initialization-taints` to ignore taints with hard effects on node pools with system mode when creating or updating a cluster.
 

src/aks-preview/azext_aks_preview/_help.py

@@ -3106,7 +3106,7 @@
 
 helps['aks mesh disable-egress-gateway'] = """
     type: command
-    short-summary: Disable an Azure Service Mesh ingress gateway.
+    short-summary: Disable an Azure Service Mesh egress gateway.
     long-summary: This command disables an Azure Service Mesh egress gateway in given cluster.
     parameters:
       - name: --istio-eg-gtw-name --istio-egressgateway-name

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

@@ -2402,6 +2402,13 @@ def _handle_egress_gateways_asm(self, new_profile: ServiceMeshProfile) -> Tuple[
                             f'Egress gateway {istio_egressgateway_name} '
                             f'in namespace {istio_egressgateway_namespace} is already disabled.'
                         )
+                    if egress.enabled and enable_egress_gateway:
+                        if egress.gateway_configuration_name == gateway_configuration_name:
+                            raise ArgumentUsageError(
+                                f'Egress gateway {istio_egressgateway_name} '
+                                f'in namespace {istio_egressgateway_namespace} is already enabled '
+                                f'with gateway configuration name {gateway_configuration_name}.'
+                            )
                     egress.enabled = enable_egress_gateway
                     # only update gateway configuration name for enabled egress gateways
                     if enable_egress_gateway:

src/aks-preview/setup.py

@@ -9,7 +9,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "14.0.0b1"
+VERSION = "14.0.0b2"
 
 CLASSIFIERS = [
     "Development Status :: 4 - Beta",

src/amg/HISTORY.rst

@@ -131,3 +131,9 @@ Release History
 2.5.5
 ++++++
 * `az grafana notification-channel test`: fix issue with test output parsing
+
+2.6.0
+++++++
+* `az grafana integrations monitor add`: support optional subscription id argument for multi-subscription scenarios
+* `az grafana integrations monitor delete`: support optional subscription id argument for multi-subscription scenarios
+* `az grafana notification-channel`: deprecate command group as part of Grafana legacy alerting deprecation

src/amg/azext_amg/_help.py

@@ -180,7 +180,7 @@
 helps['grafana notification-channel'] = """
     type: group
     short-summary: Commands to manage notification channels of an instance.
-    long-summary: As part of legacy alerting, this command group will be deprecated in a future release
+    long-summary: As part of Grafana legacy alerting, this command group only works with Grafana 10 and below.
 """
 
 helps['grafana notification-channel list'] = """

src/amg/azext_amg/_params.py

@@ -127,4 +127,5 @@ def load_arguments(self, _):
     with self.argument_context("grafana integrations monitor") as c:
         c.argument("monitor_name", help="name of the Azure Monitor workspace")
         c.argument("monitor_resource_group_name", options_list=["--monitor-resource-group-name", "--monitor-rg-name"], help="name of the resource group of the Azure Monitor workspace")
+        c.argument("monitor_subscription_id", options_list=["--monitor-subscription-id", "--monitor-sub-id"], help="subscription id of the Azure Monitor workspace. Uses the current subscription id if not specified")
         c.argument("skip_role_assignments", options_list=["-s", "--skip-role-assignments"], arg_type=get_three_state_flag(), help="skip assigning the appropriate role on the Azure Monitor workspace to let Grafana read data from it. Default: false")

src/amg/azext_amg/commands.py

@@ -34,7 +34,7 @@ def load_command_table(self, _):
         g.custom_command('query', 'query_data_source')
         g.custom_command('update', 'update_data_source')
 
-    with self.command_group('grafana notification-channel') as g:
+    with self.command_group('grafana notification-channel', deprecate_info=self.deprecate()) as g:
         g.custom_command('list', 'list_notification_channels')
         g.custom_show_command('show', 'show_notification_channel')
         g.custom_command('create', 'create_notification_channel')