Fix miniMQTT compatibility and native_networking examples

Author: askpatrickw

.gitignore

@@ -3,15 +3,200 @@
 # SPDX-License-Identifier: Unlicense
 
 *.mpy
-.idea
-__pycache__
 _build
 *.pyc
-.env
 bundles
-*.DS_Store
-.eggs
-dist
-**/*.egg-info
-.vscode/settings.json
+
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
 .venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+.idea/
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

README.rst

@@ -203,7 +203,7 @@ To use Azure IoT Central, you will need to create an Azure IoT Central app, crea
 
     from adafruit_azureiot import IoTCentralDevice
 
-    device = IoTCentralDevice(wifi, secrets["id_scope"], secrets["device_id"], secrets["key"])
+    device = IoTCentralDevice(wifi, secrets["id_scope"], secrets["device_id"], secrets["sas_key"])
     device.connect()
 
 Once the device is connected, you will regularly need to run a ``loop`` to poll for messages from the cloud.

adafruit_azureiot/device_registration.py

@@ -14,10 +14,13 @@
 """
 
 import json
+import ssl
 import time
+
 import adafruit_logging as logging
 from adafruit_logging import Logger
-import adafruit_minimqtt.adafruit_minimqtt as minimqtt
+import adafruit_minimqtt.adafruit_minimqtt as MQTT
+
 from . import constants
 from .quote import quote
 from .keys import compute_derived_symmetric_key
@@ -177,16 +180,16 @@ def register_device(self, expiry: int) -> str:
         sig_encoded = quote(sig_no_encode, "~()*!.'")
         auth_string = f"SharedAccessSignature sr={sr}&sig={sig_encoded}&se={str(expiry)}&skn=registration"
 
-        minimqtt.set_socket(self._socket, self._iface)
+        MQTT.set_socket(self._socket, self._iface)
 
-        self._mqtt = minimqtt.MQTT(
+        self._mqtt = MQTT.MQTT(
             broker=constants.DPS_END_POINT,
             username=username,
             password=auth_string,
             port=8883,
             keep_alive=120,
-            is_ssl=True,
             client_id=self._device_id,
+            ssl_context=ssl.create_default_context(),
         )
 
         self._mqtt.enable_logger(logging, self._logger.getEffectiveLevel())

adafruit_azureiot/iot_mqtt.py

@@ -14,9 +14,12 @@
 
 import gc
 import json
+import ssl
 import time
-import adafruit_minimqtt.adafruit_minimqtt as minimqtt
+
+import adafruit_minimqtt.adafruit_minimqtt as MQTT
 import adafruit_logging as logging
+
 from .iot_error import IoTError
 from .keys import compute_derived_symmetric_key
 from .quote import quote
@@ -108,7 +111,7 @@ def _gen_sas_token(self) -> str:
         return token
 
     def _create_mqtt_client(self) -> None:
-        minimqtt.set_socket(self._socket, self._iface)
+        MQTT.set_socket(self._socket, self._iface)
 
         self._logger.debug(
             str.replace(
@@ -118,14 +121,14 @@ def _create_mqtt_client(self) -> None:
             )
         )
 
-        self._mqtts = minimqtt.MQTT(
+        self._mqtts = MQTT.MQTT(
             broker=self._hostname,
             username=self._username,
             password=self._passwd,
             port=8883,
             keep_alive=120,
-            is_ssl=True,
             client_id=self._device_id,
+            ssl_context=ssl.create_default_context(),
         )
 
         self._mqtts.enable_logger(logging, self._logger.getEffectiveLevel())

examples/azureiot_central_commands.py renamed to examples/ esp32spi /azureiot_central_commands.py

@@ -99,7 +99,7 @@
 
 # Create an IoT Hub device client and connect
 device = IoTCentralDevice(
-    socket, esp, secrets["id_scope"], secrets["device_id"], secrets["key"]
+    socket, esp, secrets["id_scope"], secrets["device_id"], secrets["sas_key"]
 )
 
 # Subscribe to commands

examples/azureiot_central_notconnected.py renamed to examples/ esp32spi /azureiot_central_notconnected.py

@@ -103,7 +103,7 @@
 
 # Create an IoT Hub device client and connect
 device = IoTCentralDevice(
-    socket, esp, secrets["id_scope"], secrets["device_id"], secrets["key"]
+    socket, esp, secrets["id_scope"], secrets["device_id"], secrets["sas_key"]
 )
 
 # don't connect

examples/azureiot_central_properties.py renamed to examples/ esp32spi /azureiot_central_properties.py

@@ -96,7 +96,7 @@
 
 # Create an IoT Hub device client and connect
 device = IoTCentralDevice(
-    socket, esp, secrets["id_scope"], secrets["device_id"], secrets["key"]
+    socket, esp, secrets["id_scope"], secrets["device_id"], secrets["sas_key"]
 )
 
 # Subscribe to property changes

examples/azureiot_central_simpletest.py renamed to examples/ esp32spi /azureiot_central_simpletest.py

@@ -97,7 +97,7 @@
 
 # Create an IoT Hub device client and connect
 device = IoTCentralDevice(
-    socket, esp, secrets["id_scope"], secrets["device_id"], secrets["key"]
+    socket, esp, secrets["id_scope"], secrets["device_id"], secrets["sas_key"]
 )
 
 print("Connecting to Azure IoT Central...")

examples/azureiot_hub_directmethods.py renamed to examples/ esp32spi /azureiot_hub_directmethods.py

@@ -27,7 +27,7 @@
     # key comes from either the Primary key or Secondary key
     "id_scope": "",
     "device_id": "",
-    "key": "",
+    "sas_key": "",
     # Azure IoT Hub settings - if you are connecting to Azure IoT Hub, fill in this value
     # To get this value, from the Azure Portal (https://aka.ms/AzurePortalHome), select your IoT Hub,
     # then select Explorers -> IoT devices, select your device, then copy the entire primary or secondary