{Core}: 'aaz': Copy default and blank values in arguments (#23422)

* copy default and blank values in arguments * add copy and deepcopy operations for AAZBlankArgValue and AAZUndefined
Azure · Aug 3, 2022 · 85d48c8 · 85d48c8
1 parent 5b6ff73
commit 85d48c8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/azure-cli-core/azure/cli/core/aaz/_arg.py b/src/azure-cli-core/azure/cli/core/aaz/_arg.py
@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 import abc
+import copy
 
 from azure.cli.core import azclierror
 from knack.arguments import CLICommandArgument, CaseInsensitiveList
@@ -115,7 +116,7 @@ def to_cmd_arg(self, name):
             required=self._required if self._default == AAZUndefined else False,
             help=self._help.get('short-summary', None),
             id_part=self._id_part,
-            default=self._default,
+            default=copy.deepcopy(self._default),
         )
         if self._arg_group:
             arg.arg_group = self._arg_group

diff --git a/src/azure-cli-core/azure/cli/core/aaz/_arg_action.py b/src/azure-cli-core/azure/cli/core/aaz/_arg_action.py
@@ -5,6 +5,7 @@
 
 # pylint: disable=protected-access
 
+import copy
 import os
 from argparse import Action
 from collections import OrderedDict
@@ -117,7 +118,7 @@ def format_data(cls, data):
         if data == AAZBlankArgValue:
             if cls._schema._blank == AAZUndefined:
                 raise AAZInvalidValueError("argument value cannot be blank")
-            data = cls._schema._blank
+            data = copy.deepcopy(cls._schema._blank)
 
         if isinstance(data, str):
             # transfer string into correct data
@@ -145,7 +146,7 @@ def setup_operations(cls, dest_ops, values, prefix_keys=None):
         if values is None:
             if cls._schema._blank == AAZUndefined:
                 raise AAZInvalidValueError("argument cannot be blank")
-            dest_ops.add(cls._schema._blank, *prefix_keys)
+            dest_ops.add(copy.deepcopy(cls._schema._blank), *prefix_keys)
         else:
             assert isinstance(values, list)
             for _, key_parts, value in cls.decode_values(values):
@@ -209,7 +210,7 @@ def format_data(cls, data):
         if data == AAZBlankArgValue:
             if cls._schema._blank == AAZUndefined:
                 raise AAZInvalidValueError("argument value cannot be blank")
-            data = cls._schema._blank
+            data = copy.deepcopy(cls._schema._blank)
 
         if data is None:
             if cls._schema._nullable:
@@ -236,7 +237,7 @@ def format_data(cls, data):
         if data == AAZBlankArgValue:
             if cls._schema._blank == AAZUndefined:
                 raise AAZInvalidValueError("argument value cannot be blank")
-            data = cls._schema._blank
+            data = copy.deepcopy(cls._schema._blank)
 
         if data is None:
             if cls._schema._nullable:
@@ -284,7 +285,7 @@ def setup_operations(cls, dest_ops, values, prefix_keys=None):
         if values is None:
             if cls._schema._blank == AAZUndefined:
                 raise AAZInvalidValueError("argument cannot be blank")
-            dest_ops.add(cls._schema._blank, *prefix_keys)
+            dest_ops.add(copy.deepcopy(cls._schema._blank), *prefix_keys)
         else:
             assert isinstance(values, list)
             ops = []
@@ -340,7 +341,7 @@ def format_data(cls, data):
         if data == AAZBlankArgValue:
             if cls._schema._blank == AAZUndefined:
                 raise AAZInvalidValueError("argument value cannot be blank")
-            data = cls._schema._blank
+            data = copy.deepcopy(cls._schema._blank)
 
         if data is None:
             if cls._schema._nullable:

diff --git a/src/azure-cli-core/azure/cli/core/aaz/_base.py b/src/azure-cli-core/azure/cli/core/aaz/_base.py
@@ -65,6 +65,12 @@ def __ne__(self, other):
     def __bool__(self):
         return False
 
+    def __copy__(self):
+        return self
+
+    def __deepcopy__(self, *args, **kwargs):
+        return self
+
     def __lt__(self, other):
         self._cmp_err(other, '<')
 
@@ -119,6 +125,12 @@ def __ne__(self, other):
     def __bool__(self):
         return False
 
+    def __copy__(self):
+        return self
+
+    def __deepcopy__(self, *args, **kwargs):
+        return self
+
     def __lt__(self, other):
         self._cmp_err(other, '<')