From a19882d581b1a47599b2ecf5b2c1611f5e22c7aa Mon Sep 17 00:00:00 2001 From: Haitham Shami Date: Thu, 30 Sep 2021 14:38:12 -0700 Subject: [PATCH 1/3] artificially limit edgeHub/properties.desired/schemaVeraion to 1.1 max --- CHANGELOG.md | 4 ++++ assets/solution/deployment.template.json | 2 +- package-lock.json | 2 +- package.json | 2 +- src/common/version.ts | 2 +- testResources/deployment.template.json | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d064b77..6d5fa1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Change Log +## 1.24.4 - 2021-10-01 +### Changed +* Maximum version number for edgeHub/properties.desired.schemaVersion is artificially forced to be 1.1 + ## 1.24.3 - 2021-7-27 ### Changed * Allow user to select Edge Runtime version between 1.2 diff --git a/assets/solution/deployment.template.json b/assets/solution/deployment.template.json index c6d92d3..eac9d15 100644 --- a/assets/solution/deployment.template.json +++ b/assets/solution/deployment.template.json @@ -55,7 +55,7 @@ }, "$edgeHub": { "properties.desired": { - "schemaVersion": "1.2", + "schemaVersion": "1.1", "routes": {}, "storeAndForwardConfiguration": { "timeToLiveSecs": 7200 diff --git a/package-lock.json b/package-lock.json index 08761ef..f1c0050 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "azure-iot-edge", - "version": "1.24.2", + "version": "1.24.4-rc", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2b52726..faaecc6 100644 --- 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.24.3", + "version": "1.24.4-rc", "publisher": "vsciot-vscode", "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe", "icon": "logo.png", diff --git a/src/common/version.ts b/src/common/version.ts index 9559793..256205f 100644 --- a/src/common/version.ts +++ b/src/common/version.ts @@ -22,7 +22,7 @@ export class Versions { const edgeHubSchemaVerMap: Map = new Map([ ["1.0", "1.0"], ["1.1", "1.1"], - ["1.2", "1.2"], + ["1.2", "1.1"], ]); const verMap: Map = new Map(); diff --git a/testResources/deployment.template.json b/testResources/deployment.template.json index d482b0d..2de5772 100644 --- a/testResources/deployment.template.json +++ b/testResources/deployment.template.json @@ -147,7 +147,7 @@ }, "$edgeHub": { "properties.desired": { - "schemaVersion": "1.2", + "schemaVersion": "1.1", "routes": { "sensorToFilter": "FROM /messages/modules/SimulatedTemperatureSensor/outputs/temperatureOutput INTO BrokeredEndpoint(\"/modules/%MODULE%/inputs/input1\")", "filterToIoTHub": "FROM /messages/modules/samplemodule/outputs/output1 INTO $upstream" From bd8988bada5ded915bea395564b5b70840cd8469 Mon Sep 17 00:00:00 2001 From: Haitham Shami Date: Thu, 30 Sep 2021 16:32:07 -0700 Subject: [PATCH 2/3] update with PR comments --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d5fa1e..a668bc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log ## 1.24.4 - 2021-10-01 ### Changed -* Maximum version number for edgeHub/properties.desired.schemaVersion is artificially forced to be 1.1 +* Maximum version number for edgeHub/properties.desired.schemaVersion is capped to 1.1 ## 1.24.3 - 2021-7-27 ### Changed From 32f68f70ec617c6971406080bf503614286c2ab7 Mon Sep 17 00:00:00 2001 From: Haitham Shami Date: Fri, 1 Oct 2021 11:20:46 -0700 Subject: [PATCH 3/3] release v1.24.4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f1c0050..d60e594 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "azure-iot-edge", - "version": "1.24.4-rc", + "version": "1.24.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index faaecc6..e35809e 100644 --- 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.24.4-rc", + "version": "1.24.4", "publisher": "vsciot-vscode", "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe", "icon": "logo.png",