open-tunnel: respect None NO_PROXY env variable

.changes/next-release/bugfix-ec2instanceconnectssh-67721.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "``ec2-instance-connect ssh``",
+    "description": "Fix runtime error when HTTP_PROXY environment variable is set and NO_PROXY is not set for eice connection type `#8023 <https://github.com/aws/aws-cli/issues/8023>`__"
+  }
+

awscli/customizations/ec2instanceconnect/websocket.py

@@ -154,7 +154,7 @@ def connect(self, url, user_agent=None):
         environment = os.environ.copy()
         proxy_options = None
         proxy_url = environment.get("HTTP_PROXY") or environment.get("HTTPS_PROXY")
-        no_proxy = environment.get("NO_PROXY")
+        no_proxy = environment.get("NO_PROXY", "")
         if proxy_url and parsed_url.hostname not in no_proxy:
             parsed_proxy_url = urlparse(proxy_url)
             logger.debug(f"Using the following proxy: {parsed_proxy_url.hostname}")

tests/unit/customizations/ec2instanceconnect/test_websocket.py

@@ -292,6 +292,41 @@ def test_connect_with_proxy(
 
         assert mock_on_connection_event.wait.called
 
+    @patch.object(websocket, "connect")
+    @patch.object(websocket, "create_handshake_request")
+    @mock.patch.dict(os.environ, {"HTTPS_PROXY": "http://user1:pass1@localhost:8989"})
+    def test_connect_with_proxy_but_no_proxy_env_empty(
+            self, mock_handshake, mock_connect, mock_on_connection_event,
+            mock_tls_connection_options, web_socket, websocket_url
+    ):
+        parsed_url = urlparse(websocket_url)
+        host = parsed_url.hostname
+        path = parsed_url.path + "?" + parsed_url.query
+        mock_handshake.return_value = mock_handshake_request
+
+        web_socket.connect(websocket_url)
+
+        mock_handshake.assert_called_with(host=host, path=path)
+        mock_tls_connection_options.set_server_name.assert_called_with(host)
+        mock_connect.assert_called_with(
+            host=host,
+            handshake_request=mock_handshake_request,
+            port=443,
+            tls_connection_options=mock_tls_connection_options,
+            proxy_options=mock.ANY,
+            on_connection_setup=mock.ANY,
+            on_connection_shutdown=mock.ANY,
+            on_incoming_frame_payload=mock.ANY,
+            on_incoming_frame_complete=mock.ANY
+        )
+        assert "localhost" == mock_connect.call_args.kwargs['proxy_options'].host_name
+        assert 8989 == mock_connect.call_args.kwargs['proxy_options'].port
+        assert HttpProxyAuthenticationType.Basic == mock_connect.call_args.kwargs['proxy_options'].auth_type
+        assert "user1" == mock_connect.call_args.kwargs['proxy_options'].auth_username
+        assert "pass1" == mock_connect.call_args.kwargs['proxy_options'].auth_password
+
+        assert mock_on_connection_event.wait.called
+
     @patch.object(websocket, "connect")
     @patch.object(websocket, "create_handshake_request")
     @mock.patch.dict(os.environ,