Merge remote-tracking branch 'other-repo/henrydai/ImplementCRUDforChangeState' into henrydai/implementChangeStateCRUD0901

Author: Henry Dai

src/change-state/azext_change_state/commands.py

@@ -8,9 +8,6 @@
 # pylint: disable=too-many-lines
 # pylint: disable=too-many-statements
 
-from azext_change_state import custom
-
-
 def load_command_table(self, _):  # pylint: disable=unused-argument
     from .custom import ChangeStateCreate, ChangeStateUpdate, ChangeStateDelete, ChangeStateShow
 

src/change-state/azext_change_state/custom.py

@@ -7,18 +7,40 @@
 
 # pylint: disable=too-many-lines
 # pylint: disable=too-many-statements
+# pylint: disable=protected-access
 
 from knack.log import get_logger
-from azure.cli.core.aaz import has_value, AAZAnyType, AAZListArg, AAZStrArg
-from azure.cli.core.aaz._arg_action import AAZArgActionOperations, AAZPromptInputOperation, _ELEMENT_APPEND_KEY
+from azure.cli.core.aaz import (
+    has_value,
+    AAZAnyType,
+    AAZListArg,
+    AAZStrArg,
+    AAZObjectType,
+    AAZStrType,
+    AAZListType,
+)
+from azure.cli.core.aaz._arg_action import (
+    AAZArgActionOperations,
+    AAZPromptInputOperation,
+    _ELEMENT_APPEND_KEY,
+)
 from azure.cli.core.azclierror import InvalidArgumentValueError
-from azext_change_state.aaz.latest.change_safety.change_state import Create as _ChangeStateCreate, Update as _ChangeStateUpdate, Show as _ChangeStateShow, Delete as _ChangeStateDelete
-from azure.cli.core.aaz import AAZObjectType, AAZStrType, AAZListType
+from azext_change_state.aaz.latest.change_safety.change_state import (
+    Create as _ChangeStateCreate,
+    Update as _ChangeStateUpdate,
+    Show as _ChangeStateShow,
+    Delete as _ChangeStateDelete,
+)
 
 
 logger = get_logger(__name__)
 
 
+def _build_any_type():
+    """Utility to satisfy schema_builder callsites while keeping lint happy."""
+    return AAZAnyType()
+
+
 def _inject_change_definition_into_content(content, ctx):
     """Attach the computed changeDefinition payload to the serialized request content."""
     change_definition_value = getattr(ctx.vars, "change_definition", None)
@@ -112,6 +134,7 @@ def process(item):
     else:
         process(data)
 
+
 def _custom_show_schema_builder():
     # Import the generated Show class
     from azext_change_state.aaz.latest.change_safety.change_state._show import Show as GeneratedShow
@@ -171,13 +194,22 @@ def pre_operations(self):
         # Build and set the changeDefinition with targets
         change_definition = self._build_change_definition()
         logger.debug("Final changeDefinition for create: %s", change_definition)
-        self.ctx.set_var('change_definition', change_definition, schema_builder=lambda: AAZAnyType())
+        self.ctx.set_var(
+            'change_definition',
+            change_definition,
+            schema_builder=_build_any_type,
+        )
 
     def _build_change_definition(self):
         """Build the changeDefinition object with targets"""
         targets = self._parse_targets(self._raw_targets)
         self._parsed_targets = targets
-        change_name = self.ctx.args.change_state_name.to_serialized_data() if has_value(self.ctx.args.change_state_name) else "Change Definition"
+        change_arg = self.ctx.args.change_state_name
+        change_name = (
+            change_arg.to_serialized_data()
+            if has_value(change_arg)
+            else "Change Definition"
+        )
 
         return {
             'kind': 'Targets',
@@ -250,13 +282,15 @@ def pre_instance_create(self):
             # The changeDefinition will be set in the content property of the HTTP operations
             pass
 
-    class ChangeStatesCreateOrUpdateAtSubscriptionLevel(_ChangeStateCreate.ChangeStatesCreateOrUpdateAtSubscriptionLevel):
+    class ChangeStatesCreateOrUpdateAtSubscriptionLevel(
+            _ChangeStateCreate.ChangeStatesCreateOrUpdateAtSubscriptionLevel):
         @property
         def content(self):
             content = super().content
             return _inject_change_definition_into_content(content, self.ctx)
 
-    class ChangeStatesCreateOrUpdate(_ChangeStateCreate.ChangeStatesCreateOrUpdate):
+    class ChangeStatesCreateOrUpdate(
+            _ChangeStateCreate.ChangeStatesCreateOrUpdate):
         @property
         def content(self):
             content = super().content
@@ -298,13 +332,22 @@ def pre_operations(self):
         if self._raw_targets:
             change_definition = self._build_change_definition()
             logger.debug("Final changeDefinition for update: %s", change_definition)
-            self.ctx.set_var('change_definition', change_definition, schema_builder=lambda: AAZAnyType())
+            self.ctx.set_var(
+                'change_definition',
+                change_definition,
+                schema_builder=_build_any_type,
+            )
 
     def _build_change_definition(self):
         """Build the changeDefinition object with targets"""
         targets = self._parse_targets(self._raw_targets)
         self._parsed_targets = targets
-        change_name = self.ctx.args.change_state_name.to_serialized_data() if has_value(self.ctx.args.change_state_name) else "Change Definition"
+        change_arg = self.ctx.args.change_state_name
+        change_name = (
+            change_arg.to_serialized_data()
+            if has_value(change_arg)
+            else "Change Definition"
+        )
 
         return {
             'kind': 'Targets',
@@ -337,7 +380,11 @@ def _parse_targets(self, raw_targets):
             target_entry = {}
             for segment in segments:
                 if '=' not in segment:
-                    raise InvalidArgumentValueError(f"Each --targets entry must be in key=value format. Invalid: '{segment}'")
+                    error_message = (
+                        "Each --targets entry must be in key=value format. "
+                        f"Invalid: '{segment}'"
+                    )
+                    raise InvalidArgumentValueError(error_message)
 
                 key, value = segment.split('=', 1)
                 key = key.strip()
@@ -380,25 +427,29 @@ def _output(self, *args, **kwargs):
         _inject_targets_into_result(result, self._parsed_targets)
         return result
 
-    def pre_instance_update(self):
+    def pre_instance_update(self, instance):
         """Set the changeDefinition in the request body before updating the instance"""
+        del instance
         change_definition = getattr(self.ctx.vars, 'change_definition', None)
         if change_definition is not None:
             # The changeDefinition will be set in the content property of the HTTP operations
             pass
 
-    class ChangeStatesCreateOrUpdateAtSubscriptionLevel(_ChangeStateUpdate.ChangeStatesCreateOrUpdateAtSubscriptionLevel):
+    class ChangeStatesCreateOrUpdateAtSubscriptionLevel(
+            _ChangeStateUpdate.ChangeStatesCreateOrUpdateAtSubscriptionLevel):
         @property
         def content(self):
             content = super().content
             return _inject_change_definition_into_content(content, self.ctx)
 
-    class ChangeStatesCreateOrUpdate(_ChangeStateUpdate.ChangeStatesCreateOrUpdate):
+    class ChangeStatesCreateOrUpdate(
+            _ChangeStateUpdate.ChangeStatesCreateOrUpdate):
         @property
         def content(self):
             content = super().content
             return _inject_change_definition_into_content(content, self.ctx)
 
+
 class ChangeStateShow(_ChangeStateShow):
     def _output(self, *args, **kwargs):
         result = super()._output(*args, **kwargs)
@@ -423,5 +474,6 @@ def on_200(self, session):
                 schema_builder=_custom_show_schema_builder
             )
 
+
 class ChangeStateDelete(_ChangeStateDelete):
     pass