Add client for IoT command service

.builder/actions/sdk-ci-prep.py

@@ -0,0 +1,17 @@
+import Builder
+import os
+
+class SdkCiPrep(Builder.Action):
+    def run(self, env):
+        if os.environ.get('AWS_ACCESS_KEY_ID') != None:
+            print(f"Local credentials exist")
+            if os.environ.get('AWS_SESSION_TOKEN') != None:
+                print(f"Local credentials are session based")
+        else:
+            print(f"No Local credentials")
+
+
+        actions = [
+            Builder.SetupCrossCICrtEnvironment()
+        ]
+        return Builder.Script(actions, name='sdk-ci-prep')

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
       - 'docs'
 
 env:
-  BUILDER_VERSION: v0.9.56
+  BUILDER_VERSION: v0.9.72
   BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-iot-device-sdk-cpp-v2
@@ -153,6 +153,11 @@ jobs:
     permissions:
       id-token: write # This is required for requesting the JWT
     steps:
+      - name: configure AWS credentials (containers)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           md ${{ env.CI_FOLDER }}
@@ -202,6 +207,11 @@ jobs:
     permissions:
       id-token: write # This is required for requesting the JWT
     steps:
+      - name: configure AWS credentials (containers)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           md ${{ env.CI_FOLDER }}
@@ -247,6 +257,11 @@ jobs:
     permissions:
       id-token: write # This is required for requesting the JWT
     steps:
+      - name: configure AWS credentials (containers)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           md ${{ env.CI_FOLDER }}
@@ -292,30 +307,40 @@ jobs:
     permissions:
       id-token: write # This is required for requesting the JWT
     steps:
-    - name: Build ${{ env.PACKAGE_NAME }} + consumers
-      run: |
-        md ${{ env.CI_FOLDER }}
-        cd ${{ env.CI_FOLDER }}
-        python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')"
-        python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DUSE_CPU_EXTENSIONS=OFF
-    - name: Running samples in CI setup
-      run: |
-        python -m pip install boto3
-    - name: configure AWS credentials (CyclePubSub)
-      uses: aws-actions/configure-aws-credentials@v2
-      with:
-        role-to-assume: ${{ env.CI_CYCLEPUBSUB_ROLE }}
-        aws-region: ${{ env.AWS_DEFAULT_REGION }}
-    - name: Run and check AppVerifier
-      run: |
-        cd ${{ env.CI_FOLDER }}
-        echo "Starting to run AppVerifier with cycle pub-sub sample"
-        python ${{ env.CI_UTILS_FOLDER }}/appverifier_launch_sample.py --sample_file ".\aws-iot-device-sdk-cpp-v2\build\samples\pub_sub\cycle_pub_sub\RelWithDebInfo\cycle-pub-sub.exe" --sample_secret_endpoint 'ci/endpoint' --sample_secret_certificate 'ci/CyclePubSub/cert' --sample_secret_private_key 'ci/CyclePubSub/key'
+      - name: configure AWS credentials (containers)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
+      - name: Build ${{ env.PACKAGE_NAME }} + consumers
+        run: |
+          md ${{ env.CI_FOLDER }}
+          cd ${{ env.CI_FOLDER }}
+          python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')"
+          python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DUSE_CPU_EXTENSIONS=OFF
+      - name: Running samples in CI setup
+        run: |
+          python -m pip install boto3
+      - name: configure AWS credentials (CyclePubSub)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_CYCLEPUBSUB_ROLE }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
+      - name: Run and check AppVerifier
+        run: |
+          cd ${{ env.CI_FOLDER }}
+          echo "Starting to run AppVerifier with cycle pub-sub sample"
+          python ${{ env.CI_UTILS_FOLDER }}/appverifier_launch_sample.py --sample_file ".\aws-iot-device-sdk-cpp-v2\build\samples\pub_sub\cycle_pub_sub\RelWithDebInfo\cycle-pub-sub.exe" --sample_secret_endpoint 'ci/endpoint' --sample_secret_certificate 'ci/CyclePubSub/cert' --sample_secret_private_key 'ci/CyclePubSub/key'
   windows-shared-lib:
     runs-on: windows-latest
     permissions:
       id-token: write # This is required for requesting the JWT
     steps:
+      - name: configure AWS credentials (containers)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           md ${{ env.CI_FOLDER }}
@@ -334,6 +359,11 @@ jobs:
       id-token: write # This is required for requesting the JWT
       security-events: write # This is required for pkcs12 sample to sign the key
     steps:
+      - name: configure AWS credentials (containers)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder')"
@@ -398,6 +428,11 @@ jobs:
     permissions:
       id-token: write # This is required for requesting the JWT
     steps:
+      - name: configure AWS credentials (containers)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
@@ -458,6 +493,11 @@ jobs:
           sudo apt install cmake
           gcc --version
           cmake --version
+      - name: configure AWS credentials (containers)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           echo "Downloading source"
@@ -694,6 +734,11 @@ jobs:
     permissions:
       id-token: write # This is required for requesting the JWT
     steps:
+      - name: configure AWS credentials (containers)
+        uses: aws-actions/configure-aws-credentials@v2
+        with:
+          role-to-assume: ${{ env.CI_IOT_CONTAINERS }}
+          aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
           echo "Downloading source"

CMakeLists.txt

@@ -87,6 +87,7 @@ add_subdirectory(jobs)
 add_subdirectory(shadow)
 add_subdirectory(discovery)
 add_subdirectory(identity)
+add_subdirectory(commands)
 add_subdirectory(eventstream_rpc)
 add_subdirectory(greengrass_ipc)
 if (NOT BYO_CRYPTO)

builder.json

@@ -23,6 +23,10 @@
     "build",
     "build-samples"
   ],
+  "test_steps": [
+    "sdk-ci-prep",
+    "test"
+  ],
   "variants" : {
     "skip_sample": {
         "!build_steps": [
@@ -47,5 +51,12 @@
           "build-gg-samples"
         ]
     }
+  },
+  "targets" : {
+    "macos" : {
+      "!test_steps": [
+        "test"
+      ]
+    }
   }
 }

commands/CMakeLists.txt

@@ -0,0 +1,127 @@
+# This file is generated
+
+cmake_minimum_required(VERSION 3.9...3.31)
+
+project(IotCommands-cpp LANGUAGES CXX VERSION ${SIMPLE_VERSION})
+
+set(GENERATED_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
+set(GENERATED_INCLUDE_DIR "${GENERATED_ROOT_DIR}/include")
+set(GENERATED_CONFIG_HEADER "${GENERATED_INCLUDE_DIR}/aws/iotcommands/Config.h")
+configure_file(include/aws/iotcommands/Config.h.in ${GENERATED_CONFIG_HEADER} @ONLY)
+
+if (NOT CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 11)
+endif()
+
+file(GLOB AWS_IOTCOMMANDS_HEADERS
+        "include/aws/iotcommands/*.h"
+        ${GENERATED_CONFIG_HEADER}
+)
+
+file(GLOB AWS_IOTCOMMANDS_SRC
+       "source/*.cpp"
+)
+
+file(GLOB AWS_IOTCOMMANDS_CPP_SRC
+        ${AWS_IOTCOMMANDS_SRC}
+)
+
+if (WIN32)
+    if (MSVC)
+        source_group("Header Files\\aws\\iotcommands\\" FILES ${AWS_IOTCOMMANDS_HEADERS})
+
+        source_group("Source Files" FILES ${AWS_IOTCOMMANDS_SRC})
+    endif ()
+endif()
+
+add_library(IotCommands-cpp ${AWS_IOTCOMMANDS_CPP_SRC})
+
+set_target_properties(IotCommands-cpp PROPERTIES LINKER_LANGUAGE CXX)
+
+set(CMAKE_C_FLAGS_DEBUGOPT "")
+
+#set warnings
+if (MSVC)
+    target_compile_options(IotCommands-cpp PRIVATE /W4 /WX)
+else ()
+    target_compile_options(IotCommands-cpp PRIVATE -Wall -Wno-long-long -pedantic -Werror)
+endif ()
+
+target_compile_definitions(IotCommands-cpp PRIVATE $<$<CONFIG:Debug>:DEBUG_BUILD>)
+
+if (BUILD_SHARED_LIBS)
+    target_compile_definitions(IotCommands-cpp PUBLIC "-DAWS_IOTCOMMANDS_USE_IMPORT_EXPORT")
+    target_compile_definitions(IotCommands-cpp PRIVATE "-DAWS_IOTCOMMANDS_EXPORTS")
+
+    install(TARGETS IotCommands-cpp
+            EXPORT IotCommands-cpp-targets
+            ARCHIVE
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            COMPONENT Development
+            LIBRARY
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            NAMELINK_SKIP
+            COMPONENT Runtime
+            RUNTIME
+            DESTINATION ${CMAKE_INSTALL_BINDIR}
+            COMPONENT Runtime)
+
+    install(TARGETS IotCommands-cpp
+            EXPORT IotCommands-cpp-targets
+            LIBRARY
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            NAMELINK_ONLY
+            COMPONENT Development)
+else()
+    install(TARGETS IotCommands-cpp
+            EXPORT IotCommands-cpp-targets
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            COMPONENT Development)
+endif()
+
+target_include_directories(IotCommands-cpp PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>)
+
+if (BUILD_DEPS)
+    if (NOT IS_SUBDIRECTORY_INCLUDE)
+        aws_use_package(aws-crt-cpp)
+    endif()
+endif()
+
+target_link_libraries(IotCommands-cpp ${DEP_AWS_LIBS})
+
+install(FILES ${AWS_IOTCOMMANDS_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iotcommands/" COMPONENT Development)
+
+if (BUILD_SHARED_LIBS)
+    set(TARGET_DIR "shared")
+else()
+    set(TARGET_DIR "static")
+endif()
+
+include(CMakePackageConfigHelpers)
+if (DEFINED SIMPLE_VERSION)
+    write_basic_package_version_file(
+        "${CMAKE_CURRENT_BINARY_DIR}/iotcommands-cpp-config-version.cmake"
+        COMPATIBILITY SameMajorVersion
+    )
+endif()
+
+install(EXPORT "IotCommands-cpp-targets"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/IotCommands-cpp/${TARGET_DIR}"
+        NAMESPACE AWS::
+        COMPONENT Development)
+
+configure_file("cmake/iotcommands-cpp-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/iotcommands-cpp-config.cmake"
+        @ONLY)
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/iotcommands-cpp-config.cmake"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/IotCommands-cpp/"
+        COMPONENT Development)
+
+if(NOT CMAKE_CROSSCOMPILING)
+    if (BUILD_TESTING AND NOT BYO_CRYPTO)
+        add_subdirectory(tests)
+    endif()
+endif()

commands/cmake/iotcommands-cpp-config.cmake

@@ -0,0 +1,25 @@
+# This file is generated
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(aws-crt-cpp)
+
+macro(aws_load_targets type)
+    include(${CMAKE_CURRENT_LIST_DIR}/${type}/@[email protected])
+endmacro()
+
+# Allow static or shared lib to be used.
+# If both are installed, choose based on BUILD_SHARED_LIBS.
+if (BUILD_SHARED_LIBS)
+    if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/shared")
+        aws_load_targets(shared)
+    else()
+        aws_load_targets(static)
+    endif()
+else()
+    if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/static")
+        aws_load_targets(static)
+    else()
+        aws_load_targets(shared)
+    endif()
+endif()