chore: sync dev branch with release/cms_public_preview (#785)

* fix: draft github release from non-default branches (#758)

* fix: solve SDL task warnings

* chore(ci): update runner images (#764)

* feat: replace uamqp with PyAMQP (#767)

* Eventhub sdk add

* monitoring changes

* event changes

* add discovery logic

* remove unused code

* test changes

* Add fixes for integration tests

* remove readme file

* Remove uamqp usage in the code entirely

* Replace uampq from docs to pyamqp

* Fix failing unit tests

* Fix args compatibility issue

* Fix linting errors

* Addressing comments

* Fix linting issues

* Addressed comments

* Add right exception

* remove unwanted exception

---------

Co-authored-by: Ketki <ketkinaik@microsoft.com>

* fix: handle redacted SharedAccessKey in connection string parsing (#769)

* fix: move base64 validation inside validate block for passthrough cases

When parsing connection strings with redacted SharedAccessKey=*** values
(e.g., from IoT Hub properties), the base64 validation would fail since
the redacted value is not valid base64.

Move the validation inside the 'if validate:' block so it only runs when
full validation is requested. Passthrough cases that only need to extract
other properties (like EntityPath, Endpoint) will no longer fail.

* fix: skip base64 validation for redacted SharedAccessKey (****) values

* Remove defensive check

---------

Co-authored-by: Ketki <ketkinaik@microsoft.com>

* chore(release): prepare v0.28.0 (#770)

* Create release data

* Improve formatting and remove internal changes

---------

Co-authored-by: Ketki <ketkinaik@microsoft.com>

* fix(test): win/MSI int test pipeline fixes (#768)

* fix: win/MSI pipeline fixes

* fix conditional compile-time/runtime logic issue

* fix windows extension path

* test: try to repro windows install issue by reordering pipeline stages

* fixup

* revert pipeline testing changes for now

* revert separation of python setup and dev requirements for now

* Follow up changes (#772)

Co-authored-by: Ketki <ketkinaik@microsoft.com>

* bump azure-iot-device for Windows (#773)

Co-authored-by: Ketki <ketkinaik@microsoft.com>

* Release preparation (#774)

Co-authored-by: Ketki <ketkinaik@microsoft.com>

* Update SBOM tool version (#775)

Co-authored-by: Ketki <ketkinaik@microsoft.com>

* ci: fix SBOM generation for pip 25.x compatibility (#776)

* Try requirements options

* Add range

---------

Co-authored-by: Ketki <ketkinaik@microsoft.com>

* SBOM: use clean venv for runtime deps (#780)

Co-authored-by: Ketki <ketkinaik@microsoft.com>

* chore: remove uamqp references from codebase (#784)

* Remove all uampq occurences

* Addressed comments and fixed linting errors

---------

Co-authored-by: Ketki <ketkinaik@microsoft.com>

---------

Co-authored-by: Ryan K <ryan.k@outlook.com>
Co-authored-by: Ketki <ketkinaik@microsoft.com>

Author: 3 people

.azure-devops/integration_tests.yml

@@ -9,10 +9,13 @@ parameters:
     default: "aziotcli_test_primary"
   - name: testAgentVmImage
     type: string
-    default: "ubuntu-22.04"
+    default: "ubuntu-24.04"
     values:
-      - "ubuntu-22.04"
+      - "ubuntu-24.04"
       - "ubuntu-latest"
+  - name: windowsAgentVmImage
+    type: string
+    default: "windows-2025"
   - name: pythonVersion
     displayName: "Python version for building wheels, KPIs"
     type: string
@@ -123,7 +126,10 @@ stages:
       pythonVersions: ${{ parameters.pythonVersionsTestingMatrix }}
     condition: succeeded()
     pool:
-      vmImage: ${{ parameters.testAgentVmImage }}
+      ${{ if eq(parameters.azureCLIVersion, 'msi') }}:
+        vmImage: ${{ parameters.windowsAgentVmImage }}
+      ${{ else }}:
+        vmImage: ${{ parameters.testAgentVmImage }}
     jobs:
       - template: templates/trigger-tests.yml
         parameters:
@@ -141,6 +147,8 @@ stages:
           maxParallelADR: 2
       - job: "evaluateCmdTable"
         displayName: "Evaluate Command Table"
+        pool:
+          vmImage: ${{ parameters.testAgentVmImage }}
         steps:
           - template: templates/evaluate-command-table.yml
   - stage: "smokeTest"
@@ -150,7 +158,10 @@ stages:
       pythonVersions: ${{ parameters.pythonVersionsTestingMatrix }}
     condition: succeeded()
     pool:
-      vmImage: ${{ parameters.testAgentVmImage }}
+      ${{ if eq(parameters.azureCLIVersion, 'msi') }}:
+        vmImage: ${{ parameters.windowsAgentVmImage }}
+      ${{ else }}:
+        vmImage: ${{ parameters.testAgentVmImage }}
     jobs:
       - template: templates/smoke-tests.yml
         parameters:

.azure-devops/merge.yml

@@ -23,10 +23,13 @@ variables:
 parameters:
   - name: linuxImage
     type: string
-    default: "ubuntu-22.04"
+    default: "ubuntu-24.04"
     values:
-      - "ubuntu-22.04"
+      - "ubuntu-24.04"
       - "ubuntu-latest"
+  - name: windowsImage
+    type: string
+    default: "windows-2025"
 
 jobs:
   - job: "build_and_publish_azure_iot_cli_ext"
@@ -82,7 +85,7 @@ jobs:
         "build_and_publish_azure_cli_test_sdk",
       ]
     pool:
-      vmImage: "macOS-13"
+      vmImage: "macOS-15"
 
     steps:
       - template: templates/run-tests-parallel.yml
@@ -98,7 +101,7 @@ jobs:
         "build_and_publish_azure_cli_test_sdk",
       ]
     pool:
-      vmImage: "windows-2019"
+      vmImage: ${{ parameters.windowsImage }}
 
     steps:
       - task: PowerShell@2
@@ -147,7 +150,7 @@ jobs:
   - job: CredScan
     displayName: "Credential Scan"
     pool:
-      vmImage: "windows-2019"
+      vmImage: ${{ parameters.windowsImage }}
 
     steps:
       - task: CredScan@3

.azure-devops/nightly.yml

@@ -18,10 +18,13 @@ parameters:
     default: "aziotcli_test_nightly"
   - name: vmImage
     type: string
-    default: "ubuntu-22.04"
+    default: "ubuntu-24.04"
     values:
-      - "ubuntu-22.04"
+      - "ubuntu-24.04"
       - "ubuntu-latest"
+  - name: windowsImage
+    type: string
+    default: "windows-2025"
   - name: pythonVersion
     displayName: "Python version for building wheel, KPIs"
     type: string
@@ -129,7 +132,7 @@ stages:
   - stage: "test_msi"
     displayName: "Run all tests against Windows MSI install"
     pool:
-      vmImage: "windows-2019"
+      vmImage: ${{ parameters.windowsImage }}
     dependsOn: [build, test_min]
     variables:
       pythonVersions: $[variables['msiTestingMatrix']]
@@ -163,7 +166,7 @@ stages:
       pythonVersions: $[variables['msiTestingMatrix']]
     condition: succeeded()
     pool:
-      vmImage: "windows-2019"
+      vmImage: ${{ parameters.windowsImage }}
     jobs:
       - template: templates/smoke-tests.yml
         parameters:

.azure-devops/reference_markdown.yml

@@ -10,9 +10,9 @@ parameters:
     default: "iot"
   - name: linuxImage
     type: string
-    default: "ubuntu-22.04"
+    default: "ubuntu-24.04"
     values:
-      - "ubuntu-22.04"
+      - "ubuntu-24.04"
       - "ubuntu-latest"
 
 jobs:

.azure-devops/templates/set-pythonpath.yml

@@ -1,11 +1,13 @@
 steps:
-  - task: PythonScript@0
+  - task: Bash@3
     displayName: "Set Extension Path"
-    name: "setExtensionPath"
     inputs:
-      scriptSource: "inline"
+      targetType: "inline"
       script: |
-        from azure.cli.core.extension import get_extension_path
-        extension_path = get_extension_path("azure-iot")
-        print("Extension path is " + extension_path)
-        print("##vso[task.setvariable variable=PYTHONPATH;]"+extension_path)
+        extensionPath=$(az extension show -n azure-iot --query path -o tsv)
+        if [ -n "$extensionPath" ]; then
+          echo "Extension path is $extensionPath"
+          echo "##vso[task.setvariable variable=PYTHONPATH;]$extensionPath"
+        else
+          echo "##vso[task.logissue type=warning]Extension path not found"
+        fi

.azure-devops/templates/setup-dev-test-env.yml

@@ -17,11 +17,9 @@ steps:
 
   - ${{ if eq(parameters.azureCLIVersion, 'min') }}:
       - template: install-azure-cli-min.yml
-
-  - ${{ if eq(parameters.azureCLIVersion, 'released') }}:
+  - ${{ elseif eq(parameters.azureCLIVersion, 'released') }}:
       - template: install-azure-cli-released.yml
-
-  - ${{ if eq(parameters.azureCLIVersion, 'msi') }}:
+  - ${{ else }}:
       - template: install-azure-cli-msi.yml
 
   - template: download-install-local-azure-test-sdk.yml

.github/policies/resourceManagement.yml

@@ -90,14 +90,13 @@ configuration:
 
             `ImportError: cannot import name 'c_uamqp' from partially initialized module 'uamqp'`
 
-            which can often be solved quickly by either:
 
-            - Updating your installed version of the `azure-iot` extension:
-              `az extension update --name azure-iot`
-            - Performing a repair of the uamqp dependency:
-              `az iot hub monitor-events --hub-name {} --device-id {} --repair`
+            The `uamqp` dependency has been deprecated and removed in newer versions of the `azure-iot` extension,
+            which now uses a pure Python AMQP implementation. Updating to the latest version of the extension should
+            resolve this issue:
 
-            Please try these two resolution methods and see if that helps resolve your issue.
+            `az extension update --name azure-iot`
       description: 
+
 onFailure: 
 onSuccess: 

.github/workflows/release_build.yml

@@ -47,9 +47,19 @@ jobs:
           echo "version=$version" >> $GITHUB_ENV
       - name: Generate SBOM
         run: |
-          curl -Lo $RUNNER_TEMP/sbom-tool https://github.com/microsoft/sbom-tool/releases/download/v2.2.3/sbom-tool-linux-x64
+          # Create clean venv with only runtime dependencies (excludes dev/test deps)
+          python -m venv $RUNNER_TEMP/sbom-venv
+          $RUNNER_TEMP/sbom-venv/bin/pip install --upgrade pip
+          $RUNNER_TEMP/sbom-venv/bin/pip install ${{ env.wheel }}
+          $RUNNER_TEMP/sbom-venv/bin/pip freeze > ./dist/requirements.txt
+          # Add Windows-specific azure-iot-device version (not installed on Linux CI, but needed for complete SBOM)
+          # Note: This causes a pip conflict warning in sbom-tool but both versions are correctly included in SBOM
+          echo "azure-iot-device>=2.15.0rc1,<3.0.0dev0" >> ./dist/requirements.txt
+          curl -Lo $RUNNER_TEMP/sbom-tool https://github.com/microsoft/sbom-tool/releases/download/v4.1.5/sbom-tool-linux-x64
           chmod +x $RUNNER_TEMP/sbom-tool
-          $RUNNER_TEMP/sbom-tool generate -b ./dist -bc . -pn "Azure IoT CLI Extension" -pv "${{ env.version }}" -ps Microsoft
+          $RUNNER_TEMP/sbom-tool generate -b ./dist -bc ./dist -pn "Azure IoT CLI Extension" -pv "${{ env.version }}" -ps Microsoft
+          # Clean up temporary files
+          rm -rf ./dist/requirements.txt $RUNNER_TEMP/sbom-venv
 
       - name: Upload Wheel Artifact
         uses: actions/upload-artifact@v4

.github/workflows/tox.yml

@@ -26,9 +26,9 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-22.04
-          - windows-2022
-          - macos-13
+          - ubuntu-24.04
+          - windows-2025
+          - macos-15-intel
         py:
           - "3.13"
           - "3.12"
@@ -48,7 +48,7 @@ jobs:
       - name: Run test suite
         run: tox r --skip-pkg-install
       - name: Upload coverage report
-        if: ${{ matrix.os == 'ubuntu-22.04' && matrix.py == '3.13' }}
+        if: ${{ matrix.os == 'ubuntu-24.04' && matrix.py == '3.13' }}
         continue-on-error: true
         uses: actions/upload-artifact@v4
         with:

.pylintrc

@@ -605,7 +605,7 @@ ignored-classes=optparse.Values,thread._local,_thread._local,Setting
 # in the environment of the CLI
 ignored-modules=
       azure,azure.cli,azure.cli.core,azure.cli.core.extension,azure.cli.core.commands,
-      knack,six,msrest,msrestazure,requests,uamqp,yaml,jmespath,jsonschema
+      knack,six,msrest,msrestazure,requests,yaml,jmespath,jsonschema
 
 # Show a hint with possible names when a member name was not found. The aspect
 # of finding the hint is based on edit distance.