Greengrass 2.4 (#173)

Author: bretambrose

README.md

@@ -64,6 +64,7 @@ mvn clean install
 ``` sh
 # NOTE: use the latest version of the CRT here
 
+
 git clone --branch v0.11.5 https://github.com/awslabs/aws-crt-java.git
 
 git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git

samples/BasicPubSub/src/main/java/pubsub/PubSub.java

@@ -22,7 +22,6 @@
 import software.amazon.awssdk.iot.AwsIotMqttConnectionBuilder;
 import software.amazon.awssdk.iot.iotjobs.model.RejectedError;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;

samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java

@@ -5,7 +5,6 @@
 
 package greengrass;
 
-import software.amazon.awssdk.crt.CRT;
 import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.crt.CrtRuntimeException;
 import software.amazon.awssdk.crt.Log;
@@ -25,7 +24,6 @@
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.regex.Pattern;
 
 import static software.amazon.awssdk.iot.discovery.DiscoveryClient.TLS_EXT_ALPN;
 
@@ -165,8 +163,8 @@ public static void main(String[] args) {
             try(final DiscoveryClientConfig discoveryClientConfig =
                         new DiscoveryClientConfig(clientBootstrap, tlsCtxOptions,
                         new SocketOptions(), region, 1, proxyOptions);
-                    final DiscoveryClient discoveryClient = new DiscoveryClient(discoveryClientConfig);
-                    final MqttClientConnection connection = getClientFromDiscovery(discoveryClient, clientBootstrap)) {
+                final DiscoveryClient discoveryClient = new DiscoveryClient(discoveryClientConfig);
+                final MqttClientConnection connection = getClientFromDiscovery(discoveryClient, clientBootstrap)) {
 
                 if ("subscribe".equals(mode) || "both".equals(mode)) {
                     final CompletableFuture<Integer> subFuture = connection.subscribe(topic, QualityOfService.AT_MOST_ONCE, message -> {

samples/Identity/src/main/java/identity/FleetProvisioningSample.java

@@ -28,14 +28,10 @@
 import software.amazon.awssdk.iot.iotidentity.model.RegisterThingSubscriptionRequest;
 
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import java.util.HashMap;
-import java.util.Map;
 import com.google.gson.Gson;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;

samples/README.md

@@ -5,6 +5,7 @@
 * [fleet provisioning](#fleet-provisioning)
 
 **Additional sample apps not described below:**
+
 * [BasicPubSub](https://github.com/aws/aws-iot-device-sdk-java-v2/tree/main/samples/BasicPubSub)
 * [Greengrass](https://github.com/aws/aws-iot-device-sdk-java-v2/tree/main/samples/Greengrass)
 * [PubSubStress](https://github.com/aws/aws-iot-device-sdk-java-v2/tree/main/samples/PubSubStress)

samples/RawPubSub/src/main/java/rawpubsub/RawPubSub.java

@@ -16,7 +16,6 @@
 import software.amazon.awssdk.crt.mqtt.*;
 import software.amazon.awssdk.iot.iotjobs.model.RejectedError;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;

sdk/greengrass/.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

sdk/greengrass/.gitignore

@@ -0,0 +1,9 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build
+
+.idea
+*.swp
+*.swo

sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/AuthenticationData.java

@@ -0,0 +1,16 @@
+package software.amazon.awssdk.eventstreamrpc;
+
+/**
+ * Exact implementation of this is between the EventStreamRPCServiceHandler at the Authentication handler itself
+ */
+public interface AuthenticationData {
+
+    /**
+     * Return a human readable string for who the identity of the client/caller is. This
+     * string must be appropriate for audit logs and enable tracing specific callers/clients
+     * to relevant decision and operations executed
+     *
+     * @return
+     */
+    public String getIdentityLabel();
+}

sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/AuthenticationHandler.java

@@ -0,0 +1,14 @@
+package software.amazon.awssdk.eventstreamrpc;
+
+import software.amazon.awssdk.crt.eventstream.Header;
+
+import java.util.List;
+import java.util.function.BiFunction;
+
+/**
+ * apply() accepts the connection message and produces authentication data from it to at least be
+ * used for authorization decisions
+ *
+ * Exact implementation is up to service implementations to decide what it is and how to handle it
+ */
+public interface AuthenticationHandler extends BiFunction<List<Header>, byte[], AuthenticationData> { }