Remove signer changes

Author: SamRemis

packages/aws-sdk-signers/src/aws_sdk_signers/signers.py

@@ -212,9 +212,6 @@ def _apply_required_fields(
             request.fields.set_field(
                 Field(name="X-Amz-Security-Token", values=[identity.session_token])
             )
-        if "host" not in request.fields:
-            host = self._normalize_host_field(uri=request.destination)  # type: ignore - TODO(pyright)
-            request.fields.set_field(Field(name="host", values=[host]))
 
     def canonical_request(
         self, *, signing_properties: SigV4SigningProperties, request: AWSRequest
@@ -332,6 +329,11 @@ def _normalize_signing_fields(self, *, request: AWSRequest) -> dict[str, str]:
             for field in request.fields
             if self._is_signable_header(field.name.lower())
         }
+        if "host" not in normalized_fields:
+            normalized_fields["host"] = self._normalize_host_field(
+                uri=request.destination  # type: ignore - TODO(pyright)
+            )
+
         return dict(sorted(normalized_fields.items()))
 
     def _is_signable_header(self, field_name: str):
@@ -344,10 +346,7 @@ def _normalize_host_field(self, *, uri: URI) -> str:
             uri_dict = uri.to_dict()
             uri_dict.update({"port": None})
             uri = URI(**uri_dict)
-        host_header = uri.host
-        if port := uri.port:
-            host_header += f":{port}"
-        return host_header
+        return uri.netloc
 
     def _format_canonical_fields(self, *, fields: dict[str, str]) -> str:
         return "".join(
@@ -590,9 +589,6 @@ async def _apply_required_fields(
             request.fields.set_field(
                 Field(name="X-Amz-Security-Token", values=[identity.session_token])
             )
-        if "host" not in request.fields:
-            host = await self._normalize_host_field(uri=request.destination)  # type: ignore - TODO(pyright)
-            request.fields.set_field(Field(name="host", values=[host]))
 
     async def canonical_request(
         self, *, signing_properties: SigV4SigningProperties, request: AWSRequest
@@ -713,6 +709,10 @@ async def _normalize_signing_fields(self, *, request: AWSRequest) -> dict[str, s
             for field in request.fields
             if self._is_signable_header(field.name.lower())
         }
+        if "host" not in normalized_fields:
+            normalized_fields["host"] = await self._normalize_host_field(
+                uri=request.destination  # type: ignore - TODO(pyright)
+            )
 
         return dict(sorted(normalized_fields.items()))
 
@@ -726,10 +726,7 @@ async def _normalize_host_field(self, *, uri: URI) -> str:
             uri_dict = uri.to_dict()
             uri_dict.update({"port": None})
             uri = URI(**uri_dict)
-        host_header = uri.host
-        if port := uri.port:
-            host_header += f":{port}"
-        return host_header
+        return uri.netloc
 
     async def _format_canonical_fields(self, *, fields: dict[str, str]) -> str:
         return "".join(

packages/aws-sdk-signers/tests/unit/test_signers.py

@@ -94,8 +94,6 @@ def test_sign_doesnt_modify_original_request(
         assert signed_request is not aws_request
         assert aws_request.fields == original_request.fields
         assert signed_request.fields != aws_request.fields
-        assert "host" in signed_request.fields
-        assert "authorization" in signed_request.fields
 
     @typing.no_type_check
     def test_sign_with_invalid_identity(