fix ConnectedContainerAppNotSupportIdentity and ex overwrite to None …

…by mistake
Azure · Oct 6, 2024 · 3e3e148 · 3e3e148
1 parent 490eb34
commit 3e3e148
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/containerapp/azext_containerapp/_client_factory.py b/src/containerapp/azext_containerapp/_client_factory.py
@@ -15,13 +15,12 @@ def _polish_bad_errors(ex):
         import json
         try:
             content = json.loads(ex.response.content)
-            detail = None
             if 'message' in content:
                 detail = content['message']
+                ex = CLIInternalError(detail)
             elif 'Message' in content:
                 detail = content['Message']
-
-            ex = CLIInternalError(detail)
+                ex = CLIInternalError(detail)
         except Exception:  # pylint: disable=broad-except
             pass
         if no_throw:

diff --git a/src/containerapp/azext_containerapp/containerapp_decorator.py b/src/containerapp/azext_containerapp/containerapp_decorator.py
@@ -691,6 +691,11 @@ def set_up_system_assigned_identity_as_default_if_using_acr(self):
                 return
 
             if self.get_argument_registry_identity() is None and self.get_argument_registry_user() is None and self.get_argument_registry_pass() is None:
+                # Connected ContainerApp Not Support Identity
+                parsed_managed_env = parse_resource_id(self.get_argument_managed_env())
+                if "resource_type" in parsed_managed_env:
+                    if parsed_managed_env["resource_type"].lower() == CONNECTED_ENVIRONMENT_RESOURCE_TYPE.lower():
+                        return
                 self.set_argument_registry_identity('system')
 
     def parent_construct_payload(self):