-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix genconfig does not fail when schema validation failed (#425)
* Fix bug that validation not fail when only schema error exists * Remove postinstall step which installs az cli
- Loading branch information
1 parent
a70852c
commit abebb95
Showing
8 changed files
with
197 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,5 +4,5 @@ | |
|
|
||
| __author__ = 'Microsoft Corporation' | ||
| __email__ = '[email protected]' | ||
| __version__ = '2.1.2' | ||
| __version__ = '2.1.3' | ||
| __AIkey__ = '95b20d64-f54f-4de3-8ad5-165a75a6c6fe' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| [bumpversion] | ||
| current_version = 2.1.2 | ||
| current_version = 2.1.3 | ||
| commit = True | ||
| tag = True | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
tests/assets/deployment.manifest_invalid_createoptions.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| { | ||
| "modulesContent": { | ||
| "$edgeAgent": { | ||
| "properties.desired": { | ||
| "schemaVersion": "1.0", | ||
| "runtime": { | ||
| "type": "docker", | ||
| "settings": { | ||
| "minDockerVersion": "v1.25", | ||
| "loggingOptions": "", | ||
| "registryCredentials": { | ||
| "test": { | ||
| "username": "$USERNAME", | ||
| "password": "$PASSWORD", | ||
| "address": "docker.io" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "systemModules": { | ||
| "edgeAgent": { | ||
| "type": "docker", | ||
| "settings": { | ||
| "image": "mcr.microsoft.com/azureiotedge-agent:1.0" | ||
| } | ||
| }, | ||
| "edgeHub": { | ||
| "type": "docker", | ||
| "status": "running", | ||
| "restartPolicy": "always", | ||
| "settings": { | ||
| "image": "mcr.microsoft.com/azureiotedge-hub:1.0", | ||
| "createOptions": "{\"HostConfig\":{\"PortBindings\":{\"5671/tcp\":[{\"HostPort\":\"5671\"}],\"8883/tcp\":[{\"HostPort\":\"8883\"}],\"443/tcp\":[{\"HostPort\":\"443\"}]}}}" | ||
| } | ||
| } | ||
| }, | ||
| "modules": { | ||
| "tempSensor": { | ||
| "version": "1.0", | ||
| "type": "docker", | ||
| "status": "running", | ||
| "restartPolicy": "always", | ||
| "settings": { | ||
| "image": "mcr.microsoft.com/azureiotedge-simulated-temperature-sensor:1.0", | ||
| "createOptions": "{\"Env\":[\"abcdefghij0=00\",\"abcdefghij1=01\",\"abcdefghij2=02\",\"abcdefghij3=03\",\"abcdefghij4=04\",\"abcdefghij5=05\",\"abcdefghij6=06\",\"abcdefghij7=07\",\"abcdefghij8=08\",\"abcdefghij9=09\",\"abcdefghij10=10\",\"abcdefghij11=11\",\"abcdefghij12=12\",\"abcdefghij13=13\",\"abcdefghij14=14\",\"abcdefghij15=15\",\"abcdefghij16=16\",\"abcdefghij17=17\",\"abcdefghij18=18\",\"abcdefghij19=19\",\"abcdefghij20=20\",\"abcdefghij22=21\",\"abcdefghij22=22\",\"abcdefghij23=23\",\"abcdefghij24=24\",\"abcdefghij25=25\",\"abcdefghij26=26\",\"abcdefghij27=27\",\"abcdefghi", | ||
| "createOptions01": "j28=28\",\"abcdefghij29=29\",\"abcdefghij30=30\",\"abcdefghij31=31\",\"abcdefghij32=32\",\"abcdefghij33=33\",\"abcdefghij34=34\",\"abcdefghij35=35\",\"abcdefghij36=36\",\"abcdefghij37=37\",\"abcdefghij38=38\",\"abcdefghij39=39\",\"abcdefghij40=40\",\"abcdefghij41=41\",\"abcdefghij42=42\",\"abcdefghij43=43\",\"abcdefghij44=44\",\"abcdefghij45=45\",\"abcdefghij46=46\",\"abcdefghij47=47\",\"abcdefghij48=48\",\"abcdefghij49=49\",\"abcdefghij50=50\",\"abcdefghij51=51\",\"abcdefghij52=52\",\"abcdefghij53=53\",\"abcdefghij54=54\",\"abcdefghij55=55\",\"abcdefghij56abcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh=56\",", | ||
| "createOptions02": "\"abcdefghij56abcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefghabcdefgh=57\",\"abcdefghij58=58\",\"abcdefghij59=59\"]}" | ||
| } | ||
| }, | ||
| "csharpmodule": { | ||
| "version": "1.0", | ||
| "type": "docker", | ||
| "status": "running", | ||
| "restartPolicy": "always", | ||
| "settings": { | ||
| "image": "${MODULES.csharpmodule.amd64}", | ||
| "createOptions": "{\"Env\":[\"abcdefghij0=00\",\"abcdefghij1=01\",\"abcdefghij2=02\",\"abcdefghij3=03\",\"abcdefghij4=04\",\"abcdefghij5=05\",\"abcdefghij6=06\",\"abcdefghij7=07\",\"abcdefghij8=08\",\"abcdefghij9=09\",\"abcdefghij10=10\",\"abcdefghij11=11\",\"abcdefghij12=12\",\"abcdefghij13=13\",\"abcdefghij14=14\",\"abcdefghij15=15\",\"abcdefghij16=16\",\"abcdefghij17=17\",\"abcdefghij18=18\",\"abcdefghij19=19\",\"abcdefghij20=20\",\"abcdefghij22=21\",\"abcdefghij22=22\",\"abcdefghij23=23\",\"abcdefghij24=24\",\"abcdefghij25=25\",\"abcdefghij26=26\",\"abcdefghij27=27\",\"abcdefghi", | ||
| "createOptions01": "j28=28\",\"abcdefghij29=29\",\"abcdefghij30=30\",\"abcdefghij31=31\",\"abcdefghij32=32\",\"abcdefghij33=33\",\"abcdefghij34=34\",\"abcdefghij35=35\",\"abcdefghij36=36\",\"abcdefghij37=37\",\"abcdefghij38=38\",\"abcdefghij39=39\",\"abcdefghij40=40\",\"abcdefghij41=41\",\"abcdefghij42=42\",\"abcdefghij43=43\",\"abcdefghij44=44\",\"abcdefghij45=45\",\"abcdefghij46=46\",\"abcdefghij47=47\",\"abcdefghij48=48\",\"abcdefghij49=49\",\"abcdefghij50=50\",\"abcdefghij51=51\",\"abcdefghij52=52\",\"abcdefghij53=53\",\"abcdefghij54=54\",\"abcdefghij55=55\",\"abcdefghij56=56\",", | ||
| "createOptions03": "\"abcdefghij57=57\",\"abcdefghij58=58\",\"abcdefghij59=59\"]}" | ||
| } | ||
| }, | ||
| "csharpfunction": { | ||
| "version": "1.0", | ||
| "type": "docker", | ||
| "status": "running", | ||
| "restartPolicy": "always", | ||
| "settings": { | ||
| "image": "${MODULES.csharpfunction.amd64.debug}", | ||
| "createOptions": "[1,2,3]" | ||
| } | ||
| }, | ||
| "csharpfunction2": { | ||
| "version": "1.0", | ||
| "type": "docker", | ||
| "status": "running", | ||
| "restartPolicy": "always", | ||
| "settings": { | ||
| "image": "${MODULES.csharpfunction2.amd64.debug}", | ||
| "createOptions": "{\"Env\":[\"abcdefghij0=00\",\"abcdefghij1=01\",\"abcdefghij2=02\",\"abcdefghij3=03\",\"abcdefghij4=04\",\"abcdefghij5=05\",\"abcdefghij6=06\",\"abcdefghij7=07\",\"abcdefghij8=08\",\"abcdefghij9=09\",\"abcdefghij10=10\",\"abcdefghij11=11\",\"abcdefghij12=12\",\"abcdefghij13=13\",\"abcdefghij14=14\",\"abcdefghij15=15\",\"abcdefghij16=16\",\"abcdefghij17=17\",\"abcdefghij18=18\",\"abcdefghij19=19\",\"abcdefghij20=20\",\"abcdefghij22=21\",\"abcdefghij22=22\",\"abcdefghij23=23\",\"abcdefghij24=24\",\"abcdefghij25=25\",\"abcdefghij26=26\",\"abcdefghij27=27\",\"abcdefghi", | ||
| "createOptions01": "j28=28\",\"abcdefghij29=29\",\"abcdefghij30=30\",\"abcdefghij31=31\",\"abcdefghij32=32\",\"abcdefghij33=33\",\"abcdefghij34=34\",\"abcdefghij35=35\",\"abcdefghij36=36\",\"abcdefghij37=37\",\"abcdefghij38=38\",\"abcdefghij39=39\",\"abcdefghij40=40\",\"abcdefghij41=41\",\"abcdefghij42=42\",\"abcdefghij43=43\",\"abcdefghij44=44\",\"abcdefghij45=45\",\"abcdefghij46=46\",\"abcdefghij47=47\",\"abcdefghij48=48\",\"abcdefghij49=49\",\"abcdefghij50=50\",\"abcdefghij51=51\",\"abcdefghij52=52\",\"abcdefghij53=53\",\"abcdefghij54=54\",\"abcdefghij55=55\",\"abcdefghij56=56\",", | ||
| "createOptions03": "\"abcdefghij57=57\",\"abcdefghij58=58\",\"abcdefghij59=59\"]}", | ||
| "createOptions04": {"test": "value"} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "$edgeHub": { | ||
| "properties.desired": { | ||
| "schemaVersion": "1.0", | ||
| "routes": { | ||
| "sensorTocsharpmodule": "FROM /messages/modules/tempSensor/outputs/temperatureOutput INTO BrokeredEndpoint(\"/modules/csharpmodule/inputs/input1\")", | ||
| "csharpmoduleToIoTHub": "FROM /messages/modules/csharpmodule/outputs/* INTO $upstream", | ||
| "csharpfunctionToIoTHub": "FROM /messages/modules/csharpfunction/outputs/* INTO $upstream" | ||
| }, | ||
| "storeAndForwardConfiguration": { | ||
| "timeToLiveSecs": 7200 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| { | ||
| "modulesContent": { | ||
| "$edgeAgent": { | ||
| "properties.desired": { | ||
| "schemaVersion": "1.0", | ||
| "runtime": { | ||
| "type": "docker", | ||
| "settings": { | ||
| "minDockerVersion": "v1.25", | ||
| "loggingOptions": "", | ||
| "registryCredentials": { | ||
| "test": { | ||
| "username": 1, | ||
| "password": "pwd" | ||
| }, | ||
| "test2": { | ||
| "username": "$USERNAME", | ||
| "password": "$PASSWORD", | ||
| "address": "" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "systemModules": { | ||
| "edgeAgent": { | ||
| "type": "docker", | ||
| "settings": { | ||
| "image": "mcr.microsoft.com/azureiotedge-agent:1.0" | ||
| } | ||
| }, | ||
| "edgeHub": { | ||
| "type": "docker", | ||
| "status": "running", | ||
| "restartPolicy": "always", | ||
| "settings": { | ||
| "image": "mcr.microsoft.com/azureiotedge-hub:1.0", | ||
| "createOptions": "{\"HostConfig\":{\"PortBindings\":{\"5671/tcp\":[{\"HostPort\":\"5671\"}],\"8883/tcp\":[{\"HostPort\":\"8883\"}],\"443/tcp\":[{\"HostPort\":\"443\"}]}}}" | ||
| } | ||
| } | ||
| }, | ||
| "modules": { | ||
| "tempSensor": { | ||
| "version": "1.0", | ||
| "type": "docker", | ||
| "status": "running", | ||
| "restartPolicy": "always", | ||
| "settings": { | ||
| "image": "mcr.microsoft.com/azureiotedge-simulated-temperature-sensor:1.0", | ||
| "createOptions": "{}" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "$edgeHub": { | ||
| "properties.desired": { | ||
| "schemaVersion": "1.0", | ||
| "routes": { | ||
| "sensorTocsharpmodule": "FROM /messages/modules/tempSensor/outputs/temperatureOutput INTO BrokeredEndpoint(\"/modules/csharpmodule/inputs/input1\")", | ||
| "csharpmoduleToIoTHub": "FROM /messages/modules/csharpmodule/outputs/* INTO $upstream", | ||
| "csharpfunctionToIoTHub": "FROM /messages/modules/csharpfunction/outputs/* INTO $upstream" | ||
| }, | ||
| "storeAndForwardConfiguration": { | ||
| "timeToLiveSecs": 7200 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters