Merge branch 'main' of https://github.com/Azure/azure-cli into brett/untagged-manifest-update

Author: bbishopMSFT

.github/policies/resourceManagement.yml

@@ -235,6 +235,7 @@ configuration:
             mentionees:
             - mojayara
             - jportugal0
+            - pkrishnanms
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2093,7 +2094,8 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - Tanmayeekamath
+            - anishtrakru
+            - derekbekoe
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2395,7 +2397,8 @@ configuration:
             mentionees:
             - RandalliLama
             - schaabs
-            - jlichwa
+            - chen-karen
+            - chandanrr
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -4245,7 +4248,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - wonner
+            - wanyang7
             - v-yanjungao
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False

linter_exclusions.yml

@@ -728,6 +728,14 @@ appconfig update:
     encryption_key_version:
       rule_exclusions:
       - option_length_too_long
+    enable_arm_private_network_access:
+      rule_exclusions:
+      - option_length_too_long
+appconfig create:
+  parameters:
+    enable_arm_private_network_access:
+      rule_exclusions:
+      - option_length_too_long
 appservice ase create:
   parameters:
     force_network_security_group:

src/azure-cli-core/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.67.0
+++++++
+* PREVIEW: Support managed identity on Azure Arc-enabled Windows server (#29187)
+
 2.66.0
 ++++++
 * `aaz`: Support managed identity (#29953)

src/azure-cli-core/azure/cli/core/__init__.py

@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
 
-__version__ = "2.66.0"
+__version__ = "2.67.0"
 
 import os
 import sys

src/azure-cli-core/azure/cli/core/aaz/_field_value.py

@@ -478,7 +478,7 @@ def to_serialized_data(self, processor=None, **kwargs):
 
         result = self._build_identity(calculate_data, result)
 
-        if not result:
+        if not result and calculate_data.get("action", None) == "remove":
             result = {"type": "None"}  # empty identity
 
         if not result and self._is_patch:

src/azure-cli-core/azure/cli/core/breaking_change.py

@@ -13,7 +13,7 @@
 
 logger = get_logger()
 
-NEXT_BREAKING_CHANGE_RELEASE = '2.67.0'
+NEXT_BREAKING_CHANGE_RELEASE = '2.73.0'
 DEFAULT_BREAKING_CHANGE_TAG = '[Breaking Change]'
 
 

src/azure-cli-core/azure/cli/core/extension/__init__.py

@@ -380,3 +380,9 @@ def is_stable_from_metadata(item):
     return not (item["metadata"].get(EXT_METADATA_ISPREVIEW, False) or
                 item["metadata"].get(EXT_METADATA_ISEXPERIMENTAL, False) or
                 is_preview_from_semantic_version(item["metadata"]['version']))
+
+
+def is_preview_from_metadata(item):
+    return bool(item["metadata"].get(EXT_METADATA_ISPREVIEW, False) or
+                item["metadata"].get(EXT_METADATA_ISEXPERIMENTAL, False) or
+                is_preview_from_semantic_version(item["metadata"]['version']))

src/azure-cli-core/azure/cli/core/extension/_resolve.py

@@ -5,7 +5,8 @@
 from packaging.version import parse
 from typing import Callable, List, NamedTuple, Union
 
-from azure.cli.core.extension import ext_compat_with_cli, WHEEL_INFO_RE, is_stable_from_metadata
+from azure.cli.core.extension import (ext_compat_with_cli, WHEEL_INFO_RE,
+                                      is_stable_from_metadata, is_preview_from_metadata)
 from azure.cli.core.extension._index import get_index_extensions
 
 from knack.log import get_logger
@@ -104,6 +105,28 @@ def resolve_from_index(extension_name, cur_version=None, index_url=None, target_
     if not candidates:
         raise NoExtensionCandidatesError(f"No extension found with name '{extension_name}'")
 
+    if allow_preview is None:
+        # default value of allow-preview changed from true to false
+        # and the following part deals with two influenced scenariors if user does not specify allow-preview
+        # 1. if extension module does not have any stable version, set allow-preview=True and display warning message to
+        #   unblock those extension module user
+        # 2. if extension module has a later preview version than stable one, dispaly a warning message to user
+        #   indicating how to try the newer preview one, but allow-preview is still set to be False by default
+        allow_preview = False
+        stable_candidates = list(filter(is_stable_from_metadata, candidates))
+        preview_candidates = list(filter(is_preview_from_metadata, candidates))
+        if len(stable_candidates) == 0:
+            logger.warning("No stable version of '%s' to install. Preview versions allowed.", extension_name)
+            allow_preview = True
+        elif len(preview_candidates) != 0:
+            max_preview_item = max(preview_candidates, key=lambda x: parse(x['metadata']['version']))
+            max_stable_item = max(stable_candidates, key=lambda x: parse(x['metadata']['version']))
+            if parse(max_preview_item['metadata']['version']) > parse(max_stable_item['metadata']['version']):
+                logger.warning("Extension '%s' has a later preview version to install, add `--allow-preview True` "
+                               "to try preview version.", extension_name)
+        else:
+            logger.info("No preview versions need to be tried.")
+
     # Helper to curry predicate functions
     def list_filter(f):
         return lambda cs: list(filter(f, cs))
@@ -120,7 +143,7 @@ def list_filter(f):
             _ExtensionFilter(
                 filter=list_filter(is_stable_from_metadata),
                 on_empty_results_message=f"No suitable stable version of '{extension_name}' to install. "
-                                         f"Add `--allow-preview` to try preview versions"
+                                         f"Add `--allow-preview True` to try preview versions"
             )]
 
     if target_version:

src/azure-cli-core/azure/cli/core/extension/dynamic_install.py

@@ -110,15 +110,15 @@ def _get_extension_run_after_dynamic_install_config(cli_ctx):
 
 
 def _get_extension_allow_preview_install_config(cli_ctx):
-    default_value = True
-    if cli_ctx and cli_ctx.config.get('extension', 'dynamic_install_allow_preview', None) is None:
-        logger.warning("Preview version of extension is enabled by default for extension installation now. "
-                       "Will be disabled in future release. ")
-        logger.warning("Please run 'az config set extension.dynamic_install_allow_preview=true or false' "
-                       "to config it specifically. ")
-    dynamic_install_allow_preview = cli_ctx.config.getboolean('extension',
-                                                              'dynamic_install_allow_preview',
-                                                              default_value) if cli_ctx else default_value
+    dynamic_install_allow_preview = None
+    if cli_ctx:
+        if cli_ctx.config.get('extension', 'dynamic_install_allow_preview', None) is None:
+            logger.warning("Preview version of extension is disabled by default for extension installation, "
+                           "enabled for modules without stable versions. ")
+            logger.warning("Please run 'az config set extension.dynamic_install_allow_preview=true or false' "
+                           "to config it specifically. ")
+        else:
+            dynamic_install_allow_preview = cli_ctx.config.getboolean('extension', 'dynamic_install_allow_preview')
     return dynamic_install_allow_preview
 
 

src/azure-cli-core/azure/cli/core/extension/operations.py

@@ -306,12 +306,6 @@ def check_version_compatibility(azext_metadata):
 def add_extension(cmd=None, source=None, extension_name=None, index_url=None, yes=None,  # pylint: disable=unused-argument, too-many-statements
                   pip_extra_index_urls=None, pip_proxy=None, system=None,
                   version=None, cli_ctx=None, upgrade=None, allow_preview=None):
-    if allow_preview is None:
-        logger.warning("Default enabled including preview versions for extension installation now. "
-                       "Disabled in future release. "
-                       "Use '--allow-preview true' to enable it specifically if needed. "
-                       "Use '--allow-preview false' to install stable version only. ")
-        allow_preview = True
     ext_sha256 = None
     update_to_latest = version == 'latest' and not source
 
@@ -405,12 +399,6 @@ def show_extension(extension_name):
 
 
 def update_extension(cmd=None, extension_name=None, index_url=None, pip_extra_index_urls=None, pip_proxy=None, allow_preview=None, cli_ctx=None, version=None, download_url=None, ext_sha256=None):
-    if allow_preview is None:
-        logger.warning("Default enabled including preview versions for extension installation now. "
-                       "Disabled in future release. "
-                       "Use '--allow-preview true' to enable it specifically if needed. "
-                       "Use '--allow-preview false' to install stable version only. ")
-        allow_preview = True
     try:
         cmd_cli_ctx = cli_ctx or cmd.cli_ctx
         ext = get_extension(extension_name, ext_type=WheelExtension)