aws-greengrass · MikeDombo · Jul 21, 2023 · Jun 27, 2023 · Jun 27, 2023 · Jun 27, 2023
diff --git a/.github/workflows/otf.yml b/.github/workflows/otf.yml
@@ -18,6 +18,7 @@ env:
   AWS_REGION: "us-west-2"
   CODE_BUILD_PROJECT_LINUX: "CDAUatCodeBuildLinux"
   AWS_ROLE_TO_ASSUME: "arn:aws:iam::686385081908:role/aws-greengrass-client-device-auth-codebuild-uat-role-linux"
+  CUCUMBER_TAGS: "@GGMQ"
 
 jobs:
   uat-linux:
@@ -41,3 +42,4 @@ jobs:
         with:
           project-name: ${{ env.CODE_BUILD_PROJECT_LINUX }}
           buildspec-override: uat/codebuild/uat_linux_buildspec.yaml
+          env-vars-for-codebuild: CUCUMBER_TAGS
diff --git a/uat/README.md b/uat/README.md
@@ -130,10 +130,10 @@ java -Dggc.archive=greengrass-nucleus-latest.zip -Dtest.log.path=logs -Dtags="@G
 ```
 
 ### Run scenarios on CodeBuild
-Because scenario usually requires upload/download artifacts to S3, create and delete roles, policies, do greengrass discoverty and so one please ensure codeBuild instance have enough AWS permissions to do that.
+Due to scenario usually requires upload/download artifacts to S3, create and delete roles, policies, do Greengrass discovery and so one please ensure CodeBuild instance has enough AWS permissions to do that.
 For more information please read [Create a CodeBuild service role](https://docs.aws.amazon.com/codebuild/latest/userguide/setting-up.html#setting-up-service-role)
 
 ## Limitations
 MQTT clients based on IoT Device SDK for Java v2, mosquitto C, Paho Java, Paho Python do no provide API to get information from PUBREC/PUBREL/PUBCOMP packages used when messages published with QoS 2.
 
-Not all features of MQTT v5.0 has been implemented in clients and supported by gRPC proto and the control as was requested, it is not bugs it is a design requirement.
+Not all features of MQTT v5.0 have been implemented in clients and are supported by gRPC proto and the control as was requested, these are not bugs but designed by requirement.
diff --git a/uat/codebuild/uat_linux_buildspec.yaml b/uat/codebuild/uat_linux_buildspec.yaml
@@ -4,6 +4,9 @@
 #
 
 version: 0.2
+env:
+  variables:
+    CUCUMBER_TAGS: '@GGMQ'
 phases:
   install:
     runtime-versions:
@@ -12,18 +15,23 @@ phases:
     commands:
       - curl -s https://d2s8p88vqu9w66.cloudfront.net/releases/greengrass-nucleus-latest.zip > /tmp/greengrass-nucleus-latest.zip
       - mvn -DskipTests=false -U -ntp clean verify -f uat/pom.xml
-      - java -Dggc.archive=/tmp/greengrass-nucleus-latest.zip -Dtags=GGMQ -jar uat/testing-features/target/client-devices-auth-testing-features.jar
+      - java -Dggc.archive=/tmp/greengrass-nucleus-latest.zip -Dtags="$CUCUMBER_TAGS" -jar uat/testing-features/target/client-devices-auth-testing-features.jar 2>&1 | tee build.log
 
 artifacts:
   files:
     - 'testResults/**/*'
+    - 'build.log'
   name: 'AuthUatLinuxLogs.zip'
 
 reports:
   uat-reports:
     files:
       - "TEST-greengrass-results.xml"
     file-format: "JUNITXML"
+  uat-cucumber-reports:
+    files:
+      - "testResults/cucumber.json"
+    file-format: "CUCUMBERJSON"
 
 cache:
   paths:

diff --git a/...sdk/src/main/java/com/aws/greengrass/testing/mqtt5/client/sdkmqtt/MqttConnectionImpl.java b/...sdk/src/main/java/com/aws/greengrass/testing/mqtt5/client/sdkmqtt/MqttConnectionImpl.java
@@ -250,8 +250,8 @@ public MqttConnectionImpl(@NonNull MqttLib.ConnectionParams connectionParams, @N
     @SuppressWarnings("PMD.AvoidCatchingGenericException")
     @Override
     public ConnectResult start(long timeout, int connectionId) throws MqttException {
-        this.connectionId = connectionId;
         boolean success = false;
+        this.connectionId = connectionId;
         client.start();
         try {
             OnConnectionDoneInfo onConnectionDoneInfo = lifecycleEvents.connectedFuture.get(timeout, TimeUnit.SECONDS);

diff --git a/uat/testing-features/src/main/java/com/aws/greengrass/steps/AssertionSteps.java b/uat/testing-features/src/main/java/com/aws/greengrass/steps/AssertionSteps.java
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
 package com.aws.greengrass.steps;
 
 import com.aws.greengrass.testing.model.ScenarioContext;

diff --git a/uat/testing-features/src/main/java/com/aws/greengrass/steps/MqttControlSteps.java b/uat/testing-features/src/main/java/com/aws/greengrass/steps/MqttControlSteps.java
@@ -1201,7 +1201,7 @@ public void discoverCoreDeviceBroker(String brokerId, String clientDeviceId)
      * @param brokerId broker name in tests
      */
     @And("I label IoT Core broker as {string}")
-    public void addCoreDeviceBroker(String brokerId) {
+    public void addIoTCoreBroker(String brokerId) {
         final String endpoint = resources.lifecycle(IotLifecycle.class)
                                          .dataEndpoint();
         final String ca = registrationContext.rootCA();

diff --git a/uat/testing-features/src/main/resources/greengrass/features/ggmq-1.feature b/uat/testing-features/src/main/resources/greengrass/features/ggmq-1.feature
diff --git a/uat/testing-features/src/main/resources/local-store/recipes/LocalIpcPublisher.yaml b/uat/testing-features/src/main/resources/local-store/recipes/LocalIpcPublisher.yaml
@@ -8,7 +8,7 @@ RecipeFormatVersion: '2020-01-25'
 ComponentName: LocalIpcPublisher
 ComponentVersion: '0.0.0'
 ComponentDescription: IPC publisher client for tests.
-ComponentPublisher: Amazon
+ComponentPublisher: AWS
 ComponentConfiguration:
   DefaultConfiguration:
     topicsToPublish: "pubsub/topic/to/publish/on"

diff --git a/uat/testing-features/src/main/resources/local-store/recipes/LocalIpcSubscriber.yaml b/uat/testing-features/src/main/resources/local-store/recipes/LocalIpcSubscriber.yaml
@@ -8,7 +8,7 @@ RecipeFormatVersion: '2020-01-25'
 ComponentName: aws.greengrass.client.LocalIpcSubscriber
 ComponentVersion: '0.0.0'
 ComponentDescription: IPC subscribed client for tests.
-ComponentPublisher: Amazon
+ComponentPublisher: AWS
 ComponentConfiguration:
   DefaultConfiguration:
     topicsToSubscribe: "*"

diff --git a/uat/testing-features/src/main/resources/local-store/recipes/client_java_paho.yaml b/uat/testing-features/src/main/resources/local-store/recipes/client_java_paho.yaml
@@ -8,7 +8,7 @@ RecipeFormatVersion: '2020-01-25'
 ComponentName: aws.greengrass.client.Mqtt5JavaPahoClient
 ComponentVersion: '1.0.0'
 ComponentDescription: MQTT 5.0/3.1.1 Java Client powered by Eclipse Paho
-ComponentPublisher: Amazon
+ComponentPublisher: AWS
 ComponentConfiguration:
   DefaultConfiguration:
     # agentId should be the same as ComponentName

diff --git a/uat/testing-features/src/main/resources/local-store/recipes/client_java_sdk.yaml b/uat/testing-features/src/main/resources/local-store/recipes/client_java_sdk.yaml
@@ -8,7 +8,7 @@ RecipeFormatVersion: '2020-01-25'
 ComponentName: aws.greengrass.client.Mqtt5JavaSdkClient
 ComponentVersion: '1.0.0'
 ComponentDescription: MQTT 5.0/3.1.1 Java Client powered by AWS Java SDK
-ComponentPublisher: Amazon
+ComponentPublisher: AWS
 ComponentConfiguration:
   DefaultConfiguration:
     # agentId should be the same as ComponentName

diff --git a/uat/testing-features/src/main/resources/local-store/recipes/client_mosquitto_c.yaml b/uat/testing-features/src/main/resources/local-store/recipes/client_mosquitto_c.yaml
@@ -8,7 +8,7 @@ RecipeFormatVersion: '2020-01-25'
 ComponentName: aws.greengrass.client.MqttMosquittoClient
 ComponentVersion: '1.0.0'
 ComponentDescription: MQTT 5.0/3.1.1 client based on Mosquitto C library
-ComponentPublisher: Amazon
+ComponentPublisher: AWS
 ComponentConfiguration:
   DefaultConfiguration:
     # agentId should be the same as ComponentName