Make sure it gets set for now

damccorm · damccorm · commit 80daeb5a390e · 2024-12-23T11:18:46.000-05:00
diff --git a/sdks/java/io/amazon-web-services2/src/main/java/org/apache/beam/sdk/io/aws2/common/ClientBuilderFactory.java b/sdks/java/io/amazon-web-services2/src/main/java/org/apache/beam/sdk/io/aws2/common/ClientBuilderFactory.java
@@ -203,11 +203,11 @@ public <BuilderT extends AwsClientBuilder<BuilderT, ClientT>, ClientT> BuilderT
                 httpConfig.socketTimeout(), client::writeTimeout); // fallback for writeTimeout
             setOptional(httpConfig.writeTimeout(), client::writeTimeout);
             setOptional(httpConfig.maxConnections(), client::maxConcurrency);
-
-            // TODO - gate this behind a flag.
-            client.tlsKeyManagersProvider(NoneTlsKeyManagersProvider.getInstance());
           }
 
+          // TODO - gate this behind a flag.
+          client.tlsKeyManagersProvider(NoneTlsKeyManagersProvider.getInstance());
+
           // must use builder to make sure client is managed by the SDK
           ((SdkAsyncClientBuilder<?, ?>) builder).httpClientBuilder(client);
         }

Original file line number	Diff line number	Diff line change
`@@ -203,11 +203,11 @@ public <BuilderT extends AwsClientBuilder<BuilderT, ClientT>, ClientT> BuilderT`
`203`	`203`	`httpConfig.socketTimeout(), client::writeTimeout); // fallback for writeTimeout`
`204`	`204`	`setOptional(httpConfig.writeTimeout(), client::writeTimeout);`
`205`	`205`	`setOptional(httpConfig.maxConnections(), client::maxConcurrency);`
`206`		`-`
`207`		`- // TODO - gate this behind a flag.`
`208`		`- client.tlsKeyManagersProvider(NoneTlsKeyManagersProvider.getInstance());`
`209`	`206`	`}`
`210`	`207`
	`208`	`+ // TODO - gate this behind a flag.`
	`209`	`+ client.tlsKeyManagersProvider(NoneTlsKeyManagersProvider.getInstance());`
	`210`	`+`
`211`	`211`	`// must use builder to make sure client is managed by the SDK`
`212`	`212`	`((SdkAsyncClientBuilder<?, ?>) builder).httpClientBuilder(client);`
`213`	`213`	`}`