Allow user to select deployment template when add module (#548)

* Allow user to select deployment template when add module

* Update version to 1.22.0

Co-authored-by: rentu <[email protected]>

Author: SLdragon

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Change Log
+
+## 1.22.0 - 2020-5-xx
+### Changed
+* Allow user to select deployment template when add module
+* Adopt VS Code's 'asWebviewUri' API
+
 ## 1.21.0 - 2020-4-07
 ### Added
 * Add check when input repository URL

README.md

@@ -21,18 +21,10 @@
 
 ![Added](images/multipleplatform.gif)
 
-## What's New (v1.21.0)
-### Added
-* Add check when input repository URL
-* Add retry logic when download standalone simulator
-* Add single module debug support for Python
-* Add arm64v8 platform support
-
+## What's New (v1.22.0)
 ### Changed
-* Use pip package URL instead of GitHub API to avoid rate limitation
-
-### Fixed
-* Fixed image placeholder and docker path verification issue: [#159](https://github.com/microsoft/vscode-azure-iot-edge/issues/159)
+* Allow user to select deployment template when add module
+* Adopt VS Code's 'asWebviewUri' API
 
 ## Known Issues
 * [C module remote debug error](https://github.com/Microsoft/vscode-azure-iot-edge/issues/283)

package-lock.json

@@ -2,7 +2,7 @@
   "name": "azure-iot-edge",
   "displayName": "Azure IoT Edge",
   "description": "This extension is now a part of Azure IoT Tools extension pack. We highly recommend installing Azure IoT Tools to get full capabilities for Azure IoT development. Develop, deploy, debug, and manage your IoT Edge solution.",
-  "version": "1.21.0",
+  "version": "1.22.0-rc",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",

package.json

@@ -59,8 +59,9 @@ export class EdgeManager {
     }
 
     public async addModuleForSolution(outputChannel: vscode.OutputChannel, templateUri?: vscode.Uri): Promise<void> {
+        const pattern = `{${Constants.deploymentTsonPattern}}`;
         let templateFile: string = await Utility.getInputFilePath(templateUri,
-            Constants.deploymentTemplatePattern,
+            pattern,
             Constants.deploymentTemplateDesc,
             `${Constants.addModuleEvent}.selectTemplate`);
         if (!templateFile) {
@@ -246,21 +247,24 @@ export class EdgeManager {
         const isTempsensorNeeded = isNewSolution && this.isCustomModule(template);
         const { usernameEnv, passwordEnv } = await this.addModuleToDeploymentTemplate(templateJson, templateFile, envFilePath, moduleInfo, isTempsensorNeeded);
 
-        const templateDebugFile = path.join(slnPath, Constants.deploymentDebugTemplate);
         const debugTemplateEnv = { usernameEnv: undefined, passwordEnv: undefined };
         let debugExist = false;
-        if (await fse.pathExists(templateDebugFile)) {
-            debugExist = true;
-            const templateDebugJson = Utility.updateSchema(await fse.readJson(templateDebugFile));
-            const envs = await this.addModuleToDeploymentTemplate(templateDebugJson, templateDebugFile, envFilePath, moduleInfo, isTempsensorNeeded, true);
-            debugTemplateEnv.usernameEnv = envs.usernameEnv;
-            debugTemplateEnv.passwordEnv = envs.passwordEnv;
+        const templateName = path.basename(templateFile);
+        if (templateName === Constants.deploymentTemplate) {
+            const templateDebugFile = path.join(slnPath, Constants.deploymentDebugTemplate);
+            if (await fse.pathExists(templateDebugFile)) {
+                debugExist = true;
+                const templateDebugJson = Utility.updateSchema(await fse.readJson(templateDebugFile));
+                const envs = await this.addModuleToDeploymentTemplate(templateDebugJson, templateDebugFile, envFilePath, moduleInfo, isTempsensorNeeded, true);
+                debugTemplateEnv.usernameEnv = envs.usernameEnv;
+                debugTemplateEnv.passwordEnv = envs.passwordEnv;
+            }
         }
 
         if (!isNewSolution) {
             const launchUpdated: string = debugGenerated ? "and 'launch.json' are updated." : "are updated.";
             const moduleCreationMessage = isProjCreated ? `Module '${moduleInfo.moduleName}' has been created. ` : "";
-            const deploymentTemlateMessage = debugExist ? "deployment.template.json, deployment.debug.template.json" : "deployment.template.json";
+            const deploymentTemlateMessage = debugExist ? `${Constants.deploymentTemplate}, ${Constants.deploymentDebugTemplate}` : templateName;
             vscode.window.showInformationMessage(`${moduleCreationMessage} ${deploymentTemlateMessage} ${launchUpdated}`);
         }
         const address = await Utility.getRegistryAddress(moduleInfo.repositoryName);