[Containerapp] Fix #28553: az containerapp exec: Fix the error of inappropriate ioctl for device (#28759)

Author: Greedygre

src/azure-cli/azure/cli/command_modules/containerapp/_ssh_utils.py

@@ -4,7 +4,6 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=logging-fstring-interpolation
 
-import os
 import sys
 import time
 import threading
@@ -151,7 +150,8 @@ def _send_stdin(connection: WebSocketConnection, getch_fn):
 
 
 def _resize_terminal(connection: WebSocketConnection):
-    size = os.get_terminal_size()
+    from shutil import get_terminal_size
+    size = get_terminal_size()
     if connection.is_connected:
         connection.send(b"".join([SSH_TERM_RESIZE_PREFIX,
                                   f'{{"Width": {size.columns}, '

src/azure-cli/azure/cli/command_modules/containerapp/_validators.py

@@ -7,10 +7,10 @@
 import re
 from azure.cli.core.azclierror import (ValidationError, ResourceNotFoundError, InvalidArgumentValueError,
                                        MutuallyExclusiveArgumentError)
-from msrestazure.tools import is_valid_resource_id
+from msrestazure.tools import is_valid_resource_id, parse_resource_id
 from knack.log import get_logger
 
-from ._clients import ContainerAppClient
+from ._clients import ContainerAppClient, ManagedEnvironmentClient
 from ._ssh_utils import ping_container_app
 from ._utils import safe_get, is_registry_msi_system
 from ._constants import ACR_IMAGE_SUFFIX, LOG_TYPE_SYSTEM
@@ -148,6 +148,31 @@ def validate_allow_insecure(namespace):
                 raise ValidationError("Usage error: --allow-insecure is not supported for TCP ingress")
 
 
+def _ping_containerapp_if_need(cmd, app) -> (bool, str):
+    # if container app has no ingress or is internal, not need to ping
+    if safe_get(app, "properties", "configuration", "ingress") is None or safe_get(app, "properties", "configuration", "ingress", "external") is False:
+        return False, None
+
+    parsed_env = parse_resource_id(safe_get(app, "properties", "environmentId"))
+    env_name = parsed_env['name']
+    env_rg = parsed_env['resource_group']
+    env = ManagedEnvironmentClient.show(cmd, env_rg, env_name)
+    # if environment is internal, not need to ping
+    if safe_get(env, "properties", "vnetConfiguration", "internal") is True:
+        return False, None
+
+    try:
+        # ping containerapp to activate its replica
+        ping_container_app(app)  # needed to get an alive replica
+    except Exception as ex:  # pylint: disable=broad-except
+        warning_message = f"Error encountered while attempting to ping container app.\n" \
+                          f"Error message: '{str(ex)}'\n" \
+                          f"Please ensure there is an alive replica. "
+        return True, warning_message
+
+    return False, None
+
+
 def _set_ssh_defaults(cmd, namespace):
     app = ContainerAppClient.show(cmd, namespace.resource_group_name, namespace.name)
     if not app:
@@ -158,16 +183,14 @@ def _set_ssh_defaults(cmd, namespace):
         if not namespace.revision:
             raise ResourceNotFoundError("Could not find a revision")
     if not namespace.replica:
-        # VVV this may not be necessary according to Anthony Chu
-        try:
-            ping_container_app(app)  # needed to get an alive replica
-        except Exception as e:  # pylint: disable=broad-except
-            logger.warning("Failed to ping container app with error '%s' \nPlease ensure there is an alive replica. ", str(e))
+        failed_to_ping, warning_message = _ping_containerapp_if_need(cmd, app)
         replicas = ContainerAppClient.list_replicas(cmd=cmd,
                                                     resource_group_name=namespace.resource_group_name,
                                                     container_app_name=namespace.name,
                                                     revision_name=namespace.revision)
         if not replicas:
+            if failed_to_ping:
+                logger.warning(warning_message)
             raise ResourceNotFoundError("Could not find a replica for this app")
         namespace.replica = replicas[0]["name"]
     if not namespace.container:

src/azure-cli/azure/cli/command_modules/containerapp/custom.py

@@ -3429,6 +3429,10 @@ def containerapp_ssh(cmd, resource_group_name, name, container=None, revision=No
 
     logger.warning("Use ctrl + D to exit.")
     while conn.is_connected:
+        if not reader.is_alive() or not writer.is_alive():
+            logger.warning("Reader or Writer for WebSocket is not alive. Closing the connection.")
+            conn.disconnect()
+
         try:
             time.sleep(0.1)
         except KeyboardInterrupt: