Merge branch 'main' into mqtt-wildcard-support

aws-greengrass · Sep 11, 2024 · 04ce6ea · 04ce6ea
2 parents c644dbe + 27ef646
commit 04ce6ea
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>com.aws.greengrass</groupId>
             <artifactId>nucleus</artifactId>
-            <version>2.6.0-SNAPSHOT</version>
+            <version>2.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.aws.greengrass</groupId>

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.17.81</version>
+                <version>2.20.138</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -73,13 +73,13 @@
         <dependency>
             <groupId>com.aws.greengrass</groupId>
             <artifactId>nucleus</artifactId>
-            <version>2.6.0-SNAPSHOT</version>
+            <version>2.13.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.aws.greengrass</groupId>
             <artifactId>nucleus</artifactId>
-            <version>2.6.0-SNAPSHOT</version>
+            <version>2.13.0-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/...a/com/aws/greengrass/integrationtests/certificateauthority/OfflineAuthenticationTest.java b/...a/com/aws/greengrass/integrationtests/certificateauthority/OfflineAuthenticationTest.java
@@ -20,6 +20,7 @@
 import com.aws.greengrass.clientdevices.auth.iot.NetworkStateFake;
 import com.aws.greengrass.dependency.State;
 import com.aws.greengrass.lifecyclemanager.Kernel;
+import com.aws.greengrass.mqttclient.MqttRequestException;
 import com.aws.greengrass.mqttclient.spool.SpoolerStoreException;
 import com.aws.greengrass.testcommons.testutilities.GGExtension;
 
@@ -46,6 +47,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
@@ -172,7 +174,8 @@ void GIVEN_clientDevice_WHEN_verifyingItsIdentity_THEN_pemStored(ExtensionContex
     @Test
     void GIVEN_clientConnectsWhileOnline_WHEN_offline_THEN_clientCanConnect(ExtensionContext context) throws Exception {
         ignoreExceptionOfType(context, NoSuchFileException.class);
-
+        ignoreExceptionOfType(context, MqttRequestException.class);
+        ignoreExceptionOfType(context, ExecutionException.class);
         // Given
         network.goOnline();
 
@@ -198,7 +201,8 @@ void GIVEN_clientConnectsWhileOnline_WHEN_offline_THEN_clientCanConnect(Extensio
     void GIVEN_clientConnectsWhileOnline_WHEN_offlineAndTtlExpired_THEN_clientCanNotConnect(ExtensionContext context)
             throws Exception {
         ignoreExceptionOfType(context, NoSuchFileException.class);
-
+        ignoreExceptionOfType(context, MqttRequestException.class);
+        ignoreExceptionOfType(context, ExecutionException.class);
         // Given
         network.goOnline();
         Instant now = Instant.now();
@@ -230,6 +234,8 @@ void GIVEN_clientConnectsWhileOnline_WHEN_offlineAndTtlExpired_THEN_clientCanNot
     void GIVEN_clientConnectsWhileOnline_WHEN_offlineAndCertificateRevoked_THEN_backOnlineAndClientRejected(
             ExtensionContext context) throws Exception {
         ignoreExceptionOfType(context, NoSuchFileException.class);
+        ignoreExceptionOfType(context, MqttRequestException.class);
+        ignoreExceptionOfType(context, ExecutionException.class);
         // Given
         network.goOnline();
 
@@ -260,6 +266,8 @@ void GIVEN_clientConnectsWhileOnline_WHEN_offlineAndCertificateRevoked_THEN_back
     void GIVEN_clientConnectsWhileOnline_WHEN_offlineAndCertDetachedFromThing_THEN_backOnlineAndClientRejected(
             ExtensionContext context) throws Exception {
         ignoreExceptionOfType(context, NoSuchFileException.class);
+        ignoreExceptionOfType(context, MqttRequestException.class);
+        ignoreExceptionOfType(context, ExecutionException.class);
         // Given
         network.goOnline();
 
@@ -291,6 +299,8 @@ void GIVEN_clientConnectsWhileOnline_WHEN_storedPemIsCorrupted_THEN_clientCanSti
             ExtensionContext context) throws Exception {
         ignoreExceptionOfType(context, NoSuchFileException.class);
         ignoreExceptionOfType(context, InvalidCertificateException.class);
+        ignoreExceptionOfType(context, MqttRequestException.class);
+        ignoreExceptionOfType(context, ExecutionException.class);
         // Given
         network.goOnline();
 

diff --git a/src/main/java/com/aws/greengrass/clientdevices/auth/iot/GreengrassV2DataClientFactory.java b/src/main/java/com/aws/greengrass/clientdevices/auth/iot/GreengrassV2DataClientFactory.java
@@ -13,12 +13,16 @@
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.retry.RetryPolicy;
+import software.amazon.awssdk.endpoints.Endpoint;
 import software.amazon.awssdk.http.apache.ApacheHttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.greengrassv2data.GreengrassV2DataClient;
 import software.amazon.awssdk.services.greengrassv2data.GreengrassV2DataClientBuilder;
+import software.amazon.awssdk.services.greengrassv2data.endpoints.GreengrassV2DataEndpointParams;
+import software.amazon.awssdk.services.greengrassv2data.endpoints.GreengrassV2DataEndpointProvider;
 
 import java.net.URI;
+import java.util.concurrent.CompletableFuture;
 import javax.inject.Inject;
 
 /**
@@ -51,14 +55,23 @@ public GreengrassV2DataClient getClient() throws DeviceConfigurationException {
         String ggServiceEndpoint = ClientConfigurationUtils.getGreengrassServiceEndpoint(deviceConfiguration);
         ApacheHttpClient.Builder httpClient = ClientConfigurationUtils.getConfiguredClientBuilder(deviceConfiguration);
 
+        GreengrassV2DataEndpointProvider endpointProvider = new GreengrassV2DataEndpointProvider() {
+            @Override
+            public CompletableFuture<Endpoint> resolveEndpoint(GreengrassV2DataEndpointParams endpointParams) {
+                return CompletableFuture.supplyAsync(() -> Endpoint.builder()
+                        .url(URI.create(ggServiceEndpoint))
+                        .build());
+            }
+        };
+
         GreengrassV2DataClientBuilder clientBuilder =
                 GreengrassV2DataClient.builder().credentialsProvider(AnonymousCredentialsProvider.create())
+                        .endpointProvider(endpointProvider)
                         .httpClientBuilder(httpClient.useIdleConnectionReaper(false))
                         .overrideConfiguration(ClientOverrideConfiguration.builder()
                                 .retryPolicy(RetryPolicy.none()).build());
 
         clientBuilder.region(Region.of(awsRegion));
-        clientBuilder.endpointOverride(URI.create(ggServiceEndpoint));
         return clientBuilder.build();
     }