To support VSOCK, stop limiting port to 16 bits. (#526)

graebm · web-flow · commit bf8912af990d · 2024-01-04T11:00:46.000-08:00
diff --git a/android/iotdevicesdk/build.gradle b/android/iotdevicesdk/build.gradle
@@ -92,7 +92,7 @@ repositories {
 }
 
 dependencies {
-    api 'software.amazon.awssdk.crt:aws-crt-android:0.29.3'
+    api 'software.amazon.awssdk.crt:aws-crt-android:0.29.5'
     implementation 'org.slf4j:slf4j-api:1.7.30'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
diff --git a/deviceadvisor/tests/JobExecution/src/main/java/jobExecution/JobExecution.java b/deviceadvisor/tests/JobExecution/src/main/java/jobExecution/JobExecution.java
@@ -39,7 +39,7 @@
 
 public class JobExecution {
     static String clientId = "test-" + UUID.randomUUID().toString();
-    static short port = 8883;
+    static int port = 8883;
 
     static MqttClientConnection connection;
     static IotJobsClient jobs;
diff --git a/deviceadvisor/tests/MQTTConnect/src/main/java/MQTTConnect/MQTTConnect.java b/deviceadvisor/tests/MQTTConnect/src/main/java/MQTTConnect/MQTTConnect.java
@@ -49,7 +49,7 @@ public static void main(String[] args) {
         try(AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(DATestUtils.certificatePath, DATestUtils.keyPath)) {
             builder.withClientId(clientId)
                 .withEndpoint(DATestUtils.endpoint)
-                .withPort((short)port)
+                .withPort(port)
                 .withCleanSession(true)
                 .withPingTimeoutMs(60000)
                 .withProtocolOperationTimeoutMs(60000);
diff --git a/deviceadvisor/tests/MQTTPublish/src/main/java/MQTTPublish/MQTTPublish.java b/deviceadvisor/tests/MQTTPublish/src/main/java/MQTTPublish/MQTTPublish.java
@@ -52,7 +52,7 @@ public static void main(String[] args) {
 
             builder.withClientId(clientId)
                 .withEndpoint(DATestUtils.endpoint)
-                .withPort((short)port)
+                .withPort(port)
                 .withCleanSession(true)
                 .withPingTimeoutMs(60000)
                 .withProtocolOperationTimeoutMs(60000);
diff --git a/deviceadvisor/tests/MQTTSubscribe/src/main/java/MQTTSubscribe/MQTTSubscribe.java b/deviceadvisor/tests/MQTTSubscribe/src/main/java/MQTTSubscribe/MQTTSubscribe.java
@@ -50,7 +50,7 @@ public static void main(String[] args) {
 
             builder.withClientId(clientId)
                 .withEndpoint(DATestUtils.endpoint)
-                .withPort((short)port)
+                .withPort(port)
                 .withCleanSession(true)
                 .withPingTimeoutMs(60000)
                 .withProtocolOperationTimeoutMs(60000);
diff --git a/deviceadvisor/tests/ShadowUpdate/src/main/java/shadowUpdate/ShadowUpdate.java b/deviceadvisor/tests/ShadowUpdate/src/main/java/shadowUpdate/ShadowUpdate.java
@@ -81,7 +81,7 @@ public static void main(String[] args) {
         try(AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(DATestUtils.certificatePath, DATestUtils.keyPath)) {
             builder.withClientId(clientId)
                     .withEndpoint(DATestUtils.endpoint)
-                    .withPort((short)port)
+                    .withPort(port)
                     .withCleanSession(true)
                     .withProtocolOperationTimeoutMs(60000);
 
diff --git a/samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java b/samples/BasicConnect/src/main/java/basicconnect/BasicConnect.java
@@ -75,7 +75,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {
diff --git a/samples/BasicPubSub/src/main/java/pubsub/PubSub.java b/samples/BasicPubSub/src/main/java/pubsub/PubSub.java
@@ -79,7 +79,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {
diff --git a/samples/CustomKeyOpsConnect/src/main/java/customkeyopsconnect/CustomKeyOpsConnect.java b/samples/CustomKeyOpsConnect/src/main/java/customkeyopsconnect/CustomKeyOpsConnect.java
@@ -181,7 +181,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {
diff --git a/samples/FleetProvisioning/src/main/java/fleetprovisioning/FleetProvisioningSample.java b/samples/FleetProvisioning/src/main/java/fleetprovisioning/FleetProvisioningSample.java
@@ -174,7 +174,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             connection = builder.build();
diff --git a/samples/FleetProvisioning/src/main/java/fleetprovisioning/Mqtt5FleetProvisioningSample.java b/samples/FleetProvisioning/src/main/java/fleetprovisioning/Mqtt5FleetProvisioningSample.java
@@ -182,7 +182,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                     .withClientId(cmdData.input_clientId)
                     .withEndpoint(cmdData.input_endpoint)
-                    .withPort((short) cmdData.input_port)
+                    .withPort(cmdData.input_port)
                     .withCleanSession(true)
                     .withProtocolOperationTimeoutMs(60000);
             connection = builder.build();
diff --git a/samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java b/samples/Greengrass/src/main/java/greengrass/BasicDiscovery.java
@@ -171,7 +171,7 @@ private static MqttClientConnection getClientFromDiscovery(final DiscoveryClient
 
                     final AwsIotMqttConnectionBuilder connectionBuilder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(input_certPath, input_keyPath)
                             .withClientId(input_thingName)
-                            .withPort(port.shortValue())
+                            .withPort(port)
                             .withEndpoint(dnsOrIp)
                             .withConnectionEventCallbacks(new MqttClientConnectionEvents() {
                                 @Override
diff --git a/samples/JavaKeystoreConnect/src/main/java/javakeystoreconnect/JavaKeystoreConnect.java b/samples/JavaKeystoreConnect/src/main/java/javakeystoreconnect/JavaKeystoreConnect.java
@@ -91,7 +91,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {
diff --git a/samples/Jobs/src/main/java/jobs/JobsSample.java b/samples/Jobs/src/main/java/jobs/JobsSample.java
@@ -121,7 +121,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             MqttClientConnection connection = builder.build();
diff --git a/samples/Pkcs11Connect/src/main/java/pkcs11connect/Pkcs11Connect.java b/samples/Pkcs11Connect/src/main/java/pkcs11connect/Pkcs11Connect.java
@@ -96,7 +96,7 @@ public void onConnectionResumed(boolean sessionPresent) {
                 builder.withConnectionEventCallbacks(callbacks)
                         .withClientId(cmdData.input_clientId)
                         .withEndpoint(cmdData.input_endpoint)
-                        .withPort((short) cmdData.input_port)
+                        .withPort(cmdData.input_port)
                         .withCleanSession(true)
                         .withProtocolOperationTimeoutMs(60000);
 
diff --git a/samples/Pkcs12Connect/src/main/java/pkcs12connect/Pkcs12Connect.java b/samples/Pkcs12Connect/src/main/java/pkcs12connect/Pkcs12Connect.java
@@ -74,7 +74,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             MqttClientConnection connection = builder.build();
diff --git a/samples/Shadow/src/main/java/shadow/ShadowSample.java b/samples/Shadow/src/main/java/shadow/ShadowSample.java
@@ -220,7 +220,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             MqttClientConnection connection = builder.build();
diff --git a/samples/WebsocketConnect/src/main/java/websocketconnect/WebsocketConnect.java b/samples/WebsocketConnect/src/main/java/websocketconnect/WebsocketConnect.java
@@ -74,7 +74,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             if (cmdData.input_proxyHost != "" && cmdData.input_proxyPort > 0) {
diff --git a/samples/WindowsCertConnect/src/main/java/windowscertconnect/WindowsCertConnect.java b/samples/WindowsCertConnect/src/main/java/windowscertconnect/WindowsCertConnect.java
@@ -69,7 +69,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             MqttClientConnection connection = builder.build();
diff --git a/samples/X509CredentialsProviderConnect/src/main/java/x509credentialsproviderconnect/X509CredentialsProviderConnect.java b/samples/X509CredentialsProviderConnect/src/main/java/x509credentialsproviderconnect/X509CredentialsProviderConnect.java
@@ -78,7 +78,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             builder.withConnectionEventCallbacks(callbacks)
                 .withClientId(cmdData.input_clientId)
                 .withEndpoint(cmdData.input_endpoint)
-                .withPort((short)cmdData.input_port)
+                .withPort(cmdData.input_port)
                 .withCleanSession(true)
                 .withProtocolOperationTimeoutMs(60000);
             HttpProxyOptions proxyOptions = null;
diff --git a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java
@@ -89,7 +89,7 @@ public CompletableFuture<Void> connect(final LifecycleHandler lifecycleHandler)
         }
         final CompletableFuture<Void> initialConnectFuture = new CompletableFuture<>();
 
-        ClientConnection.connect(config.getHost(), (short) config.getPort(), config.getSocketOptions(),
+        ClientConnection.connect(config.getHost(), config.getPort(), config.getSocketOptions(),
                 config.getTlsContext(), config.getClientBootstrap(), new ClientConnectionHandler() {
                     @Override
                     protected void onConnectionSetup(final ClientConnection clientConnection, int errorCode) {
diff --git a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnectionConfig.java
@@ -52,12 +52,9 @@ public EventStreamRPCConnectionConfig(ClientBootstrap clientBootstrap, EventLoop
         this.port = port;
         this.connectMessageAmender = connectMessageAmender;
 
-        //perform cast to throw exception here if port value is out of short value range
-        final short shortPort = (short)port;
-
         //bit of C++ RAII here, validate what we can
         if (clientBootstrap == null || eventLoopGroup == null || socketOptions == null ||
-            host == null || host.isEmpty() || port < 0) {
+            host == null || host.isEmpty()) {
             throw new IllegalArgumentException("EventStreamRPCConnectionConfig values are invalid!");
         }
     }
diff --git a/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java b/sdk/greengrass/event-stream-rpc-server/src/main/java/software/amazon/awssdk/eventstreamrpc/RpcServer.java
@@ -66,7 +66,7 @@ public void runServer() {
         }
         serverBootstrap = new ServerBootstrap(eventLoopGroup);
         tlsContext = tlsContextOptions != null ? new ServerTlsContext(tlsContextOptions) : null;
-        listener = new ServerListener(hostname, (short) port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() {
+        listener = new ServerListener(hostname, port, socketOptions, tlsContext, serverBootstrap, new ServerListenerHandler() {
                 @Override
                 public ServerConnectionHandler onNewConnection(ServerConnection serverConnection, int errorCode) {
                     try {
diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>software.amazon.awssdk.crt</groupId>
       <artifactId>aws-crt</artifactId>
-      <version>0.29.3</version>
+      <version>0.29.5</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqttConnectionBuilder.java b/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqttConnectionBuilder.java
@@ -272,7 +272,7 @@ public AwsIotMqttConnectionBuilder withEndpoint(String endpoint) {
      *             MQTT, or 443 for websockets
      * @return {@link AwsIotMqttConnectionBuilder}
      */
-    public AwsIotMqttConnectionBuilder withPort(short port) {
+    public AwsIotMqttConnectionBuilder withPort(int port) {
         this.config.setPort(port);
         return this;
     }
diff --git a/servicetests/tests/Utils/MqttClientConnectionWrapper/utils/mqttclientconnectionwrapper/MqttClientConnectionWrapperCreator.java b/servicetests/tests/Utils/MqttClientConnectionWrapper/utils/mqttclientconnectionwrapper/MqttClientConnectionWrapperCreator.java
@@ -29,7 +29,7 @@ static MqttClientConnectionWrapper createMqtt3Connection(
         try (AwsIotMqttConnectionBuilder builder = AwsIotMqttConnectionBuilder.newMtlsBuilderFromPath(cert, key)) {
             builder.withClientId(clientId)
                 .withEndpoint(endpoint)
-                .withPort((short)port)
+                .withPort(port)
                 .withCleanSession(true);
             return new Mqtt3ClientConnectionWrapper(builder);
         } catch (Exception ex) {
diff --git a/update-crt.py b/update-crt.py
@@ -19,7 +19,7 @@
 ## 5. `Python update-crt.py --check_consistency`
 ##     Make sure crt and sdk version specified in the files are consistent. The script will not update any file with this option.
 
-VERSION_PATTERN = '\d+\.\d+\.\d+'
+VERSION_PATTERN = r'\d+\.\d+\.\d+'
 
 parser = argparse.ArgumentParser(
     description="Update files containing hard-coded aws-crt-java version numbers.")

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ repositories {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`dependencies {`
`95`		`- api 'software.amazon.awssdk.crt:aws-crt-android:0.29.3'`
	`95`	`+ api 'software.amazon.awssdk.crt:aws-crt-android:0.29.5'`
`96`	`96`	`implementation 'org.slf4j:slf4j-api:1.7.30'`
`97`	`97`	`implementation 'com.google.code.gson:gson:2.9.0'`
`98`	`98`	`implementation 'androidx.appcompat:appcompat:1.1.0'`