cleanups from PR

Author: alextwoods

packages/smithy-aws-core/src/smithy_aws_core/auth/sigv4.py

@@ -25,7 +25,7 @@ class SigV4AuthScheme(
 ):
     """SigV4 AuthScheme."""
 
-    scheme_id: str
+    scheme_id: str = "aws.auth#sigv4"
     signer: HTTPSigner[AWSCredentialsIdentity, SigV4SigningProperties]
 
     def __init__(
@@ -39,7 +39,6 @@ def __init__(
         :param identity_resolver: The identity resolver to extract the api key identity.
         :param signer: The signer used to sign the request.
         """
-        self.scheme_id = "aws.auth#sigv4"
         # TODO: There are type mismatches in the signature of the "sign" method.
         self.signer = signer or AsyncSigV4Signer()  # type: ignore
 

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

@@ -2,12 +2,15 @@
 #  SPDX-License-Identifier: Apache-2.0
 import os
 
-from smithy_aws_core.identity import AWSCredentialsIdentity, AWSCredentialsResolver
+from smithy_aws_core.identity import AWSCredentialsIdentity
+from smithy_core.aio.interfaces.identity import IdentityResolver
 from smithy_core.exceptions import SmithyIdentityException
 from smithy_core.interfaces.identity import IdentityProperties
 
 
-class EnvironmentCredentialsResolver(AWSCredentialsResolver):
+class EnvironmentCredentialsResolver(
+    IdentityResolver[AWSCredentialsIdentity, IdentityProperties]
+):
     """Resolves AWS Credentials from system environment variables."""
 
     def __init__(self):

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

@@ -1,10 +1,13 @@
 #  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
-from smithy_aws_core.identity import AWSCredentialsIdentity, AWSCredentialsResolver
+from smithy_aws_core.identity import AWSCredentialsIdentity
+from smithy_core.aio.interfaces.identity import IdentityResolver
 from smithy_core.interfaces.identity import IdentityProperties
 
 
-class StaticCredentialsResolver(AWSCredentialsResolver):
+class StaticCredentialsResolver(
+    IdentityResolver[AWSCredentialsIdentity, IdentityProperties]
+):
     """Resolve Static AWS Credentials."""
 
     def __init__(self, *, credentials: AWSCredentialsIdentity) -> None:

packages/smithy-aws-core/src/smithy_aws_core/identity.py

@@ -63,4 +63,6 @@ def account_id(self) -> str | None:
         return self._account_id
 
 
-AWSCredentialsResolver = IdentityResolver[AWSCredentialsIdentity, IdentityProperties]
+type AWSCredentialsResolver = IdentityResolver[
+    AWSCredentialsIdentity, IdentityProperties
+]

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

@@ -15,36 +15,36 @@ async def test_no_values_set():
         )
 
 
-async def test_required_values_missing(monkeypatch):  # type: ignore
-    monkeypatch.setenv("AWS_ACCOUNT_ID", "123456789012")  # type: ignore
+async def test_required_values_missing(monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.setenv("AWS_ACCOUNT_ID", "123456789012")
 
     with pytest.raises(SmithyIdentityException):
         await EnvironmentCredentialsResolver().get_identity(
             identity_properties=IdentityProperties()
         )
 
 
-async def test_akid_missing(monkeypatch):  # type: ignore
-    monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", "secret")  # type: ignore
+async def test_akid_missing(monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", "secret")
 
     with pytest.raises(SmithyIdentityException):
         await EnvironmentCredentialsResolver().get_identity(
             identity_properties=IdentityProperties()
         )
 
 
-async def test_secret_missing(monkeypatch):  # type: ignore
-    monkeypatch.setenv("AWS_ACCESS_KEY_ID", "akid")  # type: ignore
+async def test_secret_missing(monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.setenv("AWS_ACCESS_KEY_ID", "akid")
 
     with pytest.raises(SmithyIdentityException):
         await EnvironmentCredentialsResolver().get_identity(
             identity_properties=IdentityProperties()
         )
 
 
-async def test_minimum_required(monkeypatch):  # type: ignore
-    monkeypatch.setenv("AWS_ACCESS_KEY_ID", "akid")  # type: ignore
-    monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", "secret")  # type: ignore
+async def test_minimum_required(monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.setenv("AWS_ACCESS_KEY_ID", "akid")
+    monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", "secret")
 
     credentials = await EnvironmentCredentialsResolver().get_identity(
         identity_properties=IdentityProperties()
@@ -53,11 +53,11 @@ async def test_minimum_required(monkeypatch):  # type: ignore
     assert credentials.secret_access_key == "secret"
 
 
-async def test_all_values(monkeypatch):  # type: ignore
-    monkeypatch.setenv("AWS_ACCESS_KEY_ID", "akid")  # type: ignore
-    monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", "secret")  # type: ignore
-    monkeypatch.setenv("AWS_SESSION_TOKEN", "session")  # type: ignore
-    monkeypatch.setenv("AWS_ACCOUNT_ID", "123456789012")  # type: ignore
+async def test_all_values(monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.setenv("AWS_ACCESS_KEY_ID", "akid")
+    monkeypatch.setenv("AWS_SECRET_ACCESS_KEY", "secret")
+    monkeypatch.setenv("AWS_SESSION_TOKEN", "session")
+    monkeypatch.setenv("AWS_ACCOUNT_ID", "123456789012")
 
     credentials = await EnvironmentCredentialsResolver().get_identity(
         identity_properties=IdentityProperties()