fix: s3 regional endpoint cover version upgrade scenario (#1543)

aws-greengrass · Oct 11, 2023 · ffdba83 · ffdba83
1 parent df73b0e
commit ffdba83
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/com/aws/greengrass/deployment/DeviceConfiguration.java b/src/main/java/com/aws/greengrass/deployment/DeviceConfiguration.java
@@ -171,6 +171,10 @@ public DeviceConfiguration(Kernel kernel) {
         handleLoggingConfig();
         getComponentStoreMaxSizeBytes().dflt(COMPONENT_STORE_MAX_SIZE_DEFAULT_BYTES);
         getDeploymentPollingFrequencySeconds().dflt(DEPLOYMENT_POLLING_FREQUENCY_DEFAULT_SECONDS);
+        if (System.getProperty(S3_ENDPOINT_PROP_NAME) != null
+                && System.getProperty(S3_ENDPOINT_PROP_NAME).equalsIgnoreCase(S3EndpointType.REGIONAL.name())) {
+            gets3EndpointType().withValue(S3EndpointType.REGIONAL.name());
+        }
         // reset the cache when device configuration changes
         onAnyChange((what, node) -> deviceConfigValidateCachedResult.set(null));
     }

diff --git a/src/test/java/com/aws/greengrass/util/S3SdkClientFactoryTest.java b/src/test/java/com/aws/greengrass/util/S3SdkClientFactoryTest.java
@@ -61,6 +61,7 @@ void clearCache() {
         if(cachedClient != null) {
             cachedClient.close();
         }
+        System.clearProperty(S3_ENDPOINT_PROP_NAME);
     }
 
     @Test
@@ -110,7 +111,7 @@ void GIVEN_valid_configuration_WHEN_updated_THEN_new_added() throws DeviceConfig
     @Test
     void GIVEN_valid_configuration_WHEN_get_client_for_region_THEN_clients_cached() {
         S3SdkClientFactory factory = new S3SdkClientFactory(deviceConfig, credentialProvider);
-
+        factory.handleRegionUpdate();
         try (S3Client client = factory.getClientForRegion(Region.US_WEST_2)) {
             assertThat("has client", client, is(notNullValue()));
             assertThat(S3SdkClientFactory.clientCache, hasEntry(is(Region.US_WEST_2), is(client)));