ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-05-31 23:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2328 from balena-os/update-contrato-0.9.4

Browse Source 
Update @balena/contrato to 0.9.4
This commit is contained in:
flowzone-app[bot] 2024-05-01 01:05:35 +00:00 committed by GitHub
commit e22bd2386a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 34 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
package-lock.json generated
View File

@ -14,7 +14,7 @@
},
"devDependencies": {
"@balena/compose": "^3.2.1",
"@balena/contrato": "^0.6.0",
"@balena/contrato": "^0.9.4",
"@balena/es-version": "^1.0.3",
"@balena/lint": "^8.0.2",
"@types/bluebird": "^3.5.42",
@ -441,33 +441,25 @@
}
},
"node_modules/@balena/contrato": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/@balena/contrato/-/contrato-0.6.3.tgz",
"integrity": "sha512-Cxm591YZ2EwKa6jNfQZrEZDUDRTUVQy5zjMrrsiPSIk2prp68IRz5EQqI+CnDUI46g0WN2ThDr+BBak6GlTXEg==",
"version": "0.9.4",
"resolved": "https://registry.npmjs.org/@balena/contrato/-/contrato-0.9.4.tgz",
"integrity": "sha512-zS3RwyYzIu6Db+8F+7yjDE7AlvpEiFvRefu7aMyzV/xouZqsJFRYJjY4j+YRjcsbvvFALl8aUe5U2XIN67HWTQ==",
"dev": true,
"dependencies": {
"@types/debug": "^4.1.5",
"@types/js-combinatorics": "^0.5.32",
"@types/lodash": "^4.14.168",
"@types/node": "^15.0.1",
"@types/object-hash": "^2.1.0",
"@types/semver": "^7.3.5",
"debug": "^3.2.6",
"handlebars": "^4.7.6",
"handlebars": "^4.7.8",
"handlebars-async-helpers": "^1.0.4",
"js-combinatorics": "^0.5.5",
"lodash": "^4.17.19",
"memfs": "^3.2.2",
"object-hash": "^1.3.1",
"semver": "^5.7.1",
"skhema": "^5.3.2"
},
"engines": {
"node": "^20.0.0",
"npm": "^10.0.0"
}
},
"node_modules/@balena/contrato/node_modules/@types/node": {
"version": "15.14.9",
"resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
"integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==",
"dev": true
},
"node_modules/@balena/contrato/node_modules/debug": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@ -1284,12 +1276,6 @@
"integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
"dev": true
},
"node_modules/@types/debug": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz",
"integrity": "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==",
"dev": true
},
"node_modules/@types/docker-modem": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/@types/docker-modem/-/docker-modem-3.0.6.tgz",
@ -1337,15 +1323,6 @@
"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
"dev": true
},
"node_modules/@types/event-stream": {
"version": "3.3.34",
"resolved": "https://registry.npmjs.org/@types/event-stream/-/event-stream-3.3.34.tgz",
"integrity": "sha512-LLiivgWKii4JeMzFy3trrxqkRrVSdue8WmbXyHuSJLwNrhIQU5MTrc65jhxEPwMyh5HR1xevSdD+k2nnSRKw9g==",
"dev": true,
"dependencies": {
"@types/node": "*"
}
},
"node_modules/@types/express": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
@ -1376,12 +1353,6 @@
"integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
"dev": true
},
"node_modules/@types/js-combinatorics": {
"version": "0.5.32",
"resolved": "https://registry.npmjs.org/@types/js-combinatorics/-/js-combinatorics-0.5.32.tgz",
"integrity": "sha512-rSdlsZTJla6sSMrYoXEDklQLDoXCnpHIwzvkTWhjIdk1S42GHQ/QNHRBAzKno0eZ+dORGoJ9tsgB1xH+4DozAA==",
"dev": true
},
"node_modules/@types/json-mask": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/@types/json-mask/-/json-mask-2.0.3.tgz",
@ -1464,12 +1435,6 @@
"undici-types": "~5.26.4"
}
},
"node_modules/@types/object-hash": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/@types/object-hash/-/object-hash-2.1.0.tgz",
"integrity": "sha512-RW3VRiuQIMo5PJ4Q1IwBtdLHL/t8ACpzUY40norN9ejE6CUBwKetmSxJnITJ0NlzN/ymF1nvPvlpvegtns7yOg==",
"dev": true
},
"node_modules/@types/parse-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
@ -5696,21 +5661,6 @@
"es5-ext": "~0.10.14"
}
},
"node_modules/event-stream": {
"version": "3.3.5",
"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.5.tgz",
"integrity": "sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==",
"dev": true,
"dependencies": {
"duplexer": "^0.1.1",
"from": "^0.1.7",
"map-stream": "0.0.7",
"pause-stream": "^0.0.11",
"split": "^1.0.1",
"stream-combiner": "^0.2.2",
"through": "^2.3.8"
}
},
"node_modules/eventemitter3": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
@ -6880,13 +6830,13 @@
"dev": true
},
"node_modules/handlebars": {
"version": "4.7.7",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
"integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
"version": "4.7.8",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
"integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
"dev": true,
"dependencies": {
"minimist": "^1.2.5",
"neo-async": "^2.6.0",
"neo-async": "^2.6.2",
"source-map": "^0.6.1",
"wordwrap": "^1.0.0"
},
@ -6900,11 +6850,14 @@
"uglify-js": "^3.1.4"
}
},
"node_modules/handlebars/node_modules/wordwrap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
"integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
"dev": true
"node_modules/handlebars-async-helpers": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/handlebars-async-helpers/-/handlebars-async-helpers-1.0.6.tgz",
"integrity": "sha512-rZd4aNoQQlGBx94TF+jA7a+YKaB0IAFINH5QYBEdd7s7paOvG3ouALGKo2cK7u4Qncy+/fntR1bU3LOiq43WTg==",
"dev": true,
"peerDependencies": {
"handlebars": "4.7.8"
}
},
"node_modules/har-schema": {
"version": "2.0.0",
@ -13520,9 +13473,9 @@
}
},
"node_modules/uglify-js": {
"version": "3.13.5",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.5.tgz",
"integrity": "sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==",
"version": "3.17.4",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
"integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
"dev": true,
"optional": true,
"bin": {
@ -14119,6 +14072,12 @@
"node": ">= 6"
}
},
"node_modules/wordwrap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
"integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
"dev": true
},
"node_modules/workerpool": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",

2
package.json
View File

@ -40,7 +40,7 @@
},
"devDependencies": {
"@balena/compose": "^3.2.1",
"@balena/contrato": "^0.6.0",
"@balena/contrato": "^0.9.4",
"@balena/es-version": "^1.0.3",
"@balena/lint": "^8.0.2",
"@types/bluebird": "^3.5.42",

3
src/types/state.ts
View File

@ -3,6 +3,7 @@ import * as t from 'io-ts';
// TODO: move all these exported types to ../compose/types
import type { ComposeNetworkConfig } from '../compose/types/network';
import type { ComposeVolumeConfig } from '../compose/volume';
import type { ContractObject } from '../lib/contracts';
import {
DockerName,
@ -199,7 +200,7 @@ export const TargetService = t.intersection([
}),
t.partial({
running: withDefault(t.boolean, true),
contract: t.record(t.string, t.unknown),
contract: fromType<ContractObject>('ContractObject'),
// This will not be validated
// TODO: convert ServiceComposeConfig to a io-ts type
composition: t.record(t.string, t.unknown),