pr feedbacks

Author: xinsong-cui

codegen/aws-sdk-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/customization/EnvironmentBearerTokenCustomization.kt

@@ -45,7 +45,7 @@ class EnvironmentBearerTokenCustomization : KotlinIntegration {
 
     override fun writeAdditionalFiles(ctx: CodegenContext, delegator: KotlinDelegator) {
         val serviceShape = ctx.model.expectShape<ServiceShape>(ctx.settings.service)
-        val serviceName = ctx.symbolProvider.toSymbol(serviceShape).name.removeSuffix("Client")
+        val serviceName = clientName(ctx.settings.sdkId)
         val packageName = ctx.settings.pkg.name
 
         delegator.useFileWriter(

codegen/aws-sdk-codegen/src/test/kotlin/aws/sdk/kotlin/codegen/customization/EnvironmentBearerTokenCustomizationTest.kt

@@ -24,6 +24,20 @@ class EnvironmentBearerTokenCustomizationTest {
         }
     """.trimIndent().toSmithyModel()
 
+    private val bedrockRuntimeModel = """
+        namespace com.test
+        use aws.auth#sigv4
+        use aws.api#service
+        use smithy.api#httpBearerAuth
+        
+        @sigv4(name: "bedrock")
+        @httpBearerAuth
+        @service(sdkId: "Bedrock Runtime")
+        service BedrockRuntime {
+            version: "1.0.0"
+        }
+    """.trimIndent().toSmithyModel()
+
     private val nonBedrockModel = """
         namespace com.test
         use aws.auth#sigv4
@@ -70,6 +84,13 @@ class EnvironmentBearerTokenCustomizationTest {
         }
     }
 
+    fun `test customization enabled for bedrock sigv4 signing name with different sdkId`() {
+        assertTrue {
+            EnvironmentBearerTokenCustomization()
+                .enabledForService(bedrockRuntimeModel, bedrockRuntimeModel.defaultSettings())
+        }
+    }
+
     @Test
     fun `test customization not enabled for non-bedrock sigv4 signing name`() {
         assertFalse {