test

Author: hefroy

.github/template/fwe-build/action.yml

@@ -58,7 +58,7 @@ runs:
       with:
         name: build-${{ inputs.upload-arch }}
         path: |
-          build/src/executionmanagement/aws-iot-fleetwise-edge
+          build/aws-iot-fleetwise-edge
           build/aws-iot-fleetwise-edge-${{ inputs.upload-arch }}.tar.gz
           build/Testing/Temporary/
           build/**/report-*.xml

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
           build-arch: "native"
           upload-arch: "amd64"
           cache-paths: /usr/local/x86_64-linux-gnu
-          dist-files: build/src/executionmanagement/aws-iot-fleetwise-edge:.
+          dist-files: build/aws-iot-fleetwise-edge:.
 
   build-arm64:
     runs-on: ubuntu-20.04
@@ -49,7 +49,7 @@ jobs:
           build-arch: "cross-arm64"
           upload-arch: "arm64"
           cache-paths: /usr/local/aarch64-linux-gnu:/usr/local/x86_64-linux-gnu
-          dist-files: build/src/executionmanagement/aws-iot-fleetwise-edge:.
+          dist-files: build/aws-iot-fleetwise-edge:.
 
   build-armhf:
     runs-on: ubuntu-20.04
@@ -60,7 +60,7 @@ jobs:
           build-arch: "cross-armhf"
           upload-arch: "armhf"
           cache-paths: /usr/local/arm-linux-gnueabihf:/usr/local/x86_64-linux-gnu
-          dist-files: build/src/executionmanagement/aws-iot-fleetwise-edge:.
+          dist-files: build/aws-iot-fleetwise-edge:.
 
   build-android:
     runs-on: ubuntu-20.04
@@ -70,11 +70,11 @@ jobs:
         with:
           build-arch: "cross-android"
           upload-arch: "android"
-          cache-paths: /usr/local/aarch64-linux-android:/usr/local/armv7a-linux-androideabi:/usr/local/x86_64-linux-gnu
+          cache-paths: /usr/local/x86_64-linux-android:/usr/local/aarch64-linux-android:/usr/local/armv7a-linux-androideabi:/usr/local/x86_64-linux-gnu
           dist-files:
-            build/x86_64/src/executionmanagement/libaws-iot-fleetwise-edge.so:x86_64
-            build/armeabi-v7a/src/executionmanagement/libaws-iot-fleetwise-edge.so:armeabi-v7a
-            build/arm64-v8a/src/executionmanagement/libaws-iot-fleetwise-edge.so:arm64-v8a
+            build/x86_64/libaws-iot-fleetwise-edge.so:x86_64
+            build/armeabi-v7a/libaws-iot-fleetwise-edge.so:armeabi-v7a
+            build/arm64-v8a/libaws-iot-fleetwise-edge.so:arm64-v8a
       - name: build-app
         run: |
           mkdir -p tools/android-app/app/src/main/jniLibs

.pre-commit-config.yaml

@@ -26,6 +26,23 @@ repos:
       - id: detect-aws-credentials
         args: [--allow-missing-credentials]
       - id: detect-private-key
+  - repo: local
+    hooks:
+      - id: replace-c-headers
+        name: replace-c-headers
+        entry: |
+          sed -i -e 's/#include <stdint.h>/#include <cstdint>/'
+            -e 's/#include <stddef.h>/#include <cstddef>/'
+            -e 's/#include <stdlib.h>/#include <cstdlib>/'
+            -e 's/#include <math.h>/#include <cmath>/'
+            -e 's/#include <string.h>/#include <cstring>/'
+            -e 's/#include <ctype.h>/#include <cctype>/'
+            -e 's/#include <stdio.h>/#include <cstdio>/'
+            -e 's/#include <time.h>/#include <ctime>/'
+            -e 's/#include <limits.h>/#include <climits>/'
+        language: system
+        verbose: true
+        types: [c++]
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v10.0.1
     hooks:
@@ -81,27 +98,21 @@ repos:
     hooks:
       - id: validate-static-config
         name: validate-static-config
-        # pre-commit intentionally pass all files as args to the command.
-        # Since the json command only takes one file at once we need some shell script to split the args.
         entry:
-          bash -c 'for x in "$@"; do echo "Validating file $x"; json validate --schema-file
-          interfaces/protobuf/schemas/edgeConfiguration/staticConfiguration.json --document-file
-          "$x"; done' --
+          check-jsonschema --schemafile
+          interfaces/protobuf/schemas/edgeConfiguration/staticConfiguration.json --
         language: python
         files: "configuration/static-config.json|tools/android-app/app/src/main/assets/config-0.json"
         types: [json]
-        additional_dependencies: ["json-spec==0.10.1"]
+        additional_dependencies: ["check-jsonschema==0.25.0"]
         verbose: true
       - id: validate-persistency-metadata
         name: validate-persistency-metadata
-        # pre-commit intentionally pass all files as args to the command.
-        # Since the json command only takes one file at once we need some shell script to split the args.
         entry:
-          bash -c 'for x in "$@"; do echo "Validating file $x"; json validate --schema-file
-          interfaces/persistency/schemas/persistencyMetadataFormat.json --document-file "$x"; done'
-          --
+          check-jsonschema --schemafile
+          interfaces/persistency/schemas/persistencyMetadataFormat.json --
         language: python
         files: "interfaces/persistency/examples/persistencyMetadataFormat.json"
         types: [json]
-        additional_dependencies: ["json-spec==0.10.1"]
+        additional_dependencies: ["check-jsonschema==0.25.0"]
         verbose: true

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## TBD
+
+Improvements:
+
+- Update AWS C++ SDK to v1.11.148, which includes an
+  [important bugfix](https://github.com/awslabs/aws-c-mqtt/pull/311) for MQTT 3.1.1 clients.
+- Simplify `src/` folder structure, removing sub-namespaces & sub-libraries, and moving unit test
+  files to `test/unit/`.
+
 ## v1.0.7 (2023-08-01)
 
 Features: