Add support for endpoint_url, user_agent_extra, and sdk_ua_app_id

Author: ubaskota

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsConfiguration.java

@@ -60,4 +60,30 @@ private AwsConfiguration() {}
                     .build())
             .defaultValue("RetryStrategyOptions(retry_mode=\"standard\")")
             .build();
+
+    public static final ConfigProperty USER_AGENT_EXTRA = ConfigProperty.builder()
+            .name("user_agent_extra")
+            .type(Symbol.builder().name("str").build())
+            .documentation("Additional suffix to be appended to the User-Agent header.")
+            .nullable(false)
+            .useDescriptor(true)
+            .defaultValue("''")
+            .build();
+
+    public static final ConfigProperty SDK_UA_APP_ID = ConfigProperty.builder()
+            .name("sdk_ua_app_id")
+            .type(Symbol.builder().name("str").build())
+            .documentation("A unique and opaque application ID that is appended to the User-Agent header.")
+            .nullable(false)
+            .useDescriptor(true)
+            .defaultValue("''")
+            .build();
+
+    public static final ConfigProperty ENDPOINT_URL = ConfigProperty.builder()
+            .name("endpoint_url")
+            .type(Symbol.builder().name("str").build())
+            .documentation("The endpoint URL to use for requests. If not set, the standard endpoint for the service and region will be used.")
+            .nullable(true)
+            .useDescriptor(true)
+            .build();
 }

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsStandardRegionalEndpointsIntegration.java

@@ -4,6 +4,7 @@
  */
 package software.amazon.smithy.python.aws.codegen;
 
+import static software.amazon.smithy.python.aws.codegen.AwsConfiguration.ENDPOINT_URL;
 import static software.amazon.smithy.python.aws.codegen.AwsConfiguration.REGION;
 
 import java.util.List;
@@ -23,6 +24,7 @@ public List<RuntimeClientPlugin> getClientPlugins(GenerationContext context) {
             return List.of(
                     RuntimeClientPlugin.builder()
                             .addConfigProperty(REGION)
+                            .addConfigProperty(ENDPOINT_URL)
                             .build());
         } else {
             return List.of();

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsUserAgentIntegration.java

@@ -9,12 +9,14 @@
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.codegen.core.SymbolReference;
 import software.amazon.smithy.python.codegen.CodegenUtils;
-import software.amazon.smithy.python.codegen.ConfigProperty;
 import software.amazon.smithy.python.codegen.GenerationContext;
 import software.amazon.smithy.python.codegen.integrations.PythonIntegration;
 import software.amazon.smithy.python.codegen.integrations.RuntimeClientPlugin;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
+import static software.amazon.smithy.python.aws.codegen.AwsConfiguration.SDK_UA_APP_ID;
+import static software.amazon.smithy.python.aws.codegen.AwsConfiguration.USER_AGENT_EXTRA;
+
 /**
  * Adds a runtime plugin to set user agent.
  */
@@ -36,21 +38,6 @@ def aws_user_agent_plugin(config: $1T):
     @Override
     public List<RuntimeClientPlugin> getClientPlugins(GenerationContext context) {
         if (context.applicationProtocol().isHttpProtocol()) {
-            final ConfigProperty userAgentExtra = ConfigProperty.builder()
-                    .name("user_agent_extra")
-                    .documentation("Additional suffix to be added to the User-Agent header.")
-                    .type(Symbol.builder().name("str").build())
-                    .nullable(true)
-                    .build();
-
-            final ConfigProperty uaAppId = ConfigProperty.builder()
-                    .name("sdk_ua_app_id")
-                    .documentation(
-                            "A unique and opaque application ID that is appended to the User-Agent header.")
-                    .type(Symbol.builder().name("str").build())
-                    .nullable(true)
-                    .build();
-
             final String user_agent_plugin_file = "user_agent";
 
             final String moduleName = context.settings().moduleName();
@@ -86,8 +73,8 @@ public List<RuntimeClientPlugin> getClientPlugins(GenerationContext context) {
 
             return List.of(
                     RuntimeClientPlugin.builder()
-                            .addConfigProperty(userAgentExtra)
-                            .addConfigProperty(uaAppId)
+                            .addConfigProperty(USER_AGENT_EXTRA)
+                            .addConfigProperty(SDK_UA_APP_ID)
                             .pythonPlugin(userAgentPlugin)
                             .writeAdditionalFiles((c) -> {
                                 String filename = "src/%s/%s.py".formatted(moduleName, user_agent_plugin_file);

codegen/core/src/main/java/software/amazon/smithy/python/codegen/generators/ConfigGenerator.java

@@ -97,6 +97,22 @@ public final class ConfigGenerator implements Runnable {
                                     .build())
                             .build())
                     .documentation("The retry strategy or options for configuring retry behavior. Can be either a configured RetryStrategy or RetryStrategyOptions to create one.")
+                    .build(),
+            ConfigProperty.builder()
+                    .name("user_agent_extra")
+                    .type(Symbol.builder().name("str").build())
+                    .documentation("Additional suffix to be appended to the User-Agent header.")
+                    .build(),
+            ConfigProperty.builder()
+                    .name("sdk_ua_app_id")
+                    .type(Symbol.builder().name("str").build())
+                    .documentation("A unique and opaque application ID that is appended to the User-Agent header.")
+                    .build(),
+            ConfigProperty.builder()
+                    .name("endpoint_url")
+                    .type(Symbol.builder().name("str").build())
+                    .documentation("The endpoint URL to use for requests. If not set, the standard endpoint for the service and region will be used.")
+                    .nullable(true)
                     .build());
 
     // This list contains any properties that must be added to any http-based

packages/smithy-core/tests/unit/config/test_property.py

@@ -87,6 +87,47 @@ def test_different_properties_resolve_independently(self) -> None:
         assert region == "us-west-2"
         assert retry_mode == "adaptive"
 
+    def test_unresolved_ua_extra_defaults_to_empty_string(self) -> None:
+        class ConfigWithEmptyDefault:
+            user_agent_extra = ConfigProperty(
+                "user_agent_extra",
+                default_value="",
+            )
+
+            def __init__(self, resolver: ConfigResolver) -> None:
+                self._resolver = resolver
+
+        source = StubSource("environment", {})
+        resolver = ConfigResolver(sources=[source])
+        config = ConfigWithEmptyDefault(resolver)
+
+        result = config.user_agent_extra
+
+        assert result == ""
+        assert getattr(config, "_cache_user_agent_extra") == (
+            "",
+            SimpleSource("default"),
+        )
+
+    def test_endpoint_url_defaults_to_none(self) -> None:
+        class ConfigWithNoDefault:
+            endpoint_url = ConfigProperty("endpoint_url")
+
+            def __init__(self, resolver: ConfigResolver) -> None:
+                self._resolver = resolver
+
+        source = StubSource("environment", {})
+        resolver = ConfigResolver(sources=[source])
+        config = ConfigWithNoDefault(resolver)
+
+        result = config.endpoint_url
+
+        assert result is None
+        assert getattr(config, "_cache_endpoint_url") == (
+            None,
+            SimpleSource("default"),
+        )
+
 
 class TestConfigPropertyValidation:
     """Test suite for ConfigProperty validation behavior."""