iotedgedev 3.3.5__zip → 3.3.6__zip

s/.git/FETCH_HEAD

@@ -1,4 +1,4 @@
-e4c86fce83e16e621993696889a9e35ad343d053		'e4c86fce83e16e621993696889a9e35ad343d053' of https://github.com/Azure/iotedgedev
+003878efb6761b1c7ace368130cb4b8a48176552		'003878efb6761b1c7ace368130cb4b8a48176552' of https://github.com/Azure/iotedgedev
 ecbf26c295b01842d2669a8b1369217b94652210	not-for-merge	tag 'v0.49.0' of https://github.com/Azure/iotedgedev
 8057fa1912603f8de1d3ea5dce945276a188a7a3	not-for-merge	tag 'v0.50.0' of https://github.com/Azure/iotedgedev
 687bb8eae441816dfa427fab86844e24f63eb615	not-for-merge	tag 'v0.51.0' of https://github.com/Azure/iotedgedev
@@ -60,3 +60,4 @@ db420607db777f90eb178635bd8c33ad2c21f242	not-for-merge	tag 'v3.3.3' of https://g
 50459b5a8ec73e5629bf5b88136fce95b9083e90	not-for-merge	tag 'v3.3.3-rc0' of https://github.com/Azure/iotedgedev
 f28b9ff2015dc3362461ede5d3633d6ba6ea5750	not-for-merge	tag 'v3.3.4' of https://github.com/Azure/iotedgedev
 b774407faf29a5caa2c02c712de222b765f1bb9a	not-for-merge	tag 'v3.3.5' of https://github.com/Azure/iotedgedev
+3102dcc34b170418305f3c6e16322709f3543ffe	not-for-merge	tag 'v3.3.6' of https://github.com/Azure/iotedgedev

s/.git/HEAD

@@ -1 +1 @@
-e4c86fce83e16e621993696889a9e35ad343d053
+003878efb6761b1c7ace368130cb4b8a48176552

s/.git/logs/HEAD

@@ -1 +1 @@
-0000000000000000000000000000000000000000 e4c86fce83e16e621993696889a9e35ad343d053 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714746 +0000	checkout: moving from master to e4c86fce83e16e621993696889a9e35ad343d053
+0000000000000000000000000000000000000000 003878efb6761b1c7ace368130cb4b8a48176552 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	checkout: moving from master to 003878efb6761b1c7ace368130cb4b8a48176552

s/.git/logs/refs/remotes/origin/EO

@@ -1 +1 @@
-0000000000000000000000000000000000000000 ae2afcb52cd0a0d5f26cbf8b8c00d0b123be4a74 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 ae2afcb52cd0a0d5f26cbf8b8c00d0b123be4a74 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/avagraw/security_fix

@@ -1 +1 @@
-0000000000000000000000000000000000000000 42629e5169b74ad10aa6528f527a183237b0580f Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 42629e5169b74ad10aa6528f527a183237b0580f Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/cherry-pick-rename

@@ -1 +1 @@
-0000000000000000000000000000000000000000 d49164bcf55d16f95546cfbbe7a9e07cfd4aee89 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 d49164bcf55d16f95546cfbbe7a9e07cfd4aee89 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/chyuan/fix-validation-not-fail-test

@@ -1 +1 @@
-0000000000000000000000000000000000000000 7f5b10cafb983f2cc4fe7a0c6a407e69d7b84985 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 7f5b10cafb983f2cc4fe7a0c6a407e69d7b84985 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/chyuan/update-linux-agent

@@ -1 +1 @@
-0000000000000000000000000000000000000000 06e9bf5fcd3a93ad0667c53547eceb5868589126 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 06e9bf5fcd3a93ad0667c53547eceb5868589126 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/dependabot/pip/cookiecutter-2.1.1

@@ -1 +1 @@
-0000000000000000000000000000000000000000 deaf5a34cae3bd84c9fa9112b76310f2409ecf27 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 3c5f9acff20d5ef82054abb10997c1658f841f4e Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/dependabot/pip/pyyaml-5.4

@@ -1 +1 @@
-0000000000000000000000000000000000000000 25714178067a61e39438ccffe7eff396f7f7e9e3 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 25714178067a61e39438ccffe7eff396f7f7e9e3 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/main

@@ -1 +1 @@
-0000000000000000000000000000000000000000 e4c86fce83e16e621993696889a9e35ad343d053 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 003878efb6761b1c7ace368130cb4b8a48176552 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/ray-deps

@@ -1 +1 @@
-0000000000000000000000000000000000000000 74c6f90a1e3751abd06d487625b07e84d11e6c6e Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 74c6f90a1e3751abd06d487625b07e84d11e6c6e Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/ray-dev-setup

@@ -1 +1 @@
-0000000000000000000000000000000000000000 599bb7ff9c026d612c77ec700b116a867e3757c2 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 599bb7ff9c026d612c77ec700b116a867e3757c2 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/ray-tox

@@ -1 +1 @@
-0000000000000000000000000000000000000000 0cc926ef18ebe085789a09357be605998f195edf Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 0cc926ef18ebe085789a09357be605998f195edf Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/release-pipeline-automation

@@ -1 +1 @@
-0000000000000000000000000000000000000000 58a1182e8e7eac276e902d2d321382494b4846a1 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 58a1182e8e7eac276e902d2d321382494b4846a1 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/revert-594-user/vikas_bug-pyopenssl

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 268d2e835ee5d136610b226237743378e8458030 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/spmcdono/fix-pipeline-test-install

@@ -1 +1 @@
-0000000000000000000000000000000000000000 77c1694bbf19df945c567a2657073f2dfa1dccdc Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 77c1694bbf19df945c567a2657073f2dfa1dccdc Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/spmcdono/layered-deployments

@@ -1 +1 @@
-0000000000000000000000000000000000000000 54fc80ff8534bdca14f570715e28e56fb8f453da Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 54fc80ff8534bdca14f570715e28e56fb8f453da Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/spmcdono/pypi-package-test-pipeline

@@ -1 +1 @@
-0000000000000000000000000000000000000000 83e7c844ae3c81058605fe34e75b8b139b3d8fa7 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 83e7c844ae3c81058605fe34e75b8b139b3d8fa7 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/spmcdono/remove-py2

@@ -1 +1 @@
-0000000000000000000000000000000000000000 2f7f0d7fdef55d3b005e0b0697f407e2657b5d6e Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 2f7f0d7fdef55d3b005e0b0697f407e2657b5d6e Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/spmcdono/remove-py2-dev

@@ -1 +1 @@
-0000000000000000000000000000000000000000 789db9ef514814f371a52388684635b457c47f1c Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 789db9ef514814f371a52388684635b457c47f1c Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/spmcdono/test-native-runtime-install

@@ -1 +1 @@
-0000000000000000000000000000000000000000 2f30776bc2c8cf3a83659414d6c440f10a8ba70d Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 2f30776bc2c8cf3a83659414d6c440f10a8ba70d Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/spmcdono/update-pipeline

@@ -1 +1 @@
-0000000000000000000000000000000000000000 77c1694bbf19df945c567a2657073f2dfa1dccdc Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 77c1694bbf19df945c567a2657073f2dfa1dccdc Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/marine/EliiseS/devcontainer

@@ -1 +1 @@
-0000000000000000000000000000000000000000 47c809726263d1b6e613e531042746c84fb5e0ea Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 47c809726263d1b6e613e531042746c84fb5e0ea Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/marine/fixsimver

@@ -1 +1 @@
-0000000000000000000000000000000000000000 42a529627aa48e0dee2f012be438103e412f90bd Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 42a529627aa48e0dee2f012be438103e412f90bd Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/marine/layereddeploymentsbuildtest

@@ -1 +1 @@
-0000000000000000000000000000000000000000 7bb5ac6dec5c8e1f47049bfc2bf3581375735fc5 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 7bb5ac6dec5c8e1f47049bfc2bf3581375735fc5 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/marine/master-to-main

@@ -1 +1 @@
-0000000000000000000000000000000000000000 9b15bce20be08b338e1c621665502a2cc671a881 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 9b15bce20be08b338e1c621665502a2cc671a881 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/marine/pipeline

@@ -1 +1 @@
-0000000000000000000000000000000000000000 9045e71344f0abe3c5c73d5b4d860e65685c9bdf Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 9045e71344f0abe3c5c73d5b4d860e65685c9bdf Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas

@@ -1 +1 @@
-0000000000000000000000000000000000000000 9b33a26cb9f8c93317abed806db14dae840e6ae5 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 9b33a26cb9f8c93317abed806db14dae840e6ae5 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas-bud-fix

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 003878efb6761b1c7ace368130cb4b8a48176552 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas0212/verify-tests

@@ -1 +1 @@
-0000000000000000000000000000000000000000 27d2d12430daa953360f6e68184c08492f1deade Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 27d2d12430daa953360f6e68184c08492f1deade Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas2

@@ -1 +1 @@
-0000000000000000000000000000000000000000 e9d71febca54f94ec6a072d0d8902e28750279e3 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 e9d71febca54f94ec6a072d0d8902e28750279e3 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas_bug-pyopenssl

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 8437e682ba06376bae90685c4ab185a806aecdd0 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas_pypi

@@ -1 +1 @@
-0000000000000000000000000000000000000000 7ef7125fcd10b835b540f6f66666b464662a7f7d Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 7ef7125fcd10b835b540f6f66666b464662a7f7d Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas_pypi-1

@@ -1 +1 @@
-0000000000000000000000000000000000000000 480af5dab0cd3a8cbcba6f12a303ffbe77896064 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 480af5dab0cd3a8cbcba6f12a303ffbe77896064 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas_supplychain-issue1

@@ -1 +1 @@
-0000000000000000000000000000000000000000 370a437a2c3a13fecb80151734f38690af1fa488 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 370a437a2c3a13fecb80151734f38690af1fa488 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas_testing

@@ -1 +1 @@
-0000000000000000000000000000000000000000 b775a2f82cb4786214e580a3806adeeb9cb853a9 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 b775a2f82cb4786214e580a3806adeeb9cb853a9 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas_trigger

@@ -1 +1 @@
-0000000000000000000000000000000000000000 d388eea15656fdfc728538854c47d0cddee51412 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 d388eea15656fdfc728538854c47d0cddee51412 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/vikas_trigger_new

@@ -1 +1 @@
-0000000000000000000000000000000000000000 85746efe2c7945c625f3e6503f818187daef0955 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 85746efe2c7945c625f3e6503f818187daef0955 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/xinzed/dps_conn_str

@@ -1 +1 @@
-0000000000000000000000000000000000000000 33aa231e90673514290e4e44c94a8d643f1dc293 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 33aa231e90673514290e4e44c94a8d643f1dc293 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/user/xinzed/update-python-docker

@@ -1 +1 @@
-0000000000000000000000000000000000000000 0340a4328d1a13e83c03fc72a768d221b57413ab Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 0340a4328d1a13e83c03fc72a768d221b57413ab Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/vikas/azure

@@ -1 +1 @@
-0000000000000000000000000000000000000000 a1ed75eedffe48a0f119ddd857d1d293c759fb8b Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 a1ed75eedffe48a0f119ddd857d1d293c759fb8b Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/vikas/dependebot

@@ -1 +1 @@
-0000000000000000000000000000000000000000 5891e66b0f46b9e0ea2129c9e4fae2ca4ee3576c Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 5891e66b0f46b9e0ea2129c9e4fae2ca4ee3576c Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/vikas-triggers

@@ -1 +1 @@
-0000000000000000000000000000000000000000 60d9b8e55ad841d9a582b9c71f04f9ddb1bfdca3 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 60d9b8e55ad841d9a582b9c71f04f9ddb1bfdca3 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/xinzed/3_1_0rc1

@@ -1 +1 @@
-0000000000000000000000000000000000000000 a0cef647a0e626d4df6e40932e95e580906de333 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 a0cef647a0e626d4df6e40932e95e580906de333 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/logs/refs/remotes/origin/xinzed/update-runtime

@@ -1 +1 @@
-0000000000000000000000000000000000000000 8d57e913bd2e57d2343eb7f74b2df8939170f166 Ubuntu <cloudtest@51fd0ce1c000000.(none)> 1663714745 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head
+0000000000000000000000000000000000000000 8d57e913bd2e57d2343eb7f74b2df8939170f166 Ubuntu <cloudtest@6dd90968c000000.(none)> 1665453369 +0000	fetch --force --tags --prune --prune-tags --progress --no-recurse-submodules origin: storing head

s/.git/refs/remotes/origin/dependabot/pip/cookiecutter-2.1.1

@@ -1 +1 @@
-deaf5a34cae3bd84c9fa9112b76310f2409ecf27
+3c5f9acff20d5ef82054abb10997c1658f841f4e

s/.git/refs/remotes/origin/main

@@ -1 +1 @@
-e4c86fce83e16e621993696889a9e35ad343d053
+003878efb6761b1c7ace368130cb4b8a48176552

s/.git/refs/remotes/origin/revert-594-user/vikas_bug-pyopenssl

@@ -0,0 +1 @@
+268d2e835ee5d136610b226237743378e8458030

s/.git/refs/remotes/origin/user/vikas-bud-fix

@@ -0,0 +1 @@
+003878efb6761b1c7ace368130cb4b8a48176552

s/.git/refs/remotes/origin/user/vikas_bug-pyopenssl

@@ -0,0 +1 @@
+8437e682ba06376bae90685c4ab185a806aecdd0

s/.git/refs/tags/v3.3.6

@@ -0,0 +1 @@
+3102dcc34b170418305f3c6e16322709f3543ffe

s/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project since 0.82.0 will be documented in this file.
 
+## [3.3.6] - 2022-10-10
+
+- Update docker compose 
+- Update simulator version 
+
 ## [3.3.5] - 2022-05-17
 
 - Update azure-cli-core

s/build/lib/iotedgedev/__init__.py

@@ -2,5 +2,5 @@
 
 __author__ = 'Microsoft Corporation'
 __email__ = 'opencode@microsoft.com'
-__version__ = '3.3.5'
+__version__ = '3.3.6'
 __AIkey__ = 'fed7fc65-5b4a-4e66-9d46-c5f016d4e2b4'

s/build/lib/iotedgedev/azurecli.py

@@ -6,6 +6,7 @@ import subprocess
 import sys
 from io import StringIO
 from threading import Thread, Timer
+from pathlib import Path
 
 from azure.cli.core import get_default_cli
 from fstrings import f
@@ -550,3 +551,35 @@ class AzureCli:
                     return data["connectionString"]
 
         return ''
+
+    def get_ssh_key(self, ssh_key_file):
+        file_path = Path.home().joinpath(".ssh", ssh_key_file + ".pub")
+        if not os.path.exists(file_path):
+            self.output.status(f("No SSH key found at ~/.ssh/{ssh_key_file}.pub. Generating a new one..."))
+            os.system(f("ssh-keygen -t rsa -b 4096 -C \"iotedgedev-autogenerated\" -f ~/.ssh/{ssh_key_file} -q -N \"\""))
+
+        with open(file_path, 'r') as file:
+            ssh_key = file.read()
+            return ssh_key
+
+    def create_edge_vm(self, ssh_key_file, edge_device_id, iothub, resource_group):
+        self.output.status(f("\nCreating a new Virtual Machine in '{resource_group}' with ssh key file '{ssh_key_file}'..."))
+
+        connectionString = self.get_device_connection_string(edge_device_id, iothub, resource_group)
+        # Use IoTHub name for deployment - in this case it will create a new
+        # template if a new IoT Hub is created.
+        deploymentTemplateName = "edgeVM-" + iothub
+
+        ssh_key = self.get_ssh_key(ssh_key_file)
+
+        self.output.status(f("Creating Virtual Machine in '{resource_group}' with an incremental deployment template '{deploymentTemplateName}', this can take some time..."))
+        return self.invoke_az_cli_outproc(["deployment", "group", "create", "--name", deploymentTemplateName,
+                                           "--resource-group", resource_group,
+                                           "--template-uri", "https://raw.githubusercontent.com/Azure/iotedge-vm-deploy/master/edgeDeploy.json",
+                                           "--parameters", "dnsLabelPrefix=iotedgedev-vm",
+                                           "--parameters", "adminUsername=azureuser",
+                                           "--parameters", "authenticationType=sshPublicKey",
+                                           "--parameters", "adminPasswordOrKey=" + ssh_key,
+                                           "--parameters", "deviceConnectionString=" + connectionString,
+                                           "--output", "table"],
+                                          f("Failed to create the VM with deployment template '{deploymentTemplateName}'."))

s/build/lib/iotedgedev/cli.py

@@ -25,11 +25,17 @@ from .solution import Solution
 from .utility import Utility
 
 # Extend click.Group#add_command(cmd, name) to take deprecated=bool flag by monkey patching.
-def add_command_with_deprecation(self, cmd: Command, name: t.Optional[str] = None, deprecated = False):
+def add_command_with_deprecation(self, cmd: Command, name: t.Optional[str] = None, deprecated = False, alt:  t.Optional[str] = None):
     # Directly changing the deprecated flag of the cmd has side-effects on the reference source.
     # To avoid this, copy the cmd object with deepcopy.
     copied_command = copy.deepcopy(cmd)
     copied_command.deprecated = deprecated
+    if copied_command.short_help is None:
+        copied_command.short_help = copied_command.help
+    if alt is not None:
+        alt_cmd = "[Use `iotedgedev " + alt + "` instead]"
+        copied_command.short_help += " " + alt_cmd  # use space for formatting short_help in `iotedgedev --help`
+        copied_command.help += "\n\n" + alt_cmd  # use newline for formatting help in `iotedgedev <command> --help`
     self.add_command(copied_command, name)
 
 Group.add_command_with_deprecation = add_command_with_deprecation
@@ -99,7 +105,7 @@ def new(name, module, template, edge_runtime_version, group_id):
     sol = Solution(output, utility)
     sol.create(name, module, template, edge_runtime_version, group_id)
 
-main.add_command_with_deprecation(new, deprecated=True)
+main.add_command_with_deprecation(new, deprecated=True, alt="solution new")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS,
@@ -132,7 +138,7 @@ def init(name, module, template, group_id, edge_runtime_version):
     utility.call_proc(azsetupcmd.split())
 
 
-main.add_command_with_deprecation(init, deprecated=True)
+main.add_command_with_deprecation(init, deprecated=True, alt="solution init")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Push, deploy, start, monitor")
@@ -155,7 +161,7 @@ def add(name, template, group_id):
     mod.add(name, template, group_id)
 
 
-main.add_command_with_deprecation(add, deprecated=True)
+main.add_command_with_deprecation(add, deprecated=True, alt="solution add")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Build the solution")
@@ -197,7 +203,7 @@ def build(ctx, push, do_deploy, template_file, platform):
         ctx.invoke(deploy)
 
 
-main.add_command_with_deprecation(build, deprecated=True)
+main.add_command_with_deprecation(build, deprecated=True, alt="solution build")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Push module images to container registry")
@@ -238,7 +244,7 @@ def push(ctx, do_deploy, no_build, template_file, platform):
         ctx.invoke(deploy)
 
 
-main.add_command_with_deprecation(push, deprecated=True)
+main.add_command_with_deprecation(push, deprecated=True, alt="solution push")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Deploy solution to IoT Edge device")
@@ -256,7 +262,7 @@ def deploy(manifest_file):
     edge.deploy(manifest_file)
 
 
-main.add_command_with_deprecation(deploy, deprecated=True)
+main.add_command_with_deprecation(deploy, deprecated=True, alt="solution deploy")
 
 
 @iothub.command(
@@ -351,7 +357,7 @@ def genconfig(template_file, platform, fail_on_validation_error):
     mod.build_push(template_file, platform, no_build=True, no_push=True, fail_on_validation_error=fail_on_validation_error)
 
 
-main.add_command_with_deprecation(genconfig, deprecated=True)
+main.add_command_with_deprecation(genconfig, deprecated=True, alt="solution genconfig")
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -374,7 +380,7 @@ def setup_simulator(gateway_host, iothub_connection_string):
     sim.setup(gateway_host, iothub_connection_string)
 
 
-main.add_command_with_deprecation(setup_simulator, deprecated=True)
+main.add_command_with_deprecation(setup_simulator, deprecated=True, alt="simulator setup")
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -449,7 +455,7 @@ def start_simulator(setup, solution, build, manifest_file, platform, verbose, in
         sim.start_single(inputs, port)
 
 
-main.add_command_with_deprecation(start_simulator, deprecated=True)
+main.add_command_with_deprecation(start_simulator, deprecated=True, alt="simulator start")
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -461,7 +467,7 @@ def stop_simulator():
     sim.stop()
 
 
-main.add_command_with_deprecation(stop_simulator, deprecated=True)
+main.add_command_with_deprecation(stop_simulator, deprecated=True, alt="simulator stop")
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -501,7 +507,7 @@ def monitor(timeout):
     ih.monitor_events(timeout)
 
 
-main.add_command_with_deprecation(monitor, deprecated=True)
+main.add_command_with_deprecation(monitor, deprecated=True, alt="iothub monitor")
 
 
 def ensure_azure_cli_iot_ext():
@@ -622,25 +628,31 @@ def validate_option(ctx, param, value):
 def list_edge_devices_and_set_default():
     if not azure_cli.list_edge_devices(envvars.IOTHUB_NAME):
         sys.exit()
-    return "iotedgedev-edgedevice"
+    output.info("Enter the IoT Edge Device Id (Creates a new Edge Device if not found) [iotedgedev-edgedevice]:")
+    return input() or "iotedgedev-edgedevice"
 
 
 def list_iot_hubs_and_set_default():
     if not azure_cli.list_iot_hubs(envvars.RESOURCE_GROUP_NAME):
         sys.exit()
 
+    subscription_rg_hash = hashlib.sha1((default_subscriptionId + envvars.RESOURCE_GROUP_NAME).encode('utf-8')).hexdigest()[:6]
+    iothub_name = "iotedgedev-iothub-" + subscription_rg_hash
+
     first_iothub = azure_cli.get_first_iothub(envvars.RESOURCE_GROUP_NAME)
     if first_iothub:
-        return first_iothub
-    else:
-        subscription_rg_hash = hashlib.sha1((default_subscriptionId + envvars.RESOURCE_GROUP_NAME).encode('utf-8')).hexdigest()[:6]
-        return "iotedgedev-iothub-" + subscription_rg_hash
+        iothub_name = first_iothub
+
+    output.info(f"Enter the IoT Hub Name (Creates a new IoT Hub if not found) [{iothub_name}]:")
+    return input() or iothub_name
 
 
 def list_resource_groups_and_set_default():
     if not azure_cli.list_resource_groups():
         sys.exit()
-    return "iotedgedev-rg"
+
+    output.info("Enter Resource Group Name (Creates a new Resource Group if not found) [iotedgedev-rg]:")
+    return input() or "iotedgedev-rg"
 
 
 def list_subscriptions_and_set_default():
@@ -657,14 +669,30 @@ def list_subscriptions_and_set_default():
     if not azure_cli.list_subscriptions():
         sys.exit()
     default_subscriptionId = azure_cli.get_default_subscription()
-    return default_subscriptionId
+    output.info(f"Select an Azure Subscription Name or Id [{default_subscriptionId}]:")
+    return input() or default_subscriptionId
 
 
-def header_and_default(header, default, default2=None):
+def header_and_default(header, prompt, default, options=None):
     output.header(header)
-    if default == '' and default2 is not None:
-        return default2
-    return default
+    output.info(f"{prompt} [{default}]:")
+    output.info(f"Available options: {options}")
+    return input() or default
+
+
+def handle_vm_create():
+    output.header("CREATE VIRTUAL MACHINE")
+    output.info("The virtual machine will be created with the IoT Edge runtime installed.\n"
+                "The deployment template can be found at: https://aka.ms/iotedge-vm-deploy \n"
+                "The name of the virtual machine will be a unique string generated by the template.\n"
+                "Details: os=ubuntu20_04-lts, size=Standard_DS1_v2, username=azureuser, allowSsh=true")
+    ssh_key_file = output.prompt_question("SSH Key file (must be located in ~/.ssh and will be created if it doesn't exist)", "id_rsa_iotedgedev")
+    if not azure_cli.create_edge_vm(ssh_key_file, envvars.EDGE_DEVICE_ID, envvars.IOTHUB_NAME, envvars.RESOURCE_GROUP_NAME):
+        raise click.BadParameter(f('Could not create Virtual Machine in {envvars.RESOURCE_GROUP_NAME}'))
+    else:
+        output.info("Virtual Machine created successfully. Check Azure Portal for details on how to connect.\n"
+                    "WARNING: Check the details of the Network Security Group, it is setup to allow SSH from all addresses.\n"
+                    "You will be able to connect using the SSH Key file: ~/.ssh/" + ssh_key_file)
 
 
 @iothub.command(context_settings=CONTEXT_SETTINGS,
@@ -688,51 +716,46 @@ def header_and_default(header, default, default2=None):
               help="Enter Azure Service Principal Credentials (username password tenant).")
 @click.option('--subscription',
               envvar=envvars.get_envvar_key_if_val("SUBSCRIPTION_ID"),
-              default=lambda: list_subscriptions_and_set_default(),
+              default=list_subscriptions_and_set_default,
               required=True,
               callback=validate_option,
-              prompt="Select an Azure Subscription Name or Id:",
               help="The Azure Subscription Name or Id.")
 @click.option('--resource-group-location',
               envvar=envvars.get_envvar_key_if_val("RESOURCE_GROUP_LOCATION"),
               required=True,
-              default=lambda: header_and_default('RESOURCE GROUP LOCATION', envvars.RESOURCE_GROUP_LOCATION, 'westus'),
-              type=click.Choice(['australiaeast', 'australiasoutheast', 'brazilsouth', 'canadacentral', 'canadaeast', 'centralindia', 'centralus', 'eastasia', 'eastus', 'eastus2',
-                                 'japanwest', 'japaneast', 'northeurope', 'northcentralus', 'southindia', 'uksouth', 'ukwest', 'westus', 'westeurope', 'southcentralus', 'westcentralus', 'westus2']),
+              default=lambda: header_and_default('RESOURCE GROUP LOCATION', 'Enter a Resource Group Location', envvars.RESOURCE_GROUP_LOCATION or 'westus',
+                                                 ['australiaeast', 'australiasoutheast', 'brazilsouth', 'canadacentral', 'canadaeast', 'centralindia', 'centralus', 'eastasia', 'eastus', 'eastus2',
+                                                  'japanwest', 'japaneast', 'northeurope', 'northcentralus', 'southindia', 'uksouth', 'ukwest', 'westus', 'westeurope', 'southcentralus', 'westcentralus', 'westus2']),
+              type=str,
               callback=validate_option,
-              prompt="Enter a Resource Group Location:",
               help="The Resource Group Location.")
 @click.option('--resource-group-name',
               envvar=envvars.get_envvar_key_if_val("RESOURCE_GROUP_NAME"),
               required=True,
-              default=lambda: list_resource_groups_and_set_default(),
+              default=list_resource_groups_and_set_default,
               type=str,
               callback=validate_option,
-              prompt="Enter Resource Group Name (Creates a new Resource Group if not found):",
               help="The Resource Group Name (Creates a new Resource Group if not found).")
 @click.option('--iothub-sku',
               envvar=envvars.get_envvar_key_if_val("IOTHUB_SKU"),
               required=True,
-              default=lambda: header_and_default('IOTHUB SKU', 'F1'),
-              type=click.Choice(['F1', 'S1', 'S2', 'S3']),
+              default=lambda: header_and_default('IOTHUB SKU', 'Enter IoT Hub SKU', 'F1', ['F1', 'S1', 'S2', 'S3']),
+              type=str,
               callback=validate_option,
-              prompt="Enter IoT Hub SKU (F1|S1|S2|S3):",
               help="The IoT Hub SKU.")
 @click.option('--iothub-name',
               envvar=envvars.get_envvar_key_if_val("IOTHUB_NAME"),
               required=True,
-              default=lambda: list_iot_hubs_and_set_default(),
+              default=list_iot_hubs_and_set_default,
               type=str,
               callback=validate_option,
-              prompt='Enter the IoT Hub Name (Creates a new IoT Hub if not found):',
               help='The IoT Hub Name (Creates a new IoT Hub if not found).')
 @click.option('--edge-device-id',
               envvar=envvars.get_envvar_key_if_val("EDGE_DEVICE_ID"),
               required=True,
-              default=lambda: list_edge_devices_and_set_default(),
+              default=list_edge_devices_and_set_default,
               type=str,
               callback=validate_option,
-              prompt='Enter the IoT Edge Device Id (Creates a new Edge Device if not found):',
               help='The IoT Edge Device Id (Creates a new Edge Device if not found).')
 @click.option('--update-dotenv',
               "-u",
@@ -743,6 +766,14 @@ def header_and_default(header, default, default2=None):
               is_flag=True,
               prompt='Update the .env file with connection strings?',
               help='If True, the current .env will be updated with the IoT Hub and Device connection strings.')
+@click.option('--create-edge-vm',
+              envvar=envvars.get_envvar_key_if_val("CREATE_EDGE_VM"),
+              required=True,
+              default=False,
+              show_default=True,
+              is_flag=True,
+              prompt='Create a new Virtual Machine with IoTEdge?',
+              help='If true, creates a new Virtual Machine with IoTEdge.')
 @with_telemetry
 def setup_iothub(credentials,
                  service_principal,
@@ -752,13 +783,17 @@ def setup_iothub(credentials,
                  iothub_sku,
                  iothub_name,
                  edge_device_id,
-                 update_dotenv):
+                 update_dotenv,
+                 create_edge_vm):
     if update_dotenv:
         if envvars.backup_dotenv():
             envvars.save_envvar("IOTHUB_CONNECTION_STRING", envvars.IOTHUB_CONNECTION_STRING)
             envvars.save_envvar("DEVICE_CONNECTION_STRING", envvars.DEVICE_CONNECTION_STRING)
             output.info("Updated current .env file")
 
+    if create_edge_vm:
+        handle_vm_create()
+
 
 @docker.command(context_settings=CONTEXT_SETTINGS,
                 help="Pull Edge runtime images from Microsoft Container Registry and push to your specified container registry. "
@@ -835,7 +870,7 @@ def log(show, save):
     dock.handle_logs_cmd(show, save)
 
 
-main.add_command_with_deprecation(log, deprecated=True)
+main.add_command_with_deprecation(log, deprecated=True, alt="docker log")
 
 if __name__ == "__main__":
     main()

s/build/lib/iotedgedev/envvars.py

@@ -119,6 +119,7 @@ class EnvVars:
                 self.IOTHUB_NAME = self.get_envvar("IOTHUB_NAME")
                 self.IOTHUB_SKU = self.get_envvar("IOTHUB_SKU")
                 self.EDGE_DEVICE_ID = self.get_envvar("EDGE_DEVICE_ID")
+                self.CREATE_EDGE_VM = self.get_envvar("CREATE_EDGE_VM")
                 self.CREDENTIALS = self.get_envvar("CREDENTIALS")
                 self.UPDATE_DOTENV = self.get_envvar("UPDATE_DOTENV")
 

s/build/lib/iotedgedev/output.py

@@ -55,3 +55,7 @@ class Output:
 
     def confirm(self, text, default=False, abort=True):
         return click.confirm(text, default=default, abort=abort)
+
+    def prompt_question(self, text, default=""):
+        self.line()
+        return click.prompt(text, default=default)

s/docs/command-list.md

@@ -335,6 +335,7 @@ Options:
   --iothub-name TEXT              The IoT Hub Name (Creates a new IoT Hub if not found).  [required]
   --edge-device-id TEXT           The IoT Edge Device Id (Creates a new Edge Device if not found).  [required]
   -u, --update-dotenv             If True, the current .env will be updated with the IoT Hub and Device connection strings.  [default: False; required]
+  --create-edge-vm                Create an Edge-enabled Virtual Machine by using <https://aka.ms/iotedge-vm-deploy>.  [default: False; required]
   -h, --help                      Show this message and exit.
 ```
 

s/docs/environment-setup/manual-dev-machine-setup.md

@@ -76,4 +76,4 @@ If you are using a separate Edge device, like a Raspberry Pi, you do not need to
       1. Install **[JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html)**
       2. Install **[Maven](https://maven.apache.org/)**
 
-9. Follow the [Usage Wiki](usage) to learn the usage of IoT Edge Dev Tool
+9. Follow the [Usage Wiki](../usage.md) to learn the usage of IoT Edge Dev Tool

s/docs/quickstart.md

@@ -22,9 +22,9 @@ At the end of this quickstart, you should have the following:
 
     There are three options to setup your environment:
 
-    - Setup the development environment manually. Please follow the [Manual Development Machine Setup Wiki](environment-setup/manual-dev-machine-setup).
+    - Setup the development environment manually. Please follow the [Manual Development Machine Setup Wiki](environment-setup/manual-dev-machine-setup.md).
     - Starting the devcontainer in VS Code (see [Developing inside a Container](https://code.visualstudio.com/docs/remote/containers) for steps on how to do so).
-    - Starting the devcontainer with Docker. Please follow the [Run the IoT Edge Dev Container with Docker docs](environment-setup/run-devcontainer-docker).
+    - Starting the devcontainer with Docker. Please follow the [Run the IoT Edge Dev Container with Docker docs](environment-setup/run-devcontainer-docker.md).
 
 1. Initialize IoT Edge solution and setup Azure resources.
 

s/iotedgedev/__init__.py

@@ -2,5 +2,5 @@
 
 __author__ = 'Microsoft Corporation'
 __email__ = 'opencode@microsoft.com'
-__version__ = '3.3.5'
+__version__ = '3.3.6'
 __AIkey__ = 'fed7fc65-5b4a-4e66-9d46-c5f016d4e2b4'

s/iotedgedev/azurecli.py

@@ -6,6 +6,7 @@ import subprocess
 import sys
 from io import StringIO
 from threading import Thread, Timer
+from pathlib import Path
 
 from azure.cli.core import get_default_cli
 from fstrings import f
@@ -550,3 +551,35 @@ class AzureCli:
                     return data["connectionString"]
 
         return ''
+
+    def get_ssh_key(self, ssh_key_file):
+        file_path = Path.home().joinpath(".ssh", ssh_key_file + ".pub")
+        if not os.path.exists(file_path):
+            self.output.status(f("No SSH key found at ~/.ssh/{ssh_key_file}.pub. Generating a new one..."))
+            os.system(f("ssh-keygen -t rsa -b 4096 -C \"iotedgedev-autogenerated\" -f ~/.ssh/{ssh_key_file} -q -N \"\""))
+
+        with open(file_path, 'r') as file:
+            ssh_key = file.read()
+            return ssh_key
+
+    def create_edge_vm(self, ssh_key_file, edge_device_id, iothub, resource_group):
+        self.output.status(f("\nCreating a new Virtual Machine in '{resource_group}' with ssh key file '{ssh_key_file}'..."))
+
+        connectionString = self.get_device_connection_string(edge_device_id, iothub, resource_group)
+        # Use IoTHub name for deployment - in this case it will create a new
+        # template if a new IoT Hub is created.
+        deploymentTemplateName = "edgeVM-" + iothub
+
+        ssh_key = self.get_ssh_key(ssh_key_file)
+
+        self.output.status(f("Creating Virtual Machine in '{resource_group}' with an incremental deployment template '{deploymentTemplateName}', this can take some time..."))
+        return self.invoke_az_cli_outproc(["deployment", "group", "create", "--name", deploymentTemplateName,
+                                           "--resource-group", resource_group,
+                                           "--template-uri", "https://raw.githubusercontent.com/Azure/iotedge-vm-deploy/master/edgeDeploy.json",
+                                           "--parameters", "dnsLabelPrefix=iotedgedev-vm",
+                                           "--parameters", "adminUsername=azureuser",
+                                           "--parameters", "authenticationType=sshPublicKey",
+                                           "--parameters", "adminPasswordOrKey=" + ssh_key,
+                                           "--parameters", "deviceConnectionString=" + connectionString,
+                                           "--output", "table"],
+                                          f("Failed to create the VM with deployment template '{deploymentTemplateName}'."))

s/iotedgedev/cli.py

@@ -25,11 +25,17 @@ from .solution import Solution
 from .utility import Utility
 
 # Extend click.Group#add_command(cmd, name) to take deprecated=bool flag by monkey patching.
-def add_command_with_deprecation(self, cmd: Command, name: t.Optional[str] = None, deprecated = False):
+def add_command_with_deprecation(self, cmd: Command, name: t.Optional[str] = None, deprecated = False, alt:  t.Optional[str] = None):
     # Directly changing the deprecated flag of the cmd has side-effects on the reference source.
     # To avoid this, copy the cmd object with deepcopy.
     copied_command = copy.deepcopy(cmd)
     copied_command.deprecated = deprecated
+    if copied_command.short_help is None:
+        copied_command.short_help = copied_command.help
+    if alt is not None:
+        alt_cmd = "[Use `iotedgedev " + alt + "` instead]"
+        copied_command.short_help += " " + alt_cmd  # use space for formatting short_help in `iotedgedev --help`
+        copied_command.help += "\n\n" + alt_cmd  # use newline for formatting help in `iotedgedev <command> --help`
     self.add_command(copied_command, name)
 
 Group.add_command_with_deprecation = add_command_with_deprecation
@@ -99,7 +105,7 @@ def new(name, module, template, edge_runtime_version, group_id):
     sol = Solution(output, utility)
     sol.create(name, module, template, edge_runtime_version, group_id)
 
-main.add_command_with_deprecation(new, deprecated=True)
+main.add_command_with_deprecation(new, deprecated=True, alt="solution new")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS,
@@ -132,7 +138,7 @@ def init(name, module, template, group_id, edge_runtime_version):
     utility.call_proc(azsetupcmd.split())
 
 
-main.add_command_with_deprecation(init, deprecated=True)
+main.add_command_with_deprecation(init, deprecated=True, alt="solution init")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Push, deploy, start, monitor")
@@ -155,7 +161,7 @@ def add(name, template, group_id):
     mod.add(name, template, group_id)
 
 
-main.add_command_with_deprecation(add, deprecated=True)
+main.add_command_with_deprecation(add, deprecated=True, alt="solution add")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Build the solution")
@@ -197,7 +203,7 @@ def build(ctx, push, do_deploy, template_file, platform):
         ctx.invoke(deploy)
 
 
-main.add_command_with_deprecation(build, deprecated=True)
+main.add_command_with_deprecation(build, deprecated=True, alt="solution build")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Push module images to container registry")
@@ -238,7 +244,7 @@ def push(ctx, do_deploy, no_build, template_file, platform):
         ctx.invoke(deploy)
 
 
-main.add_command_with_deprecation(push, deprecated=True)
+main.add_command_with_deprecation(push, deprecated=True, alt="solution push")
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS, help="Deploy solution to IoT Edge device")
@@ -256,7 +262,7 @@ def deploy(manifest_file):
     edge.deploy(manifest_file)
 
 
-main.add_command_with_deprecation(deploy, deprecated=True)
+main.add_command_with_deprecation(deploy, deprecated=True, alt="solution deploy")
 
 
 @iothub.command(
@@ -351,7 +357,7 @@ def genconfig(template_file, platform, fail_on_validation_error):
     mod.build_push(template_file, platform, no_build=True, no_push=True, fail_on_validation_error=fail_on_validation_error)
 
 
-main.add_command_with_deprecation(genconfig, deprecated=True)
+main.add_command_with_deprecation(genconfig, deprecated=True, alt="solution genconfig")
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -374,7 +380,7 @@ def setup_simulator(gateway_host, iothub_connection_string):
     sim.setup(gateway_host, iothub_connection_string)
 
 
-main.add_command_with_deprecation(setup_simulator, deprecated=True)
+main.add_command_with_deprecation(setup_simulator, deprecated=True, alt="simulator setup")
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -449,7 +455,7 @@ def start_simulator(setup, solution, build, manifest_file, platform, verbose, in
         sim.start_single(inputs, port)
 
 
-main.add_command_with_deprecation(start_simulator, deprecated=True)
+main.add_command_with_deprecation(start_simulator, deprecated=True, alt="simulator start")
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -461,7 +467,7 @@ def stop_simulator():
     sim.stop()
 
 
-main.add_command_with_deprecation(stop_simulator, deprecated=True)
+main.add_command_with_deprecation(stop_simulator, deprecated=True, alt="simulator stop")
 
 
 @simulator.command(context_settings=CONTEXT_SETTINGS,
@@ -501,7 +507,7 @@ def monitor(timeout):
     ih.monitor_events(timeout)
 
 
-main.add_command_with_deprecation(monitor, deprecated=True)
+main.add_command_with_deprecation(monitor, deprecated=True, alt="iothub monitor")
 
 
 def ensure_azure_cli_iot_ext():
@@ -622,25 +628,31 @@ def validate_option(ctx, param, value):
 def list_edge_devices_and_set_default():
     if not azure_cli.list_edge_devices(envvars.IOTHUB_NAME):
         sys.exit()
-    return "iotedgedev-edgedevice"
+    output.info("Enter the IoT Edge Device Id (Creates a new Edge Device if not found) [iotedgedev-edgedevice]:")
+    return input() or "iotedgedev-edgedevice"
 
 
 def list_iot_hubs_and_set_default():
     if not azure_cli.list_iot_hubs(envvars.RESOURCE_GROUP_NAME):
         sys.exit()
 
+    subscription_rg_hash = hashlib.sha1((default_subscriptionId + envvars.RESOURCE_GROUP_NAME).encode('utf-8')).hexdigest()[:6]
+    iothub_name = "iotedgedev-iothub-" + subscription_rg_hash
+
     first_iothub = azure_cli.get_first_iothub(envvars.RESOURCE_GROUP_NAME)
     if first_iothub:
-        return first_iothub
-    else:
-        subscription_rg_hash = hashlib.sha1((default_subscriptionId + envvars.RESOURCE_GROUP_NAME).encode('utf-8')).hexdigest()[:6]
-        return "iotedgedev-iothub-" + subscription_rg_hash
+        iothub_name = first_iothub
+
+    output.info(f"Enter the IoT Hub Name (Creates a new IoT Hub if not found) [{iothub_name}]:")
+    return input() or iothub_name
 
 
 def list_resource_groups_and_set_default():
     if not azure_cli.list_resource_groups():
         sys.exit()
-    return "iotedgedev-rg"
+
+    output.info("Enter Resource Group Name (Creates a new Resource Group if not found) [iotedgedev-rg]:")
+    return input() or "iotedgedev-rg"
 
 
 def list_subscriptions_and_set_default():
@@ -657,14 +669,30 @@ def list_subscriptions_and_set_default():
     if not azure_cli.list_subscriptions():
         sys.exit()
     default_subscriptionId = azure_cli.get_default_subscription()
-    return default_subscriptionId
+    output.info(f"Select an Azure Subscription Name or Id [{default_subscriptionId}]:")
+    return input() or default_subscriptionId
 
 
-def header_and_default(header, default, default2=None):
+def header_and_default(header, prompt, default, options=None):
     output.header(header)
-    if default == '' and default2 is not None:
-        return default2
-    return default
+    output.info(f"{prompt} [{default}]:")
+    output.info(f"Available options: {options}")
+    return input() or default
+
+
+def handle_vm_create():
+    output.header("CREATE VIRTUAL MACHINE")
+    output.info("The virtual machine will be created with the IoT Edge runtime installed.\n"
+                "The deployment template can be found at: https://aka.ms/iotedge-vm-deploy \n"
+                "The name of the virtual machine will be a unique string generated by the template.\n"
+                "Details: os=ubuntu20_04-lts, size=Standard_DS1_v2, username=azureuser, allowSsh=true")
+    ssh_key_file = output.prompt_question("SSH Key file (must be located in ~/.ssh and will be created if it doesn't exist)", "id_rsa_iotedgedev")
+    if not azure_cli.create_edge_vm(ssh_key_file, envvars.EDGE_DEVICE_ID, envvars.IOTHUB_NAME, envvars.RESOURCE_GROUP_NAME):
+        raise click.BadParameter(f('Could not create Virtual Machine in {envvars.RESOURCE_GROUP_NAME}'))
+    else:
+        output.info("Virtual Machine created successfully. Check Azure Portal for details on how to connect.\n"
+                    "WARNING: Check the details of the Network Security Group, it is setup to allow SSH from all addresses.\n"
+                    "You will be able to connect using the SSH Key file: ~/.ssh/" + ssh_key_file)
 
 
 @iothub.command(context_settings=CONTEXT_SETTINGS,
@@ -688,51 +716,46 @@ def header_and_default(header, default, default2=None):
               help="Enter Azure Service Principal Credentials (username password tenant).")
 @click.option('--subscription',
               envvar=envvars.get_envvar_key_if_val("SUBSCRIPTION_ID"),
-              default=lambda: list_subscriptions_and_set_default(),
+              default=list_subscriptions_and_set_default,
               required=True,
               callback=validate_option,
-              prompt="Select an Azure Subscription Name or Id:",
               help="The Azure Subscription Name or Id.")
 @click.option('--resource-group-location',
               envvar=envvars.get_envvar_key_if_val("RESOURCE_GROUP_LOCATION"),
               required=True,
-              default=lambda: header_and_default('RESOURCE GROUP LOCATION', envvars.RESOURCE_GROUP_LOCATION, 'westus'),
-              type=click.Choice(['australiaeast', 'australiasoutheast', 'brazilsouth', 'canadacentral', 'canadaeast', 'centralindia', 'centralus', 'eastasia', 'eastus', 'eastus2',
-                                 'japanwest', 'japaneast', 'northeurope', 'northcentralus', 'southindia', 'uksouth', 'ukwest', 'westus', 'westeurope', 'southcentralus', 'westcentralus', 'westus2']),
+              default=lambda: header_and_default('RESOURCE GROUP LOCATION', 'Enter a Resource Group Location', envvars.RESOURCE_GROUP_LOCATION or 'westus',
+                                                 ['australiaeast', 'australiasoutheast', 'brazilsouth', 'canadacentral', 'canadaeast', 'centralindia', 'centralus', 'eastasia', 'eastus', 'eastus2',
+                                                  'japanwest', 'japaneast', 'northeurope', 'northcentralus', 'southindia', 'uksouth', 'ukwest', 'westus', 'westeurope', 'southcentralus', 'westcentralus', 'westus2']),
+              type=str,
               callback=validate_option,
-              prompt="Enter a Resource Group Location:",
               help="The Resource Group Location.")
 @click.option('--resource-group-name',
               envvar=envvars.get_envvar_key_if_val("RESOURCE_GROUP_NAME"),
               required=True,
-              default=lambda: list_resource_groups_and_set_default(),
+              default=list_resource_groups_and_set_default,
               type=str,
               callback=validate_option,
-              prompt="Enter Resource Group Name (Creates a new Resource Group if not found):",
               help="The Resource Group Name (Creates a new Resource Group if not found).")
 @click.option('--iothub-sku',
               envvar=envvars.get_envvar_key_if_val("IOTHUB_SKU"),
               required=True,
-              default=lambda: header_and_default('IOTHUB SKU', 'F1'),
-              type=click.Choice(['F1', 'S1', 'S2', 'S3']),
+              default=lambda: header_and_default('IOTHUB SKU', 'Enter IoT Hub SKU', 'F1', ['F1', 'S1', 'S2', 'S3']),
+              type=str,
               callback=validate_option,
-              prompt="Enter IoT Hub SKU (F1|S1|S2|S3):",
               help="The IoT Hub SKU.")
 @click.option('--iothub-name',
               envvar=envvars.get_envvar_key_if_val("IOTHUB_NAME"),
               required=True,
-              default=lambda: list_iot_hubs_and_set_default(),
+              default=list_iot_hubs_and_set_default,
               type=str,
               callback=validate_option,
-              prompt='Enter the IoT Hub Name (Creates a new IoT Hub if not found):',
               help='The IoT Hub Name (Creates a new IoT Hub if not found).')
 @click.option('--edge-device-id',
               envvar=envvars.get_envvar_key_if_val("EDGE_DEVICE_ID"),
               required=True,
-              default=lambda: list_edge_devices_and_set_default(),
+              default=list_edge_devices_and_set_default,
               type=str,
               callback=validate_option,
-              prompt='Enter the IoT Edge Device Id (Creates a new Edge Device if not found):',
               help='The IoT Edge Device Id (Creates a new Edge Device if not found).')
 @click.option('--update-dotenv',
               "-u",
@@ -743,6 +766,14 @@ def header_and_default(header, default, default2=None):
               is_flag=True,
               prompt='Update the .env file with connection strings?',
               help='If True, the current .env will be updated with the IoT Hub and Device connection strings.')
+@click.option('--create-edge-vm',
+              envvar=envvars.get_envvar_key_if_val("CREATE_EDGE_VM"),
+              required=True,
+              default=False,
+              show_default=True,
+              is_flag=True,
+              prompt='Create a new Virtual Machine with IoTEdge?',
+              help='If true, creates a new Virtual Machine with IoTEdge.')
 @with_telemetry
 def setup_iothub(credentials,
                  service_principal,
@@ -752,13 +783,17 @@ def setup_iothub(credentials,
                  iothub_sku,
                  iothub_name,
                  edge_device_id,
-                 update_dotenv):
+                 update_dotenv,
+                 create_edge_vm):
     if update_dotenv:
         if envvars.backup_dotenv():
             envvars.save_envvar("IOTHUB_CONNECTION_STRING", envvars.IOTHUB_CONNECTION_STRING)
             envvars.save_envvar("DEVICE_CONNECTION_STRING", envvars.DEVICE_CONNECTION_STRING)
             output.info("Updated current .env file")
 
+    if create_edge_vm:
+        handle_vm_create()
+
 
 @docker.command(context_settings=CONTEXT_SETTINGS,
                 help="Pull Edge runtime images from Microsoft Container Registry and push to your specified container registry. "
@@ -835,7 +870,7 @@ def log(show, save):
     dock.handle_logs_cmd(show, save)
 
 
-main.add_command_with_deprecation(log, deprecated=True)
+main.add_command_with_deprecation(log, deprecated=True, alt="docker log")
 
 if __name__ == "__main__":
     main()

s/iotedgedev/envvars.py

@@ -119,6 +119,7 @@ class EnvVars:
                 self.IOTHUB_NAME = self.get_envvar("IOTHUB_NAME")
                 self.IOTHUB_SKU = self.get_envvar("IOTHUB_SKU")
                 self.EDGE_DEVICE_ID = self.get_envvar("EDGE_DEVICE_ID")
+                self.CREATE_EDGE_VM = self.get_envvar("CREATE_EDGE_VM")
                 self.CREDENTIALS = self.get_envvar("CREDENTIALS")
                 self.UPDATE_DOTENV = self.get_envvar("UPDATE_DOTENV")
 

s/iotedgedev/output.py

@@ -55,3 +55,7 @@ class Output:
 
     def confirm(self, text, default=False, abort=True):
         return click.confirm(text, default=default, abort=abort)
+
+    def prompt_question(self, text, default=""):
+        self.line()
+        return click.prompt(text, default=default)

s/iotedgedev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: iotedgedev
-Version: 3.3.5
+Version: 3.3.6
 Summary: The Azure IoT Edge Dev Tool greatly simplifies the IoT Edge development process by automating many routine manual tasks, such as building, deploying, pushing modules and configuring the IoT Edge Runtime.
 Home-page: https://github.com/azure/iotedgedev
 Author: Microsoft Corporation

s/iotedgedev.egg-info/requires.txt

@@ -5,7 +5,7 @@ python-dotenv
 requests<=2.25.1,>=2.20.0
 fstrings
 azure-cli-core<2.35.0,>=2.34.1
-iotedgehubdev==0.14.14
+iotedgehubdev==0.14.16
 applicationinsights==0.11.9
 commentjson==0.9.0
 pyyaml>=5.4

s/requirements.txt

@@ -4,7 +4,7 @@ python-dotenv==0.19.0
 requests==2.25.1
 fstrings==0.1.0
 msrestazure==0.6.4
-iotedgehubdev==0.14.14
+iotedgehubdev==0.14.16
 applicationinsights==0.11.9
 commentjson==0.9.0
 azure-cli-core==2.34.1

s/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.3.5
+current_version = 3.3.6
 commit = True
 tag = True
 

s/setup.py

@@ -15,7 +15,7 @@ requirements = [
     # Note >=2.35.0 cannot be used as is not compatible with the docker dependency;
     # docker requires websocket-client==0.56.0 and azure-cli-core>=2.35.0 requires websocket-client==1.31.1.
     'azure-cli-core >= 2.34.1, < 2.35.0',
-    'iotedgehubdev == 0.14.14',
+    'iotedgehubdev == 0.14.16',
     'applicationinsights == 0.11.9',
     'commentjson == 0.9.0',
     'pyyaml>=5.4',
@@ -33,7 +33,7 @@ test_requirements = [
 
 setup(
     name='iotedgedev',
-    version='3.3.5',
+    version='3.3.6',
     description='The Azure IoT Edge Dev Tool greatly simplifies the IoT Edge development process by automating many routine manual tasks, such as building, deploying, pushing modules and configuring the IoT Edge Runtime.',
     long_description='See https://github.com/azure/iotedgedev for usage instructions.',
     author='Microsoft Corporation',

s/tests/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = 'Microsoft Corporation'
 __email__ = 'opencode@microsoft.com'
-__version__ = '3.3.5'
+__version__ = '3.3.6'