merge with main

Author: sbSteveK

.github/workflows/ci.yml

@@ -7,7 +7,11 @@ on:
       - 'docs'
 
 env:
+<<<<<<< HEAD
   BUILDER_VERSION: v0.9.87
+=======
+  BUILDER_VERSION: v0.9.84
+>>>>>>> main
   BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-iot-device-sdk-python-v2
@@ -93,7 +97,7 @@ jobs:
         chmod a+x builder
         ./builder build -p ${{ env.PACKAGE_NAME }}
     - name: configure AWS credentials (MQTT5)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_MQTT5_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -129,7 +133,7 @@ jobs:
         chmod a+x builder
         ./builder build -p ${{ env.PACKAGE_NAME }}
     - name: configure AWS credentials (MQTT5)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: ${{ env.CI_MQTT5_ROLE }}
         aws-region: ${{ env.AWS_DEFAULT_REGION }}
@@ -145,8 +149,8 @@ jobs:
         source utils/test_cleanup.sh
         cd ..
 
-  # Runs the samples and service tests and ensures that everything is working
-  linux-smoke-tests:
+  # Runs the service client tests
+  linux-service-client-tests:
     runs-on: ubuntu-22.04
     permissions:
       id-token: write # This is required for requesting the JWT
@@ -233,65 +237,6 @@ jobs:
           export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-python-v2/utils:${{ github.workspace }}/aws-iot-device-sdk-python-v2/samples
           python3 ./test_cases/test_jobs_execution.py --config-file test_cases/mqtt5_jobs_cfg.json
 
-  linux-greengrass-tests:
-    runs-on: ubuntu-22.04
-    permissions:
-      id-token: write # This is required for requesting the JWT
-    steps:
-      - name: Setup environment
-        run: |
-          python3 -m pip install boto3
-      - name: configure AWS credentials (containers)
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ env.CI_BUILD_AND_TEST_ROLE }}
-          aws-region: ${{ env.AWS_DEFAULT_REGION }}
-      - name: Build ${{ env.PACKAGE_NAME }}
-        run: |
-          python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
-          chmod a+x builder
-          ./builder build -p ${{ env.PACKAGE_NAME }}
-      - name: Install Greengrass Development Kit
-        run: |
-          python3 -m pip install awsiotsdk
-          python3 -m pip install -U git+https://github.com/aws-greengrass/[email protected]
-      - name: Configure AWS credentials (Greengrass)
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ env.CI_GREENGRASS_INSTALLER_ROLE }}
-          aws-region: ${{ env.AWS_DEFAULT_REGION }}
-      - name: Build and run Greengrass basic discovery sample
-        working-directory: ./aws-iot-device-sdk-python-v2/test/greengrass/basic_discovery
-        run: |
-          export PYTHONPATH=${{ github.workspace }}/aws-iot-device-sdk-python-v2/samples
-          gdk component build
-          gdk test-e2e build
-          gdk test-e2e run
-      - name: Show logs
-        working-directory: ./aws-iot-device-sdk-python-v2/test/greengrass/basic_discovery
-        # Print logs unconditionally to provide more details on Greengrass run even if the test failed.
-        if: always()
-        run: |
-          echo "=== greengrass.log"
-          cat testResults/gg*/greengrass.log
-          echo "=== software.amazon.awssdk.sdk-gg-test-discovery.log"
-          cat testResults/gg*/software.amazon.awssdk.sdk-gg-test-discovery.log
-      - name: Build and run Greengrass IPC sample
-        working-directory: ./aws-iot-device-sdk-python-v2/test/greengrass/ipc
-        run: |
-          gdk component build
-          gdk test-e2e build
-          gdk test-e2e run
-      - name: Show logs
-        working-directory: ./aws-iot-device-sdk-python-v2/test/greengrass/ipc
-        # Print logs unconditionally to provide more details on Greengrass run even if the test failed.
-        if: always()
-        run: |
-          echo "=== greengrass.log"
-          cat testResults/gg*/greengrass.log
-          echo "=== software.amazon.awssdk.sdk-gg-ipc.log"
-          cat testResults/gg*/software.amazon.awssdk.sdk-gg-ipc.log
-
   # check that docs can still build
   check-docs:
     runs-on: ubuntu-22.04 # latest

.github/workflows/ci_run_greengrass_discovery_cfg.json

@@ -68,7 +68,7 @@ jobs:
         force: true
 
     - name: configure AWS credentials (Release)
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: arn:aws:iam::180635532705:role/CI_V2_RELEASE_S3_ROLE
         aws-region: us-east-1

.github/workflows/ci_run_greengrass_ipc_cfg.json

@@ -90,4 +90,4 @@ is provided by code that been generated from a model of the service.
 
 This library is licensed under the [Apache 2.0 License](./documents/LICENSE).
 
-Latest released version: v1.24.0
+Latest released version: v1.26.0

.github/workflows/release.yml

@@ -19,7 +19,7 @@
 from concurrent.futures import Future
 from dataclasses import dataclass
 import json
-from typing import Any, Callable, Dict, Generic, Optional, Tuple, TypeVar
+from typing import Any, Callable, Dict, Generic, Optional, Tuple, TypeVar, Union
 
 __version__ = '1.0.0-dev'
 
@@ -37,7 +37,7 @@ class MqttServiceClient:
         mqtt_connection: MQTT connection to use
     """
 
-    def __init__(self, mqtt_connection: mqtt.Connection or mqtt5.Client):
+    def __init__(self, mqtt_connection: Union[mqtt.Connection, mqtt5.Client]):
         if isinstance(mqtt_connection, mqtt.Connection):
             self._mqtt_connection = mqtt_connection  # type: mqtt.Connection
         elif isinstance(mqtt_connection, mqtt5.Client):

README.md

@@ -11,7 +11,7 @@ phases:
       - sudo apt-get install python3 python3-pip -y
       - export PATH=$PATH:$HOME/.local/bin
       - python3 -m pip install --user --upgrade pip
-      - python3 -m pip install --user --upgrade twine setuptools wheel awscli PyOpenSSL six
+      - python3 -m pip install --user --upgrade twine awscli build setuptools
       - echo "\nBuild version data:"
       - echo "\nPython Version:"; python3 --version
   pre_build:
@@ -24,7 +24,7 @@ phases:
   build:
     commands:
       - echo Build started on `date`
-      - python3 setup.py sdist bdist_wheel
+      - python3 -m build
       - python3 -m twine upload -r pypi dist/*
   post_build:
     commands:

awsiot/__init__.py

@@ -11,7 +11,7 @@ phases:
       - sudo apt-get install python3 python3-pip -y
       - export PATH=$PATH:$HOME/.local/bin
       - python3 -m pip install --user --upgrade pip
-      - python3 -m pip install --user --upgrade twine setuptools wheel awscli PyOpenSSL six
+      - python3 -m pip install --user --upgrade twine awscli build setuptools
       - echo "\nBuild version data:"
       - echo "\nPython Version:"; python3 --version
   pre_build:
@@ -24,7 +24,7 @@ phases:
   build:
     commands:
       - echo Build started on `date`
-      - python3 setup.py sdist bdist_wheel
+      - python3 -m build
       - python3 -m twine upload -r testpypi dist/*
   post_build:
     commands:

codebuild/cd/publish-to-prod-pypi.yml

@@ -28,7 +28,7 @@ phases:
       - CURRENT_TAG_VERSION=$(cat $CODEBUILD_SRC_DIR/VERSION)
       - python3 codebuild/cd/pip-install-with-retry.py --no-cache-dir --user awsiotsdk==$CURRENT_TAG_VERSION
       # Run PubSub sample
-      - python3 samples/mqtt5_pubsub.py --endpoint ${ENDPOINT} --cert /tmp/certificate.pem --key /tmp/privatekey.pem --ca_file /tmp/AmazonRootCA1.pem --verbosity Trace
+      - python3 samples/mqtt/mqtt5_x509.py --endpoint ${ENDPOINT} --cert /tmp/certificate.pem --key /tmp/privatekey.pem
 
   post_build:
     commands:

codebuild/cd/publish-to-test-pypi.yml

@@ -29,7 +29,7 @@ phases:
       - python3 -m pip install typing
       - python3 codebuild/cd/pip-install-with-retry.py -i https://testpypi.python.org/simple --user awsiotsdk==$CURRENT_TAG_VERSION
       # Run PubSub sample
-      - python3 samples/mqtt5_pubsub.py --endpoint ${ENDPOINT} --cert /tmp/certificate.pem --key /tmp/privatekey.pem --ca_file /tmp/AmazonRootCA1.pem --verbosity Trace
+      - python3 samples/mqtt/mqtt5_x509.py --endpoint ${ENDPOINT} --cert /tmp/certificate.pem --key /tmp/privatekey.pem
 
   post_build:
     commands: