fix: remove CLI only S3 config options

.changes/5adb30dd-3a4f-4a3c-aa31-e6455785c9c4.json

@@ -0,0 +1,5 @@
+{
+    "id": "5adb30dd-3a4f-4a3c-aa31-e6455785c9c4",
+    "type": "misc",
+    "description": "**Breaking** Removed `enableAccelerate` & `forcePathStyle` from S3 config. As well as `use_accelerate_endpoint` & `addressing_style` from AWS profile configuration"
+}

.changes/86e02b43-e485-46be-ba3f-429c59e45078.json

@@ -0,0 +1,5 @@
+{
+    "id": "86e02b43-e485-46be-ba3f-429c59e45078",
+    "type": "misc",
+    "description": "Added `s3_use_arn_region` & `s3_disable_multiregion_access_points` to AWS profile configuration"
+}

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/s3/ClientConfigIntegration.kt

@@ -28,40 +28,23 @@ class ClientConfigIntegration : KotlinIntegration {
         model.expectShape<ServiceShape>(settings.service).isS3
 
     companion object {
-        val EnableAccelerateProp: ConfigProperty = ConfigProperty {
-            name = "enableAccelerate"
+        val UseArnRegionProp: ConfigProperty = ConfigProperty {
+            name = "useArnRegion"
             useSymbolWithNullableBuilder(KotlinTypes.Boolean, "false")
             documentation = """
-                Flag to support [S3 transfer acceleration](https://docs.aws.amazon.com/AmazonS3/latest/userguide/transfer-acceleration.html)
-                with this client.
+                Flag to enforce using a bucket arn with a region matching the client config when making requests with
+                [S3 access points](https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html).
             """.trimIndent()
         }
 
-        val ForcePathStyleProp: ConfigProperty = ConfigProperty {
-            name = "forcePathStyle"
-            useSymbolWithNullableBuilder(KotlinTypes.Boolean, "false")
+        // FIXME: default signer doesn't yet implement sigv4a, default to mrap OFF until it does
+        val DisableMrapProp: ConfigProperty = ConfigProperty {
+            name = "disableMrap"
+            useSymbolWithNullableBuilder(KotlinTypes.Boolean, "true")
             documentation = """
-                Flag to use legacy path-style addressing when making requests.
+                Flag to disable [S3 multi-region access points](https://docs.aws.amazon.com/AmazonS3/latest/userguide/MultiRegionAccessPoints.html).
             """.trimIndent()
         }
-
-        val UseArnRegionProp: ConfigProperty = ConfigProperty.Boolean(
-            "useArnRegion",
-            defaultValue = false,
-            documentation = """
-                Flag to enforce using a bucket arn with a region matching the client config when making requests with
-                [S3 access points](https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html).
-            """.trimIndent(),
-        )
-
-        // FUTURE: default signer doesn't yet implement sigv4a, default to mrap OFF until it does
-        val DisableMrapProp: ConfigProperty = ConfigProperty.Boolean(
-            "disableMrap",
-            defaultValue = true,
-            documentation = """
-                Flag to disable [S3 multi-region access points](https://docs.aws.amazon.com/AmazonS3/latest/userguide/MultiRegionAccessPoints.html).
-            """.trimIndent(),
-        )
     }
 
     override fun preprocessModel(model: Model, settings: KotlinSettings): Model {
@@ -83,8 +66,6 @@ class ClientConfigIntegration : KotlinIntegration {
 
     override fun additionalServiceConfigProps(ctx: CodegenContext): List<ConfigProperty> =
         listOf(
-            EnableAccelerateProp,
-            ForcePathStyleProp,
             UseArnRegionProp,
             DisableMrapProp,
         )

codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/protocols/endpoints/BindAwsEndpointBuiltins.kt

@@ -50,8 +50,6 @@ fun renderBindAwsBuiltins(ctx: ProtocolGenerator.GenerationContext, writer: Kotl
                 "AWS::UseFIPS" -> renderBasicConfigBinding(writer, it, AwsServiceConfigIntegration.UseFipsProp.propertyName)
                 "AWS::UseDualStack" -> renderBasicConfigBinding(writer, it, AwsServiceConfigIntegration.UseDualStackProp.propertyName)
 
-                "AWS::S3::Accelerate" -> renderBasicConfigBinding(writer, it, S3ClientConfigIntegration.EnableAccelerateProp.propertyName)
-                "AWS::S3::ForcePathStyle" -> renderBasicConfigBinding(writer, it, S3ClientConfigIntegration.ForcePathStyleProp.propertyName)
                 "AWS::S3::DisableMultiRegionAccessPoints" -> renderBasicConfigBinding(writer, it, S3ClientConfigIntegration.DisableMrapProp.propertyName)
                 "AWS::S3::UseArnRegion" -> renderBasicConfigBinding(writer, it, S3ClientConfigIntegration.DisableMrapProp.propertyName)
                 "AWS::S3Control::UseArnRegion" -> renderBasicConfigBinding(writer, it, S3ControlClientConfigIntegration.UseArnRegionProp.propertyName)

services/s3/common/src/aws/sdk/kotlin/services/s3/internal/FinalizeS3Config.kt

@@ -4,7 +4,6 @@
  */
 package aws.sdk.kotlin.services.s3.internal
 
-import aws.sdk.kotlin.runtime.ConfigurationException
 import aws.sdk.kotlin.runtime.config.profile.AwsProfile
 import aws.sdk.kotlin.runtime.config.profile.AwsSharedConfig
 import aws.sdk.kotlin.runtime.config.profile.getBooleanOrNull
@@ -13,19 +12,13 @@ import aws.smithy.kotlin.runtime.util.LazyAsyncValue
 
 internal suspend fun finalizeS3Config(builder: S3Client.Builder, sharedConfig: LazyAsyncValue<AwsSharedConfig>) {
     sharedConfig.get().activeProfile.let {
-        builder.config.forcePathStyle = builder.config.forcePathStyle ?: it.forcePathStyle
-        builder.config.enableAccelerate = builder.config.enableAccelerate ?: it.enableAccelerate
+        builder.config.useArnRegion = builder.config.useArnRegion ?: it.useArnRegion
+        builder.config.disableMrap = builder.config.disableMrap ?: it.disableMrap
     }
 }
 
-private val AwsProfile.forcePathStyle: Boolean?
-    get() = getOrNull("s3", "addressing_style")?.lowercase()?.let {
-        when (it) {
-            "virtual", "auto" -> false
-            "path" -> true
-            else -> throw ConfigurationException("invalid value '$it' for config property s3.addressing_style")
-        }
-    }
+private val AwsProfile.useArnRegion: Boolean?
+    get() = getBooleanOrNull("s3_use_arn_region")
 
-private val AwsProfile.enableAccelerate: Boolean?
-    get() = getBooleanOrNull("s3", "use_accelerate_endpoint")
+private val AwsProfile.disableMrap: Boolean?
+    get() = getBooleanOrNull("s3_disable_multiregion_access_points")