Fix CodeCatalyst endpoint by moving to official SDK (#3991)

Author: rli

.changes/next-release/bugfix-16e80c71-bda1-4ec6-b465-4e0b76def88e.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix issue where the toolkit calls the wrong CodeCatalyst service endpoint"
+}

gradle/libs.versions.toml

@@ -36,6 +36,7 @@ aws-bom = { module = "software.amazon.awssdk:bom", version.ref = "awsSdk" }
 aws-cloudcontrol = { module = "software.amazon.awssdk:cloudcontrol", version.ref = "awsSdk" }
 aws-cloudformation = { module = "software.amazon.awssdk:cloudformation", version.ref = "awsSdk" }
 aws-cloudwatchlogs = { module = "software.amazon.awssdk:cloudwatchlogs", version.ref = "awsSdk" }
+aws-codecatalyst = { module = "software.amazon.awssdk:codecatalyst", version.ref = "awsSdk" }
 aws-codeGen = { module = "software.amazon.awssdk:codegen", version.ref = "awsSdk" }
 aws-cognitoidentity = { module = "software.amazon.awssdk:cognitoidentity", version.ref = "awsSdk" }
 aws-dynamodb = { module = "software.amazon.awssdk:dynamodb", version.ref = "awsSdk" }

jetbrains-core/build.gradle.kts

@@ -121,6 +121,7 @@ dependencies {
     api(libs.aws.cloudcontrol)
     api(libs.aws.cloudformation)
     api(libs.aws.cloudwatchlogs)
+    api(libs.aws.codecatalyst)
     api(libs.aws.dynamodb)
     api(libs.aws.ec2)
     api(libs.aws.ecr)

jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsClientCustomizer.kt

@@ -10,14 +10,12 @@ import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration
 import software.amazon.awssdk.core.interceptor.Context
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor
-import software.amazon.awssdk.regions.Region
 import software.amazon.awssdk.services.codecatalyst.CodeCatalystClientBuilder
 import software.amazon.awssdk.services.codecatalyst.model.CodeCatalystException
 import software.aws.toolkits.core.ToolkitClientCustomizer
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
-import java.net.URI
 
 class CawsClientCustomizer : ToolkitClientCustomizer {
     override fun customize(
@@ -28,10 +26,6 @@ class CawsClientCustomizer : ToolkitClientCustomizer {
         clientOverrideConfiguration: ClientOverrideConfiguration.Builder
     ) {
         if (builder is CodeCatalystClientBuilder) {
-            builder.region(Region.US_WEST_2)
-            builder.endpointOverride(
-                URI.create(CawsEndpoints.CAWS_PROD_API)
-            )
             clientOverrideConfiguration.addExecutionInterceptor(object : ExecutionInterceptor {
                 override fun onExecutionFailure(context: Context.FailedExecution, executionAttributes: ExecutionAttributes) {
                     val exception = context.exception()

jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsEndpoints.kt

@@ -9,7 +9,6 @@ object CawsEndpoints {
     const val TOOLKIT_CAWS_DOCS = "https://docs.aws.amazon.com/toolkit-for-jetbrains/latest/userguide/codecatalyst-service.html"
     const val CAWS_SPACES_DOC = "https://docs.aws.amazon.com/codecatalyst/latest/userguide/spaces.html"
 
-    const val CAWS_PROD_API = "https://public.codecatalyst.global.api.aws"
     private const val CAWS_PROD_CONSOLE_BASE = "https://codecatalyst.aws/"
 
     // TODO: fix this heuristic