PR cleanups

Author: alextwoods

packages/smithy-http/src/smithy_http/interceptors/user_agent.py

@@ -17,7 +17,7 @@ class UserAgentInterceptor(Interceptor[Any, None, HTTPRequest, None]):
     def read_before_execution(
         self, context: InterceptorContext[Any, None, None, None]
     ) -> None:
-        context.properties["user_agent"] = UserAgentBuilder.from_environment().build()
+        context.properties["user_agent"] = _UserAgentBuilder.from_environment().build()
 
     def modify_before_signing(
         self, context: InterceptorContext[Any, None, HTTPRequest, None]
@@ -42,7 +42,7 @@ def modify_before_signing(
 _USERAGENT_SDK_NAME = "python"
 
 
-class UserAgentBuilder:
+class _UserAgentBuilder:
     def __init__(
         self,
         *,

packages/smithy-http/tests/unit/interceptors/test_user_agent.py

@@ -1,71 +1,74 @@
 import platform
 
 import smithy_core
-from smithy_http.interceptors.user_agent import UserAgentBuilder
+from smithy_http.interceptors.user_agent import _UserAgentBuilder  # type: ignore
 
 
 def test_from_environment(monkeypatch):  # type: ignore
     monkeypatch.setattr(platform, "system", lambda: "Linux")  # type: ignore
     monkeypatch.setattr(platform, "release", lambda: "5.4.228-131.415.AMZN2.X86_64")  # type: ignore
+    monkeypatch.setattr(platform, "machine", lambda: "x86_64")  # type: ignore
     monkeypatch.setattr(platform, "python_version", lambda: "4.3.2")  # type: ignore
     monkeypatch.setattr(platform, "python_implementation", lambda: "CPython")  # type: ignore
     monkeypatch.setattr(smithy_core, "__version__", "1.2.3")  # type: ignore
 
-    user_agent = str(UserAgentBuilder.from_environment().build())
+    user_agent = str(_UserAgentBuilder.from_environment().build())
     assert "python/1.2.3" in user_agent
     assert "os/linux#5.4.228-131.415.AMZN2.X86_64" in user_agent
-    assert "md/arch#arm64" in user_agent
+    assert "md/arch#x86_64" in user_agent
     assert "lang/python#4.3.2" in user_agent
-    assert "md/pyimpl#Cpython" in user_agent
+    assert "md/pyimpl#CPython" in user_agent
 
 
 def test_build_adds_sdk_metadata():
-    user_agent = UserAgentBuilder(sdk_version="1.2.3").build()
+    user_agent = _UserAgentBuilder(sdk_version="1.2.3").build()
     assert "python/1.2.3" in str(user_agent)
 
 
 def test_build_adds_ua_metadata():
-    user_agent = UserAgentBuilder().build()
+    user_agent = _UserAgentBuilder().build()
     assert "ua/2.1" in str(user_agent)
 
 
 def test_build_os_defaults_to_other():
-    user_agent = UserAgentBuilder().build()
+    user_agent = _UserAgentBuilder().build()
     assert "os/other" in str(user_agent)
 
 
 def test_build_os_lowercases_platform():
-    user_agent = UserAgentBuilder(platform_name="LINUX").build()
+    user_agent = _UserAgentBuilder(platform_name="LINUX").build()
     assert "os/linux" in str(user_agent)
 
 
 def test_build_os_maps_platform_names():
-    user_agent = UserAgentBuilder(platform_name="darwin").build()
+    user_agent = _UserAgentBuilder(platform_name="darwin").build()
     assert "os/macos" in str(user_agent)
 
 
 def test_build_os_includes_version():
-    user_agent = UserAgentBuilder(platform_name="linux", platform_version="5.4").build()
+    user_agent = _UserAgentBuilder(
+        platform_name="linux", platform_version="5.4"
+    ).build()
     assert "os/linux#5.4" in str(user_agent)
 
 
 def test_build_os_other_platform():
-    user_agent = UserAgentBuilder(
+    user_agent = _UserAgentBuilder(
         platform_name="myos", platform_version="0.0.1"
     ).build()
     assert "os/other md/myos#0.0.1" in str(user_agent)
 
 
 def test_build_arch_adds_md():
-    user_agent = UserAgentBuilder(platform_machine="x86_64").build()
+    user_agent = _UserAgentBuilder(platform_machine="x86_64").build()
     assert "md/arch#x86_64" in str(user_agent)
 
 
 def test_build_language_version():
-    user_agent = UserAgentBuilder(python_version="3.12").build()
+    user_agent = _UserAgentBuilder(python_version="3.12").build()
     assert "lang/python#3.12" in str(user_agent)
 
 
 def test_build_language_implementation():
-    user_agent = UserAgentBuilder(python_implementation="CPython").build()
+    user_agent = _UserAgentBuilder(python_implementation="CPython").build()
     assert "md/pyimpl#CPython" in str(user_agent)