Author: momento-github-actions-machine-user

src/momento/errors/error_details.py

@@ -42,6 +42,8 @@ class MomentoErrorCode(enum.Enum):
     """System is not in a state required for the operation's execution"""
     UNKNOWN_ERROR = 15
     """Unknown error has occurred"""
+    CONNECTION_ERROR = 16
+    """Connection to the Momento server failed"""
 
 
 @dataclass

src/momento/errors/exceptions.py

@@ -123,6 +123,24 @@ def __init__(
         )
 
 
+class ConnectionException(SdkException):
+    """Connection to the Momento server failed."""
+
+    def __init__(
+        self,
+        message: str,
+        service: Service,
+        transport_details: Optional[MomentoErrorTransportDetails] = None,
+    ):
+        super().__init__(
+            message,
+            MomentoErrorCode.CONNECTION_ERROR,
+            service,
+            transport_details,
+            message_wrapper="Connection to the Momento server failed; please contact us at [email protected]",
+        )
+
+
 class FailedPreconditionException(SdkException):
     """The server did not meet the precondition to run a command.
 

src/momento/internal/aio/_scs_grpc_manager.py

@@ -12,6 +12,7 @@
 from momento.auth import CredentialProvider
 from momento.config import Configuration, TopicConfiguration
 from momento.config.transport.transport_strategy import StaticGrpcConfiguration
+from momento.errors.exceptions import ConnectionException
 from momento.internal._utilities import momento_version
 from momento.internal._utilities._channel_credentials import (
     channel_credentials_from_root_certs_or_default,
@@ -20,6 +21,7 @@
     grpc_control_channel_options_from_grpc_config,
     grpc_data_channel_options_from_grpc_config,
 )
+from momento.internal.services import Service
 from momento.retry import RetryStrategy
 
 from ... import logs
@@ -90,9 +92,11 @@ async def eagerly_connect(self, timeout_seconds: float) -> None:
         try:
             await asyncio.wait_for(self.wait_for_ready(), timeout_seconds)
         except Exception as error:
+            self._secure_channel.close()
             self._logger.debug(f"Failed to connect to the server within the given timeout. {error}")
-            raise RuntimeError(
-                f"Failed to connect to Momento's server within given eager connection timeout {error}"
+            raise ConnectionException(
+                message=f"Failed to connect to Momento's server within given eager connection timeout: {error}",
+                service=Service.CACHE,
             ) from error
 
     async def wait_for_ready(self) -> None:
@@ -107,7 +111,7 @@ async def wait_for_ready(self) -> None:
             elif latest_state == connecting:
                 self._logger.debug("State transitioned to CONNECTING; waiting to get READY")
             else:
-                self._logger.warn(f"Unexpected connection state: {latest_state}. while trying to eagerly connect")
+                self._logger.warn(f"Unexpected connection state while trying to eagerly connect: {latest_state}.")
                 break
 
             # This is a gRPC callback helper that prevents us from repeatedly polling on the state

src/momento/internal/synchronous/_scs_grpc_manager.py

@@ -13,6 +13,7 @@
 from momento.auth import CredentialProvider
 from momento.config import Configuration, TopicConfiguration
 from momento.config.transport.transport_strategy import StaticGrpcConfiguration
+from momento.errors.exceptions import ConnectionException
 from momento.internal._utilities import momento_version
 from momento.internal._utilities._channel_credentials import (
     channel_credentials_from_root_certs_or_default,
@@ -21,6 +22,7 @@
     grpc_control_channel_options_from_grpc_config,
     grpc_data_channel_options_from_grpc_config,
 )
+from momento.internal.services import Service
 from momento.internal.synchronous._add_header_client_interceptor import (
     AddHeaderClientInterceptor,
     AddHeaderStreamingClientInterceptor,
@@ -97,7 +99,11 @@ def on_timeout() -> None:
             )
             # the subscription is no longer needed; it was only meant to watch if we could connect eagerly
             self._secure_channel.unsubscribe(on_state_change)
-            raise RuntimeError("Failed to connect to Momento's server within given eager connection timeout")
+            self._secure_channel.close()
+            raise ConnectionException(
+                message="Failed to connect to Momento's server within given eager connection timeout",
+                service=Service.CACHE,
+            )
 
         """
         A callback that is triggered whenever a connection's state changes. We explicitly subscribe to
@@ -122,7 +128,7 @@ def on_state_change(state: grpc.ChannelConnectivity) -> None:
             elif state == connecting:
                 self._logger.debug("State transitioned to CONNECTING; waiting to get READY")
             else:
-                self._logger.warn(f"Unexpected connection state: {state}. while trying to eagerly connect")
+                self._logger.warn(f"Unexpected connection state while trying to eagerly connect: {state}")
                 # we could not connect within the timeout and we no longer need this subscription
                 self._secure_channel.unsubscribe(on_state_change)
                 connection_event.set()

tests/momento/cache_client/test_init.py

@@ -6,6 +6,7 @@
 from momento.auth import CredentialProvider
 from momento.config import Configuration
 from momento.errors import InvalidArgumentException
+from momento.errors.exceptions import ConnectionException
 
 
 def test_init_throws_exception_when_client_uses_negative_default_ttl(
@@ -52,3 +53,14 @@ def test_init_eagerly_connecting_cache_client(
         configuration, credential_provider, default_ttl_seconds, eager_connection_timeout=timedelta(seconds=30)
     )
     assert client
+
+
+def test_init_cache_client_eager_connection_failure(
+    configuration: Configuration, credential_provider: CredentialProvider, default_ttl_seconds: timedelta
+) -> None:
+    with pytest.raises(
+        ConnectionException, match="Failed to connect to Momento's server within given eager connection timeout"
+    ):
+        CacheClient.create(
+            configuration, credential_provider, default_ttl_seconds, eager_connection_timeout=timedelta(milliseconds=1)
+        )

tests/momento/cache_client/test_init_async.py

@@ -6,6 +6,7 @@
 from momento.auth import CredentialProvider
 from momento.config import Configuration
 from momento.errors import InvalidArgumentException
+from momento.errors.exceptions import ConnectionException
 
 
 async def test_init_throws_exception_when_client_uses_negative_default_ttl(
@@ -54,3 +55,14 @@ async def test_init_eagerly_connecting_cache_client(
         configuration, credential_provider, default_ttl_seconds, eager_connection_timeout=timedelta(seconds=30)
     )
     assert client
+
+
+async def test_init_cache_client_eager_connection_failure(
+    configuration: Configuration, credential_provider: CredentialProvider, default_ttl_seconds: timedelta
+) -> None:
+    with pytest.raises(
+        ConnectionException, match="Failed to connect to Momento's server within given eager connection timeout"
+    ):
+        await CacheClientAsync.create(
+            configuration, credential_provider, default_ttl_seconds, eager_connection_timeout=timedelta(milliseconds=1)
+        )

tests/momento/vector_index_client/test_control.py

@@ -145,8 +145,11 @@ def test_create_index_throws_authentication_exception_for_bad_token(
         response = vector_index_client.create_index(index_name, num_dimensions=2)
         assert isinstance(response, CreateIndex.Error)
         assert response.error_code == MomentoErrorCode.AUTHENTICATION_ERROR
-        assert response.inner_exception.message == "Invalid signature"
-        assert response.message == "Invalid authentication credentials to connect to index service: Invalid signature"
+        assert response.inner_exception.message == "Could not validate authorization token"
+        assert (
+            response.message
+            == "Invalid authentication credentials to connect to index service: Could not validate authorization token"
+        )
 
 
 # List indexes

tests/momento/vector_index_client/test_control_async.py

@@ -151,8 +151,11 @@ async def test_create_index_throws_authentication_exception_for_bad_token(
         response = await vector_index_client.create_index(index_name, num_dimensions=2)
         assert isinstance(response, CreateIndex.Error)
         assert response.error_code == MomentoErrorCode.AUTHENTICATION_ERROR
-        assert response.inner_exception.message == "Invalid signature"
-        assert response.message == "Invalid authentication credentials to connect to index service: Invalid signature"
+        assert response.inner_exception.message == "Could not validate authorization token"
+        assert (
+            response.message
+            == "Invalid authentication credentials to connect to index service: Could not validate authorization token"
+        )
 
 
 # List indexes