Merge remote-tracking branch 'azure/dev' into auth

Author: jiasli

.githooks/pre-commit

@@ -1,13 +1,24 @@
 #!/usr/bin/env sh
-":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-commit.ps1; else sh .githooks/pre-commit.sh; fi; exit $?     # Try PowerShell Core first, then sh on Unix
-":" //; exit                         # Skip rest on Unix
 
-@echo off
-powershell -NoProfile -Command "if (Get-Command powershell -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
-if %errorlevel% equ 0 (
-    powershell -ExecutionPolicy Bypass -File .githooks\pre-commit.ps1
-) else (
-    echo Error: PowerShell is not available. Please install PowerShell.
-    exit /b 1
-)
-exit /b %errorlevel%
+# Check if running in Windows
+if [ -n "$COMSPEC" ]; then
+    # Windows section - Execute directly with PowerShell
+    powershell -NoProfile -Command "
+        if (Get-Command powershell -ErrorAction SilentlyContinue) {
+            Write-Host 'PowerShell found, executing pre-commit.ps1...'
+            powershell -ExecutionPolicy Bypass -File '.githooks\pre-commit.ps1'
+            exit $LASTEXITCODE
+        } else {
+            Write-Host 'Error: PowerShell is not available. Please install PowerShell.'
+            exit 1
+        }
+    "
+    echo "Exiting with status $?"
+    exit $?
+else
+    # Unix-like system section
+    echo "Unix-like system found, executing pre-commit.sh..."
+    sh .githooks/pre-commit.sh
+    echo "Exiting with status $?"
+    exit $?
+fi

.githooks/pre-push

@@ -1,13 +1,24 @@
 #!/usr/bin/env sh
-":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-push.ps1; else sh .githooks/pre-push.sh; fi; exit $?     # Try PowerShell Core first, then sh on Unix
-":" //; exit                         # Skip rest on Unix
 
-@echo off
-powershell -NoProfile -Command "if (Get-Command powershell -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
-if %errorlevel% equ 0 (
-    powershell -ExecutionPolicy Bypass -File .githooks\pre-push.ps1
-) else (
-    echo Error: PowerShell is not available. Please install PowerShell.
-    exit /b 1
-)
-exit /b %errorlevel%
+# Check if running in Windows
+if [ -n "$COMSPEC" ]; then
+    # Windows section - Execute directly with PowerShell
+    powershell -NoProfile -Command "
+        if (Get-Command powershell -ErrorAction SilentlyContinue) {
+            Write-Host 'PowerShell found, executing pre-push.ps1...'
+            powershell -ExecutionPolicy Bypass -File '.githooks\pre-push.ps1'
+            exit $LASTEXITCODE
+        } else {
+            Write-Host 'Error: PowerShell is not available. Please install PowerShell.'
+            exit 1
+        }
+    "
+    echo "Exiting with status $?"
+    exit $?
+else
+    # Unix-like system section
+    echo "Unix-like system found, executing pre-push.sh..."
+    sh .githooks/pre-push.sh
+    echo "Exiting with status $?"
+    exit $?
+fi

.githooks/pre-push.ps1

@@ -45,8 +45,10 @@ if ($mergeBase -ne $upstreamHead) {
     Write-Host "Would you like to automatically rebase and setup? [Y/n]" -ForegroundColor Yellow
 
     try {
-        $reader = [System.IO.StreamReader]::new("CON")
-        $input = $reader.ReadLine()
+        $input = Read-Host
+        if ([string]::IsNullOrEmpty($input)) {
+            $input = "Y"
+        }
     } catch {
         Write-Host "Error reading input. Aborting push..." -ForegroundColor Red
         exit 1

src/azure-cli-core/HISTORY.rst

@@ -3,6 +3,13 @@
 Release History
 ===============
 
+2.70.0
+++++++
+* Resolve CVE-2024-12797 (#30816)
+* Drop Track 1 SDK authentication (#29631)
+* `aaz`: Add cross tenants control for `AAZResourceIdArgFormat` (#30817)
+* `aaz`: Support `Any` type with full value shorthand syntax allowed (#30868)
+
 2.69.0
 ++++++
 * `aaz`: Support simple type parsed from string value (#30623)

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

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

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

@@ -12,7 +12,8 @@
 from ._arg import AAZArgumentsSchema, AAZArgEnum, AAZStrArg, AAZIntArg, AAZObjectArg, AAZDictArg, \
     AAZFreeFormDictArg, AAZFloatArg, AAZBaseArg, AAZBoolArg, AAZListArg, AAZResourceGroupNameArg, \
     AAZResourceLocationArg, AAZResourceIdArg, AAZSubscriptionIdArg, AAZUuidArg, AAZDateArg, AAZTimeArg, \
-    AAZDateTimeArg, AAZDurationArg, AAZFileArg, AAZPasswordArg, AAZPaginationTokenArg, AAZPaginationLimitArg
+    AAZDateTimeArg, AAZDurationArg, AAZFileArg, AAZPasswordArg, AAZPaginationTokenArg, AAZPaginationLimitArg, \
+    AAZAnyTypeArg
 from ._arg_fmt import AAZStrArgFormat, AAZIntArgFormat, AAZFloatArgFormat, AAZBoolArgFormat, AAZObjectArgFormat, \
     AAZDictArgFormat, AAZFreeFormDictArgFormat, AAZListArgFormat, AAZResourceLocationArgFormat, \
     AAZResourceIdArgFormat, AAZSubscriptionIdArgFormat, AAZUuidFormat, AAZDateFormat, AAZTimeFormat, \
@@ -22,7 +23,7 @@
 from ._command import AAZCommand, AAZWaitCommand, AAZCommandGroup, \
     register_callback, register_command, register_command_group, load_aaz_command_table, link_helper
 from ._field_type import AAZIntType, AAZFloatType, AAZStrType, AAZBoolType, AAZDictType, AAZFreeFormDictType, \
-    AAZListType, AAZObjectType, AAZIdentityObjectType
+    AAZListType, AAZObjectType, AAZIdentityObjectType, AAZAnyType
 from ._operation import AAZHttpOperation, AAZJsonInstanceUpdateOperation, AAZGenericInstanceUpdateOperation, \
     AAZJsonInstanceDeleteOperation, AAZJsonInstanceCreateOperation
 from ._prompt import AAZPromptInput, AAZPromptPasswordInput

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

@@ -13,11 +13,11 @@
 from knack.util import status_tag_messages
 from knack.log import get_logger
 
-from ._arg_action import AAZSimpleTypeArgAction, AAZObjectArgAction, AAZDictArgAction, AAZFreeFormDictArgAction, \
-    AAZListArgAction, AAZGenericUpdateAction, AAZGenericUpdateForceStringAction
+from ._arg_action import AAZSimpleTypeArgAction, AAZObjectArgAction, AAZDictArgAction, \
+    AAZListArgAction, AAZGenericUpdateAction, AAZGenericUpdateForceStringAction, AAZAnyTypeArgAction
 from ._base import AAZBaseType, AAZUndefined
 from ._field_type import AAZObjectType, AAZStrType, AAZIntType, AAZBoolType, AAZFloatType, AAZListType, AAZDictType, \
-    AAZSimpleType, AAZFreeFormDictType
+    AAZSimpleType, AAZFreeFormDictType, AAZAnyType
 from ._field_value import AAZObject
 from ._arg_fmt import AAZObjectArgFormat, AAZListArgFormat, AAZDictArgFormat, AAZFreeFormDictArgFormat, \
     AAZSubscriptionIdArgFormat, AAZResourceLocationArgFormat, AAZResourceIdArgFormat, AAZUuidFormat, AAZDateFormat, \
@@ -356,6 +356,28 @@ def _type_in_help(self):
         return "Float"
 
 
+class AAZAnyTypeArg(AAZBaseArg, AAZAnyType):
+
+    def _build_cmd_action(self):
+        class Action(AAZAnyTypeArgAction):
+            _schema = self  # bind action class with current schema
+        return Action
+
+    def to_cmd_arg(self, name, **kwargs):
+        from ._help import shorthand_help_messages
+        arg = super().to_cmd_arg(name, **kwargs)
+        short_summary = arg.type.settings.get('help', None) or ''
+        if short_summary:
+            short_summary += '  '
+        short_summary += shorthand_help_messages['short-summary-anytype']
+        arg.help = short_summary
+        return arg
+
+    @property
+    def _type_in_help(self):
+        return "Any"
+
+
 class AAZCompoundTypeArg(AAZBaseArg):
 
     @abc.abstractmethod
@@ -427,30 +449,15 @@ def _type_in_help(self):
         return f"Dict<String,{self.Element._type_in_help}>"
 
 
-class AAZFreeFormDictArg(AAZBaseArg, AAZFreeFormDictType):
+# Warning: This type should not be used any more, the new aaz-dev-tools only use AAZDictType with AAZAnyType
+class AAZFreeFormDictArg(AAZDictArg, AAZFreeFormDictType):
 
     def __init__(self, fmt=None, **kwargs):
         fmt = fmt or AAZFreeFormDictArgFormat()
         super().__init__(fmt=fmt, **kwargs)
-
-    def to_cmd_arg(self, name, **kwargs):
-        arg = super().to_cmd_arg(name, **kwargs)
-        short_summary = arg.type.settings.get('help', None) or ''
-        if short_summary:
-            short_summary += '  '
-        short_summary += "Support json-file and yaml-file."
-        arg.help = short_summary
-        return arg
-
-    def _build_cmd_action(self):
-        class Action(AAZFreeFormDictArgAction):
-            _schema = self  # bind action class with current schema
-
-        return Action
-
-    @property
-    def _type_in_help(self):
-        return "Dict<String, Any>"
+        # for backward compatible, support nullable value here for AAZFreeFormDictArg,
+        # from the new code gen tools, it will avoid using AAZFreeFormDictArg
+        self._element = AAZAnyTypeArg(nullable=True)
 
 
 class AAZListArg(AAZCompoundTypeArg, AAZListType):

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

@@ -150,6 +150,14 @@ def format_data(cls, data):
                 return AAZPromptInputOperation(prompt=cls._schema._blank, action_cls=cls)
             data = copy.deepcopy(cls._schema._blank)
 
+        if data is None:
+            if cls._schema._nullable:
+                return data
+            raise AAZInvalidValueError("field is not nullable")
+
+        if cls._schema.DataType == str and isinstance(data, (int, bool, float)):
+            data = str(data).lower()  # convert to json raw values
+
         if isinstance(data, str):
             # transfer string into correct data
             if cls._schema.enum:
@@ -159,12 +167,86 @@ def format_data(cls, data):
         if isinstance(data, cls._schema.DataType):
             return data
 
+        if isinstance(data, int) and cls._schema.DataType == float:
+            return data
+
+        raise AAZInvalidValueError(f"{cls._schema.DataType} type value expected, got '{data}'({type(data)})")
+
+
+class AAZAnyTypeArgAction(AAZArgAction):
+
+    @classmethod
+    def setup_operations(cls, dest_ops, values, prefix_keys=None):
+        if prefix_keys is None:
+            prefix_keys = []
+        if values is None:
+            data = AAZBlankArgValue  # use blank data when values string is None
+        else:
+            if isinstance(values, list):
+                assert prefix_keys  # the values will be input as an list when parse singular option of a list argument
+                if len(values) != 1:
+                    raise AAZInvalidValueError(f"only support 1 value, got {len(values)}: {values}")
+                values = values[0]
+
+            if isinstance(values, str) and len(values) > 0:
+                try:
+                    data = cls.decode_str(values)
+                except AAZShowHelp as aaz_help:
+                    aaz_help.schema = cls._schema
+                    raise aaz_help
+            else:
+                data = values
+        data = cls.format_data(data)
+        dest_ops.add(data, *prefix_keys)
+
+    @classmethod
+    def decode_str(cls, value):
+        from azure.cli.core.util import get_file_json, shell_safe_json_parse, get_file_yaml
+
+        # check if the value is a partial value
+        key, _, v = cls._str_parser.split_partial_value(value)
+        if key is not None:
+            raise AAZInvalidValueError(
+                "AnyType args only support full value shorthand syntax, "
+                "please don't use partial value shorthand syntax. "
+                "If it's a simple string, please wrap it with single quotes.")
+
+        # read from file
+        path = os.path.expanduser(value)
+        if os.path.exists(path):
+            if path.endswith('.yml') or path.endswith('.yaml'):
+                # read from yaml file
+                v = get_file_yaml(path)
+            else:
+                # read from json file
+                v = get_file_json(path, preserve_order=True)
+        else:
+            try:
+                v = cls._str_parser(value)
+            except AAZInvalidShorthandSyntaxError as shorthand_ex:
+                try:
+                    v = shell_safe_json_parse(value, True)
+                except Exception as ex:
+                    logger.debug(ex)  # log parse json failed expression
+                    raise shorthand_ex  # raise shorthand syntax exception
+        return v
+
+    @classmethod
+    def format_data(cls, data):
+        if data == AAZBlankArgValue:
+            if cls._schema._blank == AAZUndefined:
+                raise AAZInvalidValueError("argument value cannot be blank")
+            if isinstance(cls._schema._blank, AAZPromptInput):
+                # Postpone the prompt input when apply the operation.
+                # In order not to break the logic of displaying help or validating other parameters.
+                return AAZPromptInputOperation(prompt=cls._schema._blank, action_cls=cls)
+            data = copy.deepcopy(cls._schema._blank)
+
         if data is None:
             if cls._schema._nullable:
                 return data
             raise AAZInvalidValueError("field is not nullable")
-
-        raise AAZInvalidValueError(f"{cls._schema.DataType} type value expected, got '{data}'({type(data)})")
+        return data
 
 
 class AAZCompoundTypeArgAction(AAZArgAction):  # pylint: disable=abstract-method
@@ -245,7 +327,7 @@ def _decode_value(cls, schema, value):  # pylint: disable=unused-argument
             # simple type
             v = cls._str_parser(value, is_simple=True)
         else:
-            # compound type
+            # compound type or any type
             # read from file
             path = os.path.expanduser(value)
             if os.path.exists(path):
@@ -264,7 +346,6 @@ def _decode_value(cls, schema, value):  # pylint: disable=unused-argument
                     except Exception as ex:
                         logger.debug(ex)  # log parse json failed expression
                         raise shorthand_ex  # raise shorthand syntax exception
-
         return v
 
 
@@ -324,52 +405,6 @@ def format_data(cls, data):
         raise AAZInvalidValueError(f"dict type value expected, got '{data}'({type(data)})")
 
 
-class AAZFreeFormDictArgAction(AAZSimpleTypeArgAction):
-
-    @classmethod
-    def decode_str(cls, value):
-        from azure.cli.core.util import get_file_json, shell_safe_json_parse, get_file_yaml
-
-        if len(value) == 0:
-            # the express "a=" will return the blank value of schema 'a'
-            return AAZBlankArgValue
-
-        path = os.path.expanduser(value)
-        if os.path.exists(path):
-            if path.endswith('.yml') or path.endswith('.yaml'):
-                # read from yaml file
-                v = get_file_yaml(path)
-            else:
-                # read from json file
-                v = get_file_json(path, preserve_order=True)
-        else:
-            try:
-                v = shell_safe_json_parse(value, True)
-            except Exception as ex:
-                logger.debug(ex)  # log parse json failed expression
-                raise
-        return v
-
-    @classmethod
-    def format_data(cls, data):
-        if data == AAZBlankArgValue:
-            if cls._schema._blank == AAZUndefined:
-                raise AAZInvalidValueError("argument value cannot be blank")
-            assert not isinstance(cls._schema._blank, AAZPromptInput), "Prompt input is not supported in " \
-                                                                       "FreeFormDict args."
-            data = copy.deepcopy(cls._schema._blank)
-
-        if isinstance(data, dict):
-            return data
-
-        if data is None:
-            if cls._schema._nullable:
-                return data
-            raise AAZInvalidValueError("field is not nullable")
-
-        raise AAZInvalidValueError(f"dict type value expected, got '{data}'({type(data)})")
-
-
 class AAZListArgAction(AAZCompoundTypeArgAction):
 
     def __call__(self, parser, namespace, values, option_string=None):