diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 1c16ef87..1ace8431 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -24,7 +24,7 @@ "balena-image-fs": "^7.0.6", "balena-image-manager": "^9.0.0", "balena-preload": "^14.0.0", - "balena-sdk": "^17.8.0", + "balena-sdk": "^17.12.1", "balena-semver": "^2.3.0", "balena-settings-client": "^5.0.2", "balena-settings-storage": "^7.0.0", @@ -3082,9 +3082,9 @@ } }, "node_modules/@types/node": { - "version": "16.18.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.41.tgz", - "integrity": "sha512-YZJjn+Aaw0xihnpdImxI22jqGbp0DCgTFKRycygjGx/Y27NnWFJa5FJ7P+MRT3u07dogEeMVh70pWpbIQollTA==" + "version": "16.18.40", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.40.tgz", + "integrity": "sha512-+yno3ItTEwGxXiS/75Q/aHaa5srkpnJaH+kdkTVJ3DtJEwv92itpKbxU+FjPoh2m/5G9zmUQfrL4A4C13c+iGA==" }, "node_modules/@types/node-cleanup": { "version": "2.1.2", @@ -3938,19 +3938,37 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "node_modules/balena-auth": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/balena-auth/-/balena-auth-4.2.1.tgz", - "integrity": "sha512-crYf0gHp+hgP19HbjDmo3YoZqUBKB/5ziFjnvDxnnetW8yr0tpy38hlwQD1HkjPjjBqj5vRvnAQJgYnPv2oYCg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/balena-auth/-/balena-auth-5.1.0.tgz", + "integrity": "sha512-HW06LB955e3BOxlJqrySUJWBNJk2NW0bywpH4TsuIp/FllpnLdNNARblxX8zFrLFYxzcD+jB0m6vk9f9c7p1Bw==", "dependencies": { "@types/jwt-decode": "^2.2.1", "balena-errors": "^4.7.1", - "balena-settings-storage": "^7.0.0", + "balena-settings-storage": "^8.1.0", "jwt-decode": "^2.2.0", "tslib": "^2.0.0" }, "engines": { - "node": ">=10.17.0", - "npm": ">=5.0.0" + "node": ">=14.0.0", + "npm": ">=6.0.0" + } + }, + "node_modules/balena-auth/node_modules/@types/node": { + "version": "10.17.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", + "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" + }, + "node_modules/balena-auth/node_modules/balena-settings-storage": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/balena-settings-storage/-/balena-settings-storage-8.1.0.tgz", + "integrity": "sha512-zqOhJ8pU0ZB84V0ddJE0lKjV8QzT2nF3mRAi3AmpQ0v/DlMUjfxWipdl5CXGQNkD04Ji9pa8E5zXgB+dha+4JA==", + "dependencies": { + "@types/node": "^10.17.26", + "balena-errors": "^4.7.3", + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=14.0" } }, "node_modules/balena-config-json": { @@ -3979,9 +3997,9 @@ } }, "node_modules/balena-errors": { - "version": "4.7.3", - "resolved": "https://registry.npmjs.org/balena-errors/-/balena-errors-4.7.3.tgz", - "integrity": "sha512-9PvKEtPUsoDm6qVGtb6ikdVc3yd3t82TJBIC4foQSnyHCCCAj18BBVIYfq+zkPw4kdhPOULgPyBpxQb4J2fIuQ==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/balena-errors/-/balena-errors-4.8.0.tgz", + "integrity": "sha512-QD+LxWDrrGENURTnyy9RRK6d9PkkjfsKhHrZjed+ddfiHvpP0q0X8wcskh9vruC8FJDse+pjwI7g/1NYKm0s4Q==", "dependencies": { "tslib": "^2.0.0", "typed-error": "^3.0.0" @@ -4142,9 +4160,9 @@ } }, "node_modules/balena-register-device": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/balena-register-device/-/balena-register-device-8.0.4.tgz", - "integrity": "sha512-4ziyefKEkdrzerwrrdEGq3hvY8wbzm+0iH3F+ZJAIVgxpYELfudNXQj8GJXHWzclUNbdBun7G5yiYpmdLs5G+g==", + "version": "8.0.7", + "resolved": "https://registry.npmjs.org/balena-register-device/-/balena-register-device-8.0.7.tgz", + "integrity": "sha512-5nYzyCeSBr702WiZnQGu589HPhwsQgfwn+F+kw7RFy2tZmzyiNnezSIrwmKNWy6qxgT4ooVRqt8Z70hDRxJ3HQ==", "dependencies": { "@types/uuid": "^8.3.0", "tslib": "^2.2.0", @@ -4152,11 +4170,11 @@ "uuid": "^9.0.0" }, "engines": { - "node": ">=12.0.0", + "node": ">=14.0.0", "npm": ">=6.0.0" }, "peerDependencies": { - "balena-request": "^11.0.0" + "balena-request": "^12.0.1" } }, "node_modules/balena-register-device/node_modules/uuid": { @@ -4168,9 +4186,9 @@ } }, "node_modules/balena-request": { - "version": "11.5.10", - "resolved": "https://registry.npmjs.org/balena-request/-/balena-request-11.5.10.tgz", - "integrity": "sha512-/LExPk60rb1Q89onMgJxUsHrGHtJ/JZHGzz2fOgtZompplwxqnXtleteuNQwoh+5t+tRGlwSgYGxnWFg/B1mRw==", + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/balena-request/-/balena-request-12.0.3.tgz", + "integrity": "sha512-G2kqBgPVT/b84t0odCnIqWU5/gToGoSZL1Bf5iGSd20Bw4j1h+Xwyd6/FJ/p2WUdfrQXgThPg0TKHxg097hsoA==", "dependencies": { "@balena/node-web-streams": "^0.2.3", "balena-errors": "^4.7.3", @@ -4178,29 +4196,30 @@ "fetch-readablestream": "^0.2.0", "progress-stream": "^2.0.0", "qs": "^6.9.4", - "tslib": "^2.0.0" + "tslib": "^2.0.0", + "url": "^0.11.1" }, "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0" }, "peerDependencies": { - "balena-auth": "^4.0.0" + "balena-auth": "^5.1.0" } }, "node_modules/balena-sdk": { - "version": "17.8.0", - "resolved": "https://registry.npmjs.org/balena-sdk/-/balena-sdk-17.8.0.tgz", - "integrity": "sha512-njbSVvmG3u5SNrnF0FojJXx6ELCCk98pzcjT5E5wd5Ig3dyKEKbmocgcW4YzarIvb8q1/f0FAYvwKNw4RM354A==", + "version": "17.12.1", + "resolved": "https://registry.npmjs.org/balena-sdk/-/balena-sdk-17.12.1.tgz", + "integrity": "sha512-cpfAa+OPltp1+609cBKuTiDWI6tTxXpllitLfqCmAqqu6fVni8m2LLoNvg+2FxfxhRi1OXKoTX6HNTCctSeSNQ==", "dependencies": { "@balena/es-version": "^1.0.0", "@types/json-schema": "^7.0.9", "@types/node": "^14.0.0", "abortcontroller-polyfill": "^1.7.1", - "balena-auth": "^4.2.0", - "balena-errors": "^4.7.3", + "balena-auth": "^5.1.0", + "balena-errors": "^4.8.0", "balena-hup-action-utils": "~5.0.0", - "balena-register-device": "^8.0.0", - "balena-request": "^11.5.5", + "balena-register-device": "^8.0.7", + "balena-request": "^12.0.2", "balena-semver": "^2.3.0", "balena-settings-client": "^5.0.0", "date-fns": "^2.29.3", @@ -4280,12 +4299,12 @@ } }, "node_modules/balena-settings-storage": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/balena-settings-storage/-/balena-settings-storage-7.0.0.tgz", - "integrity": "sha512-gufzVJznyt9e1CvpBuLe2caU5KcEwl1YHCbK5OMz09zXDA2OMAICPXsLlViK+KiuZwZrBx3tyU2FZjAzRZFgwQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/balena-settings-storage/-/balena-settings-storage-7.0.2.tgz", + "integrity": "sha512-ONfDQIO5hkhocBAvNi5HrFb9Ykz32JEzA5JVMr4vTOjwVFUszu2DEEuxKwy2VSQsNtcCFspwnkzWWfMTlrUCXg==", "dependencies": { "@types/node": "^10.17.26", - "balena-errors": "^4.7.1", + "balena-errors": "^4.7.3", "tslib": "^2.0.0" }, "engines": { @@ -7854,9 +7873,9 @@ } }, "node_modules/etcher-sdk/node_modules/node-abi": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", - "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==", + "version": "3.46.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.46.0.tgz", + "integrity": "sha512-LXvP3AqTIrtvH/jllXjkNVbYifpRbt9ThTtymSMSuHmhugQLAWr99QQFTm+ZRht9ziUvdGOgB+esme1C6iE6Lg==", "dependencies": { "semver": "^7.3.5" }, @@ -13940,7 +13959,6 @@ "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -15281,9 +15299,9 @@ } }, "node_modules/pkg/node_modules/node-abi": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", - "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==", + "version": "3.46.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.46.0.tgz", + "integrity": "sha512-LXvP3AqTIrtvH/jllXjkNVbYifpRbt9ThTtymSMSuHmhugQLAWr99QQFTm+ZRht9ziUvdGOgB+esme1C6iE6Lg==", "dev": true, "dependencies": { "semver": "^7.3.5" @@ -15871,9 +15889,9 @@ } }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "engines": { "node": ">=6" } @@ -17531,7 +17549,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -19923,6 +19940,15 @@ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", "deprecated": "Please see https://github.com/lydell/urix#deprecated" }, + "node_modules/url": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz", + "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==", + "dependencies": { + "punycode": "^1.4.1", + "qs": "^6.11.0" + } + }, "node_modules/url-parse-lax": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", @@ -19942,6 +19968,25 @@ "node": ">= 4" } }, + "node_modules/url/node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" + }, + "node_modules/url/node_modules/qs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/usb": { "version": "2.9.0", "resolved": "https://registry.npmjs.org/usb/-/usb-2.9.0.tgz", @@ -20420,9 +20465,9 @@ } }, "node_modules/winusb-driver-generator/node_modules/node-abi": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", - "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==", + "version": "3.46.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.46.0.tgz", + "integrity": "sha512-LXvP3AqTIrtvH/jllXjkNVbYifpRbt9ThTtymSMSuHmhugQLAWr99QQFTm+ZRht9ziUvdGOgB+esme1C6iE6Lg==", "optional": true, "dependencies": { "semver": "^7.3.5" @@ -24760,9 +24805,9 @@ } }, "@types/node": { - "version": "16.18.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.41.tgz", - "integrity": "sha512-YZJjn+Aaw0xihnpdImxI22jqGbp0DCgTFKRycygjGx/Y27NnWFJa5FJ7P+MRT3u07dogEeMVh70pWpbIQollTA==" + "version": "16.18.40", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.40.tgz", + "integrity": "sha512-+yno3ItTEwGxXiS/75Q/aHaa5srkpnJaH+kdkTVJ3DtJEwv92itpKbxU+FjPoh2m/5G9zmUQfrL4A4C13c+iGA==" }, "@types/node-cleanup": { "version": "2.1.2", @@ -25484,15 +25529,32 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "balena-auth": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/balena-auth/-/balena-auth-4.2.1.tgz", - "integrity": "sha512-crYf0gHp+hgP19HbjDmo3YoZqUBKB/5ziFjnvDxnnetW8yr0tpy38hlwQD1HkjPjjBqj5vRvnAQJgYnPv2oYCg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/balena-auth/-/balena-auth-5.1.0.tgz", + "integrity": "sha512-HW06LB955e3BOxlJqrySUJWBNJk2NW0bywpH4TsuIp/FllpnLdNNARblxX8zFrLFYxzcD+jB0m6vk9f9c7p1Bw==", "requires": { "@types/jwt-decode": "^2.2.1", "balena-errors": "^4.7.1", - "balena-settings-storage": "^7.0.0", + "balena-settings-storage": "^8.1.0", "jwt-decode": "^2.2.0", "tslib": "^2.0.0" + }, + "dependencies": { + "@types/node": { + "version": "10.17.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", + "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" + }, + "balena-settings-storage": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/balena-settings-storage/-/balena-settings-storage-8.1.0.tgz", + "integrity": "sha512-zqOhJ8pU0ZB84V0ddJE0lKjV8QzT2nF3mRAi3AmpQ0v/DlMUjfxWipdl5CXGQNkD04Ji9pa8E5zXgB+dha+4JA==", + "requires": { + "@types/node": "^10.17.26", + "balena-errors": "^4.7.3", + "tslib": "^2.0.0" + } + } } }, "balena-config-json": { @@ -25521,9 +25583,9 @@ } }, "balena-errors": { - "version": "4.7.3", - "resolved": "https://registry.npmjs.org/balena-errors/-/balena-errors-4.7.3.tgz", - "integrity": "sha512-9PvKEtPUsoDm6qVGtb6ikdVc3yd3t82TJBIC4foQSnyHCCCAj18BBVIYfq+zkPw4kdhPOULgPyBpxQb4J2fIuQ==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/balena-errors/-/balena-errors-4.8.0.tgz", + "integrity": "sha512-QD+LxWDrrGENURTnyy9RRK6d9PkkjfsKhHrZjed+ddfiHvpP0q0X8wcskh9vruC8FJDse+pjwI7g/1NYKm0s4Q==", "requires": { "tslib": "^2.0.0", "typed-error": "^3.0.0" @@ -25658,9 +25720,9 @@ } }, "balena-register-device": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/balena-register-device/-/balena-register-device-8.0.4.tgz", - "integrity": "sha512-4ziyefKEkdrzerwrrdEGq3hvY8wbzm+0iH3F+ZJAIVgxpYELfudNXQj8GJXHWzclUNbdBun7G5yiYpmdLs5G+g==", + "version": "8.0.7", + "resolved": "https://registry.npmjs.org/balena-register-device/-/balena-register-device-8.0.7.tgz", + "integrity": "sha512-5nYzyCeSBr702WiZnQGu589HPhwsQgfwn+F+kw7RFy2tZmzyiNnezSIrwmKNWy6qxgT4ooVRqt8Z70hDRxJ3HQ==", "requires": { "@types/uuid": "^8.3.0", "tslib": "^2.2.0", @@ -25676,9 +25738,9 @@ } }, "balena-request": { - "version": "11.5.10", - "resolved": "https://registry.npmjs.org/balena-request/-/balena-request-11.5.10.tgz", - "integrity": "sha512-/LExPk60rb1Q89onMgJxUsHrGHtJ/JZHGzz2fOgtZompplwxqnXtleteuNQwoh+5t+tRGlwSgYGxnWFg/B1mRw==", + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/balena-request/-/balena-request-12.0.3.tgz", + "integrity": "sha512-G2kqBgPVT/b84t0odCnIqWU5/gToGoSZL1Bf5iGSd20Bw4j1h+Xwyd6/FJ/p2WUdfrQXgThPg0TKHxg097hsoA==", "requires": { "@balena/node-web-streams": "^0.2.3", "balena-errors": "^4.7.3", @@ -25686,23 +25748,24 @@ "fetch-readablestream": "^0.2.0", "progress-stream": "^2.0.0", "qs": "^6.9.4", - "tslib": "^2.0.0" + "tslib": "^2.0.0", + "url": "^0.11.1" } }, "balena-sdk": { - "version": "17.8.0", - "resolved": "https://registry.npmjs.org/balena-sdk/-/balena-sdk-17.8.0.tgz", - "integrity": "sha512-njbSVvmG3u5SNrnF0FojJXx6ELCCk98pzcjT5E5wd5Ig3dyKEKbmocgcW4YzarIvb8q1/f0FAYvwKNw4RM354A==", + "version": "17.12.1", + "resolved": "https://registry.npmjs.org/balena-sdk/-/balena-sdk-17.12.1.tgz", + "integrity": "sha512-cpfAa+OPltp1+609cBKuTiDWI6tTxXpllitLfqCmAqqu6fVni8m2LLoNvg+2FxfxhRi1OXKoTX6HNTCctSeSNQ==", "requires": { "@balena/es-version": "^1.0.0", "@types/json-schema": "^7.0.9", "@types/node": "^14.0.0", "abortcontroller-polyfill": "^1.7.1", - "balena-auth": "^4.2.0", - "balena-errors": "^4.7.3", + "balena-auth": "^5.1.0", + "balena-errors": "^4.8.0", "balena-hup-action-utils": "~5.0.0", - "balena-register-device": "^8.0.0", - "balena-request": "^11.5.5", + "balena-register-device": "^8.0.7", + "balena-request": "^12.0.2", "balena-semver": "^2.3.0", "balena-settings-client": "^5.0.0", "date-fns": "^2.29.3", @@ -25773,12 +25836,12 @@ } }, "balena-settings-storage": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/balena-settings-storage/-/balena-settings-storage-7.0.0.tgz", - "integrity": "sha512-gufzVJznyt9e1CvpBuLe2caU5KcEwl1YHCbK5OMz09zXDA2OMAICPXsLlViK+KiuZwZrBx3tyU2FZjAzRZFgwQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/balena-settings-storage/-/balena-settings-storage-7.0.2.tgz", + "integrity": "sha512-ONfDQIO5hkhocBAvNi5HrFb9Ykz32JEzA5JVMr4vTOjwVFUszu2DEEuxKwy2VSQsNtcCFspwnkzWWfMTlrUCXg==", "requires": { "@types/node": "^10.17.26", - "balena-errors": "^4.7.1", + "balena-errors": "^4.7.3", "tslib": "^2.0.0" }, "dependencies": { @@ -28601,9 +28664,9 @@ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" }, "node-abi": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", - "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==", + "version": "3.46.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.46.0.tgz", + "integrity": "sha512-LXvP3AqTIrtvH/jllXjkNVbYifpRbt9ThTtymSMSuHmhugQLAWr99QQFTm+ZRht9ziUvdGOgB+esme1C6iE6Lg==", "requires": { "semver": "^7.3.5" } @@ -33379,8 +33442,7 @@ "object-inspect": { "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==" }, "object-is": { "version": "1.1.5", @@ -34308,9 +34370,9 @@ "dev": true }, "node-abi": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", - "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==", + "version": "3.46.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.46.0.tgz", + "integrity": "sha512-LXvP3AqTIrtvH/jllXjkNVbYifpRbt9ThTtymSMSuHmhugQLAWr99QQFTm+ZRht9ziUvdGOgB+esme1C6iE6Lg==", "dev": true, "requires": { "semver": "^7.3.5" @@ -34833,9 +34895,9 @@ } }, "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==" }, "pupa": { "version": "2.1.1", @@ -36168,7 +36230,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, "requires": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -38055,6 +38116,30 @@ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, + "url": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz", + "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==", + "requires": { + "punycode": "^1.4.1", + "qs": "^6.11.0" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" + }, + "qs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", + "requires": { + "side-channel": "^1.0.4" + } + } + } + }, "url-parse-lax": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", @@ -38441,9 +38526,9 @@ "optional": true }, "node-abi": { - "version": "3.47.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz", - "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==", + "version": "3.46.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.46.0.tgz", + "integrity": "sha512-LXvP3AqTIrtvH/jllXjkNVbYifpRbt9ThTtymSMSuHmhugQLAWr99QQFTm+ZRht9ziUvdGOgB+esme1C6iE6Lg==", "optional": true, "requires": { "semver": "^7.3.5" diff --git a/package.json b/package.json index 98ad2ddb..5edb3fed 100644 --- a/package.json +++ b/package.json @@ -207,7 +207,7 @@ "balena-image-fs": "^7.0.6", "balena-image-manager": "^9.0.0", "balena-preload": "^14.0.0", - "balena-sdk": "^17.8.0", + "balena-sdk": "^17.12.1", "balena-semver": "^2.3.0", "balena-settings-client": "^5.0.2", "balena-settings-storage": "^7.0.0", diff --git a/tests/commands/env/envs.spec.ts b/tests/commands/env/envs.spec.ts index eb9846d7..5c429299 100644 --- a/tests/commands/env/envs.spec.ts +++ b/tests/commands/env/envs.spec.ts @@ -95,7 +95,7 @@ describe('balena envs', function () { it('should successfully list service variables for a test fleet (-s flag)', async () => { const serviceName = 'service2'; - api.expectGetService({ serviceName }); + api.expectGetServiceFromApp({ serviceName }); api.expectGetApplication(); api.expectGetAppEnvVars(); api.expectGetAppServiceVars(); @@ -117,7 +117,7 @@ describe('balena envs', function () { it('should successfully list env and service vars for a test fleet (-s flags)', async () => { const serviceName = 'service1'; - api.expectGetService({ serviceName }); + api.expectGetServiceFromApp({ serviceName }); api.expectGetApplication(); api.expectGetAppEnvVars(); api.expectGetAppServiceVars(); @@ -216,7 +216,7 @@ describe('balena envs', function () { it('should successfully list service variables for a test device (-s flag)', async () => { const serviceName = 'service2'; - api.expectGetService({ serviceName }); + api.expectGetServiceFromApp({ serviceName }); api.expectGetApplication(); api.expectGetDevice({ shortUUID, fullUUID }); api.expectGetDevice({ fullUUID }); @@ -269,7 +269,7 @@ describe('balena envs', function () { it('should successfully list env and service vars for a test device (-s flags)', async () => { const serviceName = 'service1'; - api.expectGetService({ serviceName }); + api.expectGetServiceFromApp({ serviceName }); api.expectGetApplication(); api.expectGetAppEnvVars(); api.expectGetAppServiceVars(); @@ -299,7 +299,7 @@ describe('balena envs', function () { it('should successfully list env and service vars for a test device (-js flags)', async () => { const serviceName = 'service1'; - api.expectGetService({ serviceName }); + api.expectGetServiceFromApp({ serviceName }); api.expectGetApplication(); api.expectGetAppEnvVars(); api.expectGetAppServiceVars(); diff --git a/tests/nock/balena-api-mock.ts b/tests/nock/balena-api-mock.ts index bd1fd06c..9d3b4d43 100644 --- a/tests/nock/balena-api-mock.ts +++ b/tests/nock/balena-api-mock.ts @@ -386,6 +386,21 @@ export class BalenaAPIMock extends NockMock { }); } + public expectGetServiceFromApp(opts: { + optional?: boolean; + persist?: boolean; + serviceId?: number; + serviceName: string; + }) { + const serviceId = opts.serviceId || 243768; + this.optGet(/^\/v6\/application($|\?).*\$expand=service.*/, opts).reply( + 200, + { + d: [{ service: [{ id: serviceId, service_name: opts.serviceName }] }], + }, + ); + } + public expectPostService409(opts: ScopeOpts = {}) { this.optPost(/^\/v\d+\/service$/, opts).reply( 409,