iotedgedev 3.3.4__zip → 3.3.5__zip

s/CHANGELOG.md

@@ -1,118 +1,170 @@
 # Changelog
+
 All notable changes to this project since 0.82.0 will be documented in this file.
 
+## [3.3.5] - 2022-05-17
+
+- Update azure-cli-core
+- Enable `iotedgedev solution deploy` with a DPS connection string
+- Deprecate duplicate commands
+- Fix issue with traceback error not being outputted from the `iotedgedev monitor` command
+- Fix issue when provisioning default IoT Hub SKUs (F1) with `iotedgedev iothub setup`
+- Add `iotedgedev init` an option to initialize in a new folder
+
 ## [3.3.4] - 2022-03-24
+
 - Lock simulator version at 0.14.14
 - Update Wiki and dev container to reflect changes about the simulator
 
 ## [3.3.3] - 2022-03-15
+
 - Add support for python 3.8, 3.9
 - Lock simulator version at 0.14.12
 - Upgrade docker SDK to version 5.0.3
 
 ## [3.3.2] - 2022-03-02
+
 - Lock simulator version at 0.14.11
 
 ## [3.3.1] - 2021-10-20
+
 - Updated Python Docker package versions to newest version and enable simulator dependencies
 
 ## [3.3.0] - 2021-8-24
+
 - Add support for layered deployment manifests when building, pushing and generating
 - Add support for creating deployments in IoTHub via the new command: `iotedgedev iothub deploy`
 - Add support for adding device tags via the new command: `iotedgedev tag`
 
 ## [3.2.0] - 2021-7-30
+
 - Added support for IoT Edge Runtime version 1.2
 - Enable change of edgehub and edgeagent schema versions
 - Added support for config generation, build and push off of a layered deployment manifest
 
 ## [3.1.0] - 2021-6-8
+
 - Added support for IoT Edge Runtime version 1.1
 - Enabled dynamic Edge runtime selection in CLI with -er flag
 
 ## [3.0.0] - 2021-01-27
+
 - Remove support for Python2. Only Python 3.6 and 3.7 are currently supported.
 
 ## [2.2.0] - 2021-01-06
+
 ### Changed
+
 - Remove explicit cryptography package install to resolve dependency conflicts so tests can run
 - Add local registry support for Windows
 
 ## [2.1.6] - 2020-09-23
+
 ### Changed
+
 - Fix warning about ConfigParser readfp deprecation
 
 ## [2.1.5] - 2020-08-18
+
 ### Changed
+
 - Fix error caused by latest bcrypt on Azure Pipelines agent
 
 ## [2.1.4] - 2020-04-01
+
 ### Changed
+
 - Fix configparser error from Azure Cli Core [[#426](https://github.com/Azure/iotedgedev/issues/426)]
 
 ## [2.1.3] - 2020-03-27
+
 ### Changed
+
 - Fix genconfig does not fail when schema validation failed. [[#424](https://github.com/Azure/iotedgedev/issues/424)]
 
 ## [2.1.2] - 2020-01-14
+
 ### Changed
+
 - Fix error when install on Azure Pipelines agent
 
 ## [2.1.1] - 2019-12-16
+
 ### Changed
+
 - Fix getconfig fails if template contains a placeholder that is not enclosed in quotes.[[#414](https://github.com/Azure/iotedgedev/issues/414)]
 - Fix wrong instruction to `iotedgedev iothub setup` with extra flags.[[#417](https://github.com/Azure/iotedgedev/issues/417)]
 - Python 3.8 is not supported due to Azure CLI IoT extension issue [[#128](https://github.com/Azure/azure-iot-cli-extension/issues/128)]
 
 ## [2.1.0] - 2019-10-28
+
 ### Added
+
 - Validate schema of deployment template and generated deployment manifest in `genconfig` command
 
 ### Changed
+
 - Show progress info for docker commands
 
 ## [2.0.2] - 2019-07-31
+
 ### Changed
+
 - Fix errors caused by latest lark-parser release.
 
 ## [2.0.1] - 2019-07-11
+
 ### Changed
+
 - Fix build errors when some projects under modules folder have no module.json [[#396](https://github.com/Azure/iotedgedev/issues/396)]
 
 ## [2.0.0] - 2019-06-10
+
 ### Added
+
 - Support relative path for module placeholder in deployment.template.json
 
 ### Changed
+
 - Fix issue with 'cs' keyerror [[#387](https://github.com/Azure/iotedgedev/issues/387)]. Thanks for jporcenaluk's contribution.
 - Drop support for ACTIVE_DOCKER_PLATFORMS environment variable
 
 ## [1.3.0] - 2019-04-25
+
 ### Added
+
 - Add module twin support for simulator
 
 ### Changed
+
 - Update azure-cli-core to fix module import error
 - Fix applicationinsights incompatible version issue [[#383](https://github.com/Azure/iotedgedev/issues/383)]
 
 ## [1.2.0] - 2019-02-26
+
 ### Changed
+
 - Fix issue creating C modules when temp folder and target project folder are on different disks [[#362](https://github.com/Azure/iotedgedev/pull/362)]
 - Fix issue connecting to Docker daemon with `tlsverify` enabled [[#364](https://github.com/Azure/iotedgedev/pull/364)]
 - Preserve tag cases when generating deployment manifests [[#372](https://github.com/Azure/iotedgedev/pull/372)]
 
 ## [1.1.0] - 2018-11-26
+
 ### Added
+
 - Support parsing `createOptions` in JSON dictionary format
 - Support multi-platform deployment manifest template, where modules' image placeholders are platform neutral (`${MODULE.filtermodule}` vs. `${MODULES.filtermodule.amd64}`). You can specify the platforms to build using the `--platform` parameter. By default, we provide "arm32v7", "amd64" and "windows-amd64" as the platform set since these are Azure IoT Edge supporting platforms today
 - Add **deployment.debug.template.json** when creating new solutions. This template refers to the debug flavour image of the modules and has debug `createOptions` populated automatically. You can specify the deployment manifest template to build using the `--file` parameter
 
 ### Changed
+
 - Default to JSON dictionary format for newly created modules' `createOptions`
 - Show more clear message when failing to connect to Docker daemon
 
 ## [1.0.0] - 2018-11-01
+
 ### Added
+
 - Support adding Java modules
 - Support adding C modules
 - Add OpenJDK and Maven to IoT Edge Dev Tool Container
@@ -120,6 +172,7 @@ All notable changes to this project since 0.82.0 will be documented in this file
 - Add `registryCredentials` to deployment manifest template
 
 ### Changed
+
 - Update .NET Core SDK in IoT Edge Dev Tool Container to version 2.1
 - Improve Docker build and push command output to show more information
 - Retry subscription prompt when multiple results are found
@@ -128,7 +181,9 @@ All notable changes to this project since 0.82.0 will be documented in this file
 - Fix error starting local registry with custom ports
 
 ## [0.82.0] - 2018-08-28
+
 ### Added
+
 - New command to add modules to solution
 - Support for adding and building Node.js and Python modules
 - Integration with IoT Edge Simulator provided by the [iotedgehubdev CLI](https://pypi.org/project/iotedgehubdev/)
@@ -140,17 +195,21 @@ All notable changes to this project since 0.82.0 will be documented in this file
 - Update `.vscode/launch.json` file when adding modules
 
 ### Changed
+
 - Switch to Azure CLI IoT extension (>= 0.5.1) to monitor messages for Python >= 3.5 users
 - Improve experience of creating Azure resources interactively
 - Breaking changes (learn how to migrate [here](https://github.com/Azure/iotedgedev/wiki/migration-guides))
-    - Updated command list and options
-    - Updated logic to determine which module images to build
-    - New module folder structure
-    - Building code in Dockerfiles instead on building code natively
+  - Updated command list and options
+  - Updated logic to determine which module images to build
+  - New module folder structure
+  - Building code in Dockerfiles instead on building code natively
 
 ### Removed
+
 - Support for `iotedgectl` and public preview runtime images
 
 ## [0.1.0] - 2017-12-29
+
 ### Added
+
 - First release on PyPI.

s/CONTRIBUTING.md

@@ -2,121 +2,54 @@
 
 This section describes how to get your developer workspace running for the first time so that you're ready to start making contributions.
 
-Please fork, branch and pull-request any changes you'd like to make.
+Please fork, branch and pull-request any changes you'd like to make. For more information on how to create a fork, see: [Fork a repo - GitHub Docs](https://docs.github.com/en/get-started/quickstart/fork-a-repo)
 
-## Workspace Setup
+## Workspace setup
 
-1. Clone this repository
+1. Clone your fork of the repository
 
-    `git clone https://github.com/azure/iotedgedev.git`
+    `git clone https://github.com/<your_id>/iotedgedev.git`
 
-1. Rename `.env.tmp` in the root of the repo to `.env` and set the `IOTHUB_CONNECTION_STRING` and `DEVICE_CONNECTION_STRING` values to settings from your IoT Hub and Edge Device. To set these values you could run `iotedgedev iothub setup` in the root of the repo.
-
-1. Install **[Docker](https://docs.docker.com/engine/installation/)**
-    - Windows    
+2. Install **[Docker](https://docs.docker.com/engine/installation/)**
+    - Windows
         - Be sure to check whether you are running in Linux container mode or Windows container mode.
     - Linux
         - We've seen some issues with docker.io. If IoT Edge doesn't run for you, then try installing Docker CE directly instead of via docker.io. Use the [CE install steps](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/#install-docker-ce), or use the [convenience script](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/#install-using-the-convenience-script).
         - By default, you need `sudo` to run `docker` commands. If you want to avoid this, please follow the [post-installation steps for Linux](https://docs.docker.com/install/linux/linux-postinstall/#manage-docker-as-a-non-root-user).
 
+3. Setup development environment
 
-### A) Contributor Dev Machine Setup
-
-1. Install **Python 3.6+**, and **pip**
-    - Windows: [Install from Python's website](https://www.python.org/downloads/)
-    - Linux: `sudo apt-get install python-pip python3-pip`
-    - macOS: The OpenSSL used by the system built-in Python is old and vulnerable. Please use Python installed with [Homebrew](https://docs.brew.sh/Homebrew-and-Python).
-    
-1. Install **[Azure CLI 2.0](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest)**
-
-1. Install **[Azure CLI IoT extension](https://github.com/Azure/azure-iot-cli-extension/)**
-
-    - New Install: `az extension add --name azure-iot`
-    - Update Install: `az extension update --name azure-iot`
-
-1. Install **[Node.js](https://nodejs.org/en/download/)** and the **`iothub-explorer`** package
-
-    - `npm i -g iothub-explorer`
-
-1. (Linux only) Install [Docker Compose](https://docs.docker.com/compose/)
-
-    ```
-    pip install -U docker-compose
-    ```
-
-1. (Linux only) Install extra system dependencies
-
-    ```
-    sudo apt-get install -y libffi-dev libssl-dev
-    ```
-
-1. Install module dependencies
-    ##### C# module and C# Azure Functions module
-    Install **[.NET Core SDK 2.1 or later](https://www.microsoft.com/net/download)**
-
-    ##### Python module
-    1. Install **[Git](https://git-scm.com/)**
-    2. Install **[Cookiecutter](https://github.com/audreyr/cookiecutter)**
-    ```
-    pip install -U cookiecutter
-    ```
-
-    ##### Node.js module
-    1. Install **[Node.js](https://nodejs.org/en/download/)**
-    2. Install **[Yeoman](http://yeoman.io/)** and **[Azure IoT Edge Node.js module generator](https://github.com/Azure/generator-azure-iot-edge-module)** packages
-    ```
-    npm i -g yo generator-azure-iot-edge-module
-    ```
-
-    ##### Java module
-    1. Install **[JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html)**
-    1. Install **[Maven](https://maven.apache.org/)**
-
-1. Install Python development dependencies
-
-    ```
-    pip install -r requirements_dev.txt
-    ```
- 
-### B) Contributor Docker Devcontainer Setup
-
-#### With VSCode
-
-Developing with docker using VSCode's [remote containers](https://code.visualstudio.com/docs/remote/containers):
-
-- Install [Remote Development Extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.vscode-remote-extensionpack) in VSCode
-- Open the project in VSCode
-- When prompted by VSCode, select "Reopen in Container"
+    There are three options to setup your development environment:
 
-> To further customize your devcontainer checkout [Personalizing with `dotfile` repositories](https://code.visualstudio.com/docs/remote/containers#_personalizing-with-dotfile-repositories). In the same settings you're also able to add personal extensions for your container.
+    - **Devcontainers**: Start the devcontainer from VS Code. See [Developing inside a Container](https://code.visualstudio.com/docs/remote/containers) for steps on how to do so.
+    - **Local**: Setup the development environment manually. Please follow the [Manual Development Machine Setup Wiki](docs/environment-setup/manual-dev-machine-setup.md).
+      - Run IoT Edge Dev Tool in editable mode:  
+        Run ›`pip install -e .` from the root of the repo to see changes to iotedgedev commands as you change code.
 
-#### Without VSCode
+    - **Codespaces**: Create a [GitHub Codespaces](https://github.com/features/codespaces) directly from your fork via the GitHub UI.
 
-- Build the development environment: `docker build -f .devcontainer/Dockerfile -t dev .`
-- Mount the root directory into the docker container, and drop into a bash shell in the container:
-  
-  ```bash
-  docker run -it -v ${PWD}:/workspaces/iotedgedev iotedgedev
-  ```
+4. Rename `.env.tmp` in the root of the repo to `.env` and set the `IOTHUB_CONNECTION_STRING` and `DEVICE_CONNECTION_STRING` values to settings from your existing IoT Hub and Edge Device. If you don't have these, or want to create new ones, you could run `iotedgedev iothub setup` in the root of the repo to setup your resources and fill out the values automatically.
 
-## Developing
+### Known Issues
 
-1. Run IoT Edge Dev Tool in editable mode
+1. "iotedgedev command not found": Sometimes the `postCreateCommand` from the [container](.devcontainer/devcontainer.json) does not get executed and the environment is not correctly initialized. Run `pip install -e .` in the root of the repo to fix this.
 
-    Run the following command from the root of the repo to see changes to iotedgedev commands as you change code.
+## Run and debug tests
 
-    ```
-    pip install -e .
-    ```
+To **run** and **debug** the tests **individually** you can use the VSCode Test Runner UI provided by the [Python extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) (installed by default in the devcontainer).
 
+An alternative way to **debug** is to select `Python: debug test file` in the `Run and debug` tab of vscode, open the test file you'd like to debug and hit `F5`.
 
-## VS Code Debugging
-VS Code Debugging works only with Python 3.6 VS Code Python Environments for now. Make sure that your VS Code Python Environment is [pointing to Python 3.6](https://code.visualstudio.com/docs/python/environments#_how-to-choose-an-environment)
+You can choose one of these following commands to easily **run all** tests:
 
-Set your CLI arguments in .vscode/launch.json and hit **F5**
- 
-## Run Tests
+```sh
+# Run all tests with all python interpreters (fails for the ones not installed)
+# This is the command that runs in the pipeline for all python versions
+make test-all
+# Run tests with tox in python version 3.9 (the python version installed in the devcontainer)
+tox -e py39
+# Run all tests with pytest for python version 3.9 (nicest output, fastest)
+make test
+```
 
-Run the following command to run tests.
-    
-`tox`
+> It is recommended to run all tests with `tox -e py39` or `make test-all` at least once before making the PR. The pytest test runner environment is slightly different from tox, so some tests may pass with that and not in tox, resulting in failures in the pipeline.

s/Makefile

@@ -51,8 +51,7 @@ lint: ## check style with flake8
 	flake8 iotedgedev tests
 
 test: ## run tests quickly with the default Python
-	
-		python setup.py test
+	pytest ./tests
 
 test-all: ## run tests on every Python version with tox
 	tox

s/README.md

@@ -5,186 +5,27 @@
 
 The **IoT Edge Dev Tool** greatly simplifies [Azure IoT Edge](https://azure.microsoft.com/en-us/services/iot-edge/) development down to simple commands driven by environment variables.
 
- - It gets you started with IoT Edge development with the [IoT Edge Dev Container](https://hub.docker.com/r/microsoft/iotedgedev/) and IoT Edge solution scaffolding that contains a default module and all the required configuration files.
- - It speeds up your inner-loop dev (dev, debug, test) by reducing multi-step build & deploy processes into one-line CLI commands as well as drives your outer-loop CI/CD pipeline. _You can use all the same commands in both stages of your development life-cycle._
+- It gets you started with IoT Edge development with the [IoT Edge Dev Container](https://hub.docker.com/r/microsoft/iotedgedev/) and IoT Edge solution scaffolding that contains a default module and all the required configuration files.
+- It speeds up your inner-loop dev (dev, debug, test) by reducing multi-step build & deploy processes into one-line CLI commands as well as drives your outer-loop CI/CD pipeline. _You can use all the same commands in both stages of your development life-cycle._
 
 ## Overview
-For the absolute fastest way to get started with IoT Edge Dev, please see the [Quickstart](#quickstart) section below.
-
-For a more detailed overview of IoT Edge Dev Tool including setup and commands, please see the [Wiki](https://github.com/Azure/iotedgedev/wiki).
-
-## Quickstart
-
-> To set up development machines manually instead of using the IoT Edge Dev Container, please see the [Manual Development Machine Setup Wiki](https://github.com/Azure/iotedgedev/wiki/manual-dev-machine-setup).
-
-This quickstart will run a container, create a solution, setup Azure resources, build and deploy modules to your device, setup and start the IoT Edge simulator, monitor messages flowing into IoT Hub, and finally deploy to the IoT Edge runtime.
-
-<!-- Here's a 3 minute video walk-through of this Quickstart:
-
-[![Azure IoT Edge Dev Tool: Quickstart](assets/edgedevtoolquickstartsmall.png)](https://aka.ms/iotedgedevquickstart) -->
-
-The only thing you need to install is Docker. All of the other dev dependencies are included in the container. 
-
-1. **Install [Docker CE](https://docs.docker.com/install/)**
-
-    - For Windows, please follow [the document](https://docs.docker.com/docker-for-windows/#shared-drives) to open Docker Settings and setup a Shared Drive.
-    - For macOS, please follow [the document](https://docs.docker.com/docker-for-mac/#file-sharing) to choose local directories to share with your containers.
-    
-    Note: If the device is behind the proxy server, you can set the [proxy manually](https://docs.docker.com/network/proxy/#configure-the-docker-client) 
-
-1. **Run the IoT Edge Dev Container**
-
-    Before you run the container, you will need to create a local folder to store your IoT Edge solution files.
-    
-    **Windows**
-    ```
-    mkdir c:\temp\iotedge
-    docker run -ti -v /var/run/docker.sock:/var/run/docker.sock -v c:/temp/iotedge:/home/iotedge mcr.microsoft.com/iotedge/iotedgedev
-    ```
-
-    **Linux**
-    ```
-    sudo mkdir /home/iotedge
-    sudo docker run -ti -v /var/run/docker.sock:/var/run/docker.sock -v ~/iotedge:/home/iotedge mcr.microsoft.com/iotedge/iotedgedev
-    ```
-
-    **macOS**
-    ```
-    mkdir ~/iotedge
-    docker run -ti -v /var/run/docker.sock:/var/run/docker.sock -v ~/iotedge:/home/iotedge mcr.microsoft.com/iotedge/iotedgedev
-    ```
-
-1. **Initialize IoT Edge solution and setup Azure resources**
 
-    `iotedgedev init`
+For the absolute fastest way to get started with IoT Edge Dev, please see the [quickstart](docs/quickstart.md) section.
 
-    > `iotedgedev init` will create a solution and setup your Azure IoT Hub in a single command. The solution comes with a default C# module named `filtermodule`.
-
-    <details>
-    <summary>More information</summary>
-
-    1. You will see structure of current folder like below:
-
-    ```
-        │  .env
-        │  .gitignore
-        │  deployment.debug.template.json
-        │  deployment.template.json
-        │
-        ├─.vscode
-        │      launch.json
-        │
-        └─modules
-            └─filtermodule
-                │  .gitignore
-                │  Dockerfile.amd64
-                │  Dockerfile.amd64.debug
-                │  Dockerfile.arm32v7
-                │  Dockerfile.windows-amd64
-                │  filtermodule.csproj
-                │  module.json
-                │  Program.cs
-    ```
-
-    2. Open `.env` file, you will see the `IOTHUB_CONNECTION_STRING` and `DEVICE_CONNECTION_STRING` environment variables filled correctly.
-    3. Open `deployment.template.json` file   
-        1. You will see below section in the modules section:
-
-        ```
-        "filtermodule": {
-            "version": "1.0",
-            "type": "docker",
-            "status": "running",
-            "restartPolicy": "always",
-            "settings": {
-                "image": "${MODULES.filtermodule}",
-                "createOptions": {}
-            }
-        }
-        ```
-
-        2. Two default routes are added:
-        
-        ```
-        "routes": {
-            "sensorTofiltermodule": "FROM /messages/modules/tempSensor/outputs/temperatureOutput INTO BrokeredEndpoint(\"/modules/filtermodule/inputs/input1\")",
-            "filtermoduleToIoTHub": "FROM /messages/modules/filtermodule/outputs/* INTO $upstream"
-        }
-        ```
-
-    4. You will see privacy statement like below:
-
-        ```
-        Welcome to iotedgedev!
-        -------------------------
-        Telemetry
-        ---------
-        The iotedgedev collects usage data in order to improve your experience.
-        The data is anonymous and does not include commandline argument values.
-        The data is collected by Microsoft.
-        
-        You can change your telemetry settings by updating 'collect_telemetry' to 'no' in ~/.iotedgedev/setting.ini
-        ```
-
-    </details>
-
-1. **Build IoT Edge module images**
-
-    `sudo iotedgedev build`
-    
-    > This step will build user modules in deployment.template.json targeting amd64 platform.
-
-    <details>
-    <summary>More information</summary>
-
-    1. You will see a "BUILD COMPLETE" for each module and no error messages in the terminal output.
-    1. Open `config/deployment.amd64.json` file, you will see the module image placeholders expanded correctly.
-    1. Run `sudo docker image ls`, you will see the module images you just built.
-
-    </details>
-
-1. **Setup and start the IoT Edge Simulator to run the solution**
-
-    `sudo iotedgedev start --setup --file config/deployment.amd64.json`
-
-    <details>
-    <summary>More information</summary>
-
-    1. You will see an "IoT Edge Simulator has been started in solution mode." message at the end of the terminal output
-    2. Run `sudo docker ps`, you will see your modules running as well as an edgeHubDev container
-
-    </details>
-
-1. **Monitor messages sent from IoT Edge Simulator to IoT Hub**
-
-    `iotedgedev monitor`
-
-    <details>
-    <summary>More information</summary>
-
-    1. You will see your expected messages sending to IoT Hub
-    2. Stopping the monitor doesn't stop the simulator. It will continue running until it is explicitely stopped using `iotedgedev stop` and at that time all containers used by the simulator will be cleaned up.
-
-    </details>
-
-1. **Docker containers/images management**
-    1. The containers used by the simulator will be cleaned up when the simulator stops running `iotedgedev stop`
-    2. All remaining containers can be cleaned up using `iotedgedev docker clean -c`
-    3. All remaining images can be cleaned up using `iotedgedev docker clean -i`
-
-## Resources
-Please refer to the [Wiki](https://github.com/Azure/iotedgedev/wiki) for details on setup, usage, and troubleshooting.
+For a more detailed overview of IoT Edge Dev Tool including setup, commands and troubleshooting, please see the [Wiki](https://github.com/Azure/iotedgedev/wiki).
 
 ## Data/Telemetry
-This project collects usage data and sends it to Microsoft to help improve our products and services. Read our [privacy statement](http://go.microsoft.com/fwlink/?LinkId=521839) to learn more. 
+
+This project collects usage data and sends it to Microsoft to help improve our products and services. Read our [privacy statement](http://go.microsoft.com/fwlink/?LinkId=521839) to learn more.
 If you don’t wish to send usage data to Microsoft, you can change your telemetry settings by updating `collect_telemetry` to `no` in `~/.iotedgedev/settings.ini`.
 
 ## Contributing
+
 This project welcomes contributions and suggestions. Please refer to the [Contributing file](CONTRIBUTING.md) for details on contributing changes.
 
 Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to,
 and actually do, grant us the rights to use your contribution. For details, visit
-https://cla.microsoft.com.
+<https://cla.microsoft.com>.
 
 When you submit a pull request, a CLA-bot will automatically determine whether you need
 to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the
@@ -195,10 +36,16 @@ For more information see the [Code of Conduct FAQ](https://opensource.microsoft.
 or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
 ## Support
+
 The team monitors the issue section on regular basis and will try to assist with troubleshooting or questions related IoT Edge tools on a best effort basis.
-	
-A few tips before opening an issue. Try to generalize the problem as much as possible. Examples include
+
+A few tips before opening an issue. Try to generalize the problem as much as possible. Examples include:
+
 - Removing 3rd party components
 - Reproduce the issue with provided deployment manifest used
 - Specify whether issue is reproducible on physical device or simulated device or both
 Also, Consider consulting on the [docker docs channel](https://github.com/docker/docker.github.io) for general docker questions.
+
+## Additional Resources
+
+Please refer to the [Wiki](https://github.com/Azure/iotedgedev/wiki) for details on setup, usage, and troubleshooting.

s/SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

s/build/lib/iotedgedev/__init__.py

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