Backport fixes

Author: nateprewitt

packages/smithy-aws-core/src/smithy_aws_core/credentials_resolvers/container.py

@@ -8,12 +8,12 @@
 
 from smithy_core import URI
 from smithy_core.aio.interfaces.identity import IdentityResolver
-from smithy_core.exceptions import SmithyIdentityError
+from smithy_core.exceptions import SmithyIdentityException
 from smithy_http import Field, Fields
 from smithy_http.aio import HTTPRequest
 from smithy_http.aio.interfaces import HTTPClient, HTTPResponse
 
-from smithy_aws_core.identity import AWSCredentialsIdentity, AWSIdentityProperties
+from smithy_aws_core.identity import AWSCredentialsIdentity, IdentityProperties
 
 _CONTAINER_METADATA_IP = "169.254.170.2"
 _CONTAINER_METADATA_ALLOWED_HOSTS = {
@@ -47,7 +47,7 @@ def _validate_allowed_url(self, uri: URI) -> None:
             return
 
         if not self._is_allowed_container_metadata_host(uri.host):
-            raise SmithyIdentityError(
+            raise SmithyIdentityException(
                 f"Unsupported host '{uri.host}'. "
                 f"Can only retrieve metadata from a loopback address or "
                 f"one of: {', '.join(_CONTAINER_METADATA_ALLOWED_HOSTS)}"
@@ -69,22 +69,22 @@ async def get_credentials(self, uri: URI, fields: Fields) -> dict[str, str]:
                 response: HTTPResponse = await self._http_client.send(request)
                 body = await response.consume_body_async()
                 if response.status != 200:
-                    raise SmithyIdentityError(
+                    raise SmithyIdentityException(
                         f"Container metadata service returned {response.status}: "
                         f"{body.decode('utf-8')}"
                     )
                 try:
                     return json.loads(body.decode("utf-8"))
                 except Exception as e:
-                    raise SmithyIdentityError(
+                    raise SmithyIdentityException(
                         f"Unable to parse JSON from container metadata: {body.decode('utf-8')}"
                     ) from e
             except Exception as e:
                 last_exc = e
                 await asyncio.sleep(_SLEEP_SECONDS)
                 attempts += 1
 
-        raise SmithyIdentityError(
+        raise SmithyIdentityException(
             f"Failed to retrieve container metadata after {self._config.retries} attempt(s)"
         ) from last_exc
 
@@ -99,7 +99,7 @@ def _is_allowed_container_metadata_host(self, hostname: str) -> bool:
 
 
 class ContainerCredentialResolver(
-    IdentityResolver[AWSCredentialsIdentity, AWSIdentityProperties]
+    IdentityResolver[AWSCredentialsIdentity, IdentityProperties]
 ):
     """Resolves AWS Credentials from container credential sources."""
 
@@ -134,7 +134,7 @@ async def _resolve_uri_from_env(self) -> URI:
                 path=parsed.path,
             )
         else:
-            raise SmithyIdentityError(
+            raise SmithyIdentityException(
                 f"Neither {self.ENV_VAR} or {self.ENV_VAR_FULL} environment "
                 "variables are set. Unable to resolve credentials."
             )
@@ -146,7 +146,7 @@ async def _resolve_fields_from_env(self) -> Fields:
                 filename = os.environ[self.ENV_VAR_AUTH_TOKEN_FILE]
                 auth_token = await asyncio.to_thread(self._read_file, filename)
             except (FileNotFoundError, PermissionError) as e:
-                raise SmithyIdentityError(
+                raise SmithyIdentityException(
                     f"Unable to open {os.environ[self.ENV_VAR_AUTH_TOKEN_FILE]}."
                 ) from e
 
@@ -162,7 +162,7 @@ def _read_file(self, filename: str) -> str:
             return f.read().strip()
 
     async def get_identity(
-        self, *, properties: AWSIdentityProperties
+        self, *, identity_properties: IdentityProperties
     ) -> AWSCredentialsIdentity:
         uri = await self._resolve_uri_from_env()
         fields = await self._resolve_fields_from_env()
@@ -178,7 +178,7 @@ async def get_identity(
             expiration = datetime.fromisoformat(expiration).replace(tzinfo=UTC)
 
         if access_key_id is None or secret_access_key is None:
-            raise SmithyIdentityError(
+            raise SmithyIdentityException(
                 "AccessKeyId and SecretAccessKey are required for container credentials"
             )
 

packages/smithy-aws-core/tests/unit/credentials_resolvers/test_container.py

@@ -7,13 +7,13 @@
 
 import pytest
 from smithy_aws_core.identity import AWSCredentialsIdentity
-from smithy_aws_core.identity.container import (
+from smithy_aws_core.credentials_resolvers.container import (
     ContainerCredentialConfig,
     ContainerCredentialResolver,
     ContainerMetadataClient,
 )
 from smithy_core import URI
-from smithy_core.exceptions import SmithyIdentityError
+from smithy_core.exceptions import SmithyIdentityException
 from smithy_http import Fields
 
 if typing.TYPE_CHECKING:
@@ -67,7 +67,7 @@ async def test_metadata_client_invalid_host():
     # Invalid Host
     uri = URI(scheme="http", host="169.254.169.254")
 
-    with pytest.raises(SmithyIdentityError):
+    with pytest.raises(SmithyIdentityException):
         await client.get_credentials(uri, Fields())
 
 
@@ -78,7 +78,7 @@ async def test_metadata_client_non_200_response():
     client = ContainerMetadataClient(http_client, config)
 
     uri = URI(scheme="http", host="169.254.170.2")
-    with pytest.raises(SmithyIdentityError) as e:
+    with pytest.raises(SmithyIdentityException) as e:
         await client.get_credentials(uri, Fields())
 
     # Ensure both the received retry error and underlying error are what we expect.
@@ -95,7 +95,7 @@ async def test_metadata_client_invalid_json():
     client = ContainerMetadataClient(http_client, config)
 
     uri = URI(scheme="http", host="169.254.170.2")
-    with pytest.raises(SmithyIdentityError):
+    with pytest.raises(SmithyIdentityException):
         await client.get_credentials(uri, Fields())
 
 
@@ -113,7 +113,7 @@ async def test_metadata_client_retries():
     uri = URI(scheme="http", host="169.254.170.2", path="/task")
     http_client.send.side_effect = Exception()
 
-    with pytest.raises(SmithyIdentityError):
+    with pytest.raises(SmithyIdentityException):
         await client.get_credentials(uri, Fields())
     assert http_client.send.call_count == 2
 
@@ -271,5 +271,5 @@ async def test_resolver_missing_env():
 
     with patch.dict(os.environ, {}):
         resolver = ContainerCredentialResolver(http_client)
-        with pytest.raises(SmithyIdentityError):
+        with pytest.raises(SmithyIdentityException):
             await resolver.get_identity(properties={})