Support env in repository url (#539)

* Support env in repository url * Update version to 1.21.0-rc1 * correct wording Co-authored-by: rentu <[email protected]>
microsoft · Apr 2, 2020 · 9003076 · 9003076
1 parent 5c123e9
commit 9003076
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.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-rc",
+  "version": "1.21.0-rc1",
   "publisher": "vsciot-vscode",
   "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe",
   "icon": "logo.png",

diff --git a/src/common/utility.ts b/src/common/utility.ts
@@ -586,21 +586,21 @@ export class Utility {
             hostName = null;
         }
 
-        if (hostName && /[^a-zA-Z0-9\.\-:]/.test(hostName)) {
-            return "Repository host name can only contain alphanumeric characters or .-:";
+        if (hostName && /[^a-zA-Z0-9\.\-:\${}]/.test(hostName)) {
+            return "Repository host name can only contain alphanumeric characters or .-:, and ${} are also supported for environment variables";
         }
 
-        if (/[^a-z0-9\._\-\/]+/.test(repositoryName)) {
-            return "Repository name can only contain lowercase letters, digits or ._-/";
+        if (/[^a-z0-9\._\-\/\${}]+/.test(repositoryName)) {
+            return "Repository name can only contain lowercase letters, digits or ._-/, and ${} are also supported for environment variables";
         }
 
         if (tag) {
             if (tag.length > 128) {
                 return "The maximum length of tag is 128";
             }
 
-            if (/[^a-zA-Z0-9\._\-]+/.test(tag)) {
-                return "Tag can only contain alphanumeric characters or ._-";
+            if (/[^a-zA-Z0-9\._\-\${}]+/.test(tag)) {
+                return "Tag can only contain alphanumeric characters or ._-, and ${} are also supported for environment variables";
             }
         }