Fix issue with competing SDK proxy configuration (#4291)

Author: breedloj

.changes/next-release/bugfix-c8090208-8e8a-4a41-bcdd-02579f74d40e.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix issue with competing SDK proxy configuration (#4279)"
+}

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ apache-commons-collections = "4.4"
 apache-commons-io = "2.16.0"
 assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.com/issue/KT-17765
 # match with <root>/settings.gradle.kts
-awsSdk = "2.21.33"
+awsSdk = "2.25.32"
 commonmark = "0.17.1"
 detekt = "1.23.6"
 intellijGradle = "1.17.3"

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsSdkClient.kt

@@ -24,7 +24,12 @@ class AwsSdkClient : SdkClientProvider, Disposable {
     private val sdkHttpClient: SdkHttpClient by lazy {
         LOG.info { "Create new Apache client" }
         val httpClientBuilder = ApacheHttpClient.builder()
-            .proxyConfiguration(ProxyConfiguration.builder().useSystemPropertyValues(false).build())
+            .proxyConfiguration(
+                ProxyConfiguration.builder()
+                    .useSystemPropertyValues(false)
+                    .useEnvironmentVariableValues(false)
+                    .build()
+            )
             .httpRoutePlanner(SystemDefaultRoutePlanner(CommonProxy.getInstance()))
             .credentialsProvider(SystemDefaultCredentialsProvider())
             .tlsTrustManagersProvider { arrayOf(CertificateManager.getInstance().trustManager) }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitCredentialProcessProvider.kt

@@ -69,7 +69,7 @@ class ToolkitCredentialProcessProvider @TestOnly constructor(
         } catch (e: Exception) {
             handleException(message("credentials.profile.credential_process.parse_exception_prefix"), output)
         }
-        val credentials = when (val token = result.sessionToken) {
+        val credentials: AwsCredentials = when (val token = result.sessionToken) {
             null -> AwsBasicCredentials.create(result.accessKeyId, result.secretAccessKey)
             else -> AwsSessionCredentials.create(result.accessKeyId, result.secretAccessKey, token)
         }

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/AwsSdkClientTest.kt

@@ -20,6 +20,8 @@ import org.junit.Test
 import software.amazon.awssdk.http.HttpExecuteRequest
 import software.amazon.awssdk.http.SdkHttpFullRequest
 import software.amazon.awssdk.http.SdkHttpMethod
+import software.aws.toolkits.core.rules.EnvironmentVariableHelper
+import software.aws.toolkits.core.rules.SystemPropertyHelper
 import java.net.URI
 
 class AwsSdkClientTest {
@@ -31,6 +33,14 @@ class AwsSdkClientTest {
     @JvmField
     val wireMock = createSelfSignedServer()
 
+    @Rule
+    @JvmField
+    val sysProps = SystemPropertyHelper()
+
+    @Rule
+    @JvmField
+    val environmentVariableHelper = EnvironmentVariableHelper()
+
     @Before
     fun setUp() {
         stubFor(any(urlPathEqualTo("/")).willReturn(aResponse().withStatus(200)))
@@ -63,6 +73,43 @@ class AwsSdkClientTest {
         assertThat(trustManager.containsCertificate("selfsign")).isTrue()
     }
 
+    @Test
+    fun systemPropertyProxyConfigurationIgnored() {
+        System.setProperty("http.proxyHost", "foo.com")
+        System.setProperty("http.proxyPort", Integer.toString(8888))
+
+        val request = mockSdkRequest("https://localhost:" + wireMock.httpsPort())
+
+        val awsSdkClient = AwsSdkClient()
+        val response = try {
+            awsSdkClient.sharedSdkClient().prepareRequest(
+                HttpExecuteRequest.builder().request(request).build()
+            ).call()
+        } finally {
+            Disposer.dispose(awsSdkClient)
+        }
+
+        assertThat(response.httpResponse().isSuccessful).isTrue()
+    }
+
+    @Test
+    fun environmentVariableProxyConfigurationIgnored() {
+        environmentVariableHelper.set("HTTP_PROXY", "https://foo.com:8888")
+
+        val request = mockSdkRequest("https://localhost:" + wireMock.httpsPort())
+
+        val awsSdkClient = AwsSdkClient()
+        val response = try {
+            awsSdkClient.sharedSdkClient().prepareRequest(
+                HttpExecuteRequest.builder().request(request).build()
+            ).call()
+        } finally {
+            Disposer.dispose(awsSdkClient)
+        }
+
+        assertThat(response.httpResponse().isSuccessful).isTrue()
+    }
+
     private fun mockSdkRequest(uriString: String): SdkHttpFullRequest? {
         val uri = URI.create(uriString)
         return SdkHttpFullRequest.builder()