PR updates

Author: alextwoods

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

@@ -46,12 +46,12 @@ class _UserAgentBuilder:
     def __init__(
         self,
         *,
-        platform_name: str | None = None,
-        platform_version: str | None = None,
-        platform_machine: str | None = None,
-        python_version: str | None = None,
-        python_implementation: str | None = None,
-        sdk_version: str | None = None,
+        platform_name: str | None,
+        platform_version: str | None,
+        platform_machine: str | None,
+        python_version: str | None,
+        python_implementation: str | None,
+        sdk_version: str | None,
     ) -> None:
         self._platform_name = platform_name
         self._platform_version = platform_version

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

@@ -20,55 +20,70 @@ def test_from_environment(monkeypatch):  # type: ignore
     assert "md/pyimpl#CPython" in user_agent
 
 
+defaults = {
+    "platform_name": None,
+    "platform_version": None,
+    "platform_machine": None,
+    "python_version": None,
+    "python_implementation": None,
+    "sdk_version": None,
+}
+
+
 def test_build_adds_sdk_metadata():
-    user_agent = _UserAgentBuilder(sdk_version="1.2.3").build()
+    args = {"sdk_version": "1.2.3"}
+    user_agent = _UserAgentBuilder(**{**defaults, **args}).build()
     assert "python/1.2.3" in str(user_agent)
 
 
 def test_build_adds_ua_metadata():
-    user_agent = _UserAgentBuilder().build()
+    user_agent = _UserAgentBuilder(**defaults).build()
     assert "ua/2.1" in str(user_agent)
 
 
 def test_build_os_defaults_to_other():
-    user_agent = _UserAgentBuilder().build()
+    user_agent = _UserAgentBuilder(**defaults).build()
     assert "os/other" in str(user_agent)
 
 
 def test_build_os_lowercases_platform():
-    user_agent = _UserAgentBuilder(platform_name="LINUX").build()
+    args = {"platform_name": "LINUX"}
+    user_agent = _UserAgentBuilder(**{**defaults, **args}).build()
     assert "os/linux" in str(user_agent)
 
 
 def test_build_os_maps_platform_names():
-    user_agent = _UserAgentBuilder(platform_name="darwin").build()
+    args = {"platform_name": "darwin"}
+    user_agent = _UserAgentBuilder(**{**defaults, **args}).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()
+    args = {"platform_name": "linux", "platform_version": "5.4"}
+    user_agent = _UserAgentBuilder(**{**defaults, **args}).build()
     assert "os/linux#5.4" in str(user_agent)
 
 
 def test_build_os_other_platform():
-    user_agent = _UserAgentBuilder(
-        platform_name="myos", platform_version="0.0.1"
-    ).build()
+    args = {"platform_name": "myos", "platform_version": "0.0.1"}
+    user_agent = _UserAgentBuilder(**{**defaults, **args}).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()
+    args = {"platform_machine": "x86_64"}
+    user_agent = _UserAgentBuilder(**{**defaults, **args}).build()
     assert "md/arch#x86_64" in str(user_agent)
 
 
 def test_build_language_version():
-    user_agent = _UserAgentBuilder(python_version="3.12").build()
+    args = {"python_version": "3.12"}
+    user_agent = _UserAgentBuilder(**{**defaults, **args}).build()
     assert "lang/python#3.12" in str(user_agent)
 
 
 def test_build_language_implementation():
-    user_agent = _UserAgentBuilder(python_implementation="CPython").build()
+    args = {"python_implementation": "CPython"}
+    user_agent = _UserAgentBuilder(**{**defaults, **args}).build()
     assert "md/pyimpl#CPython" in str(user_agent)