@balena/open-balena-api 32.1.4-build-hostapp-hook-only-patch-operated-by-if-null-7115ace680e813e47de75f9ce9e22e881a29d835-1 → 32.1.4-build-stop-filling-in-service-install-on-dsev-528e7de2ad5bc2b6ee39b39dfdcd2f2aa847a8a4-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/features/hostapp/hooks/target-hostapp.js +3 -11
- package/dist/features/hostapp/hooks/target-hostapp.js.map +1 -1
- package/dist/features/service-install/hooks/index.d.ts +1 -1
- package/dist/features/service-install/hooks/index.js +1 -1
- package/dist/features/service-install/hooks/index.js.map +1 -1
- package/dist/features/service-install/hooks/nullify-si-on-device-service-environment-variable.js +11 -0
- package/dist/features/service-install/hooks/nullify-si-on-device-service-environment-variable.js.map +1 -0
- package/dist/translations/v7/hooks.js +32 -0
- package/dist/translations/v7/hooks.js.map +1 -1
- package/package.json +2 -2
- package/dist/features/service-install/hooks/backfill-device-service-environment-variable.js +0 -26
- package/dist/features/service-install/hooks/backfill-device-service-environment-variable.js.map +0 -1
- /package/dist/features/service-install/hooks/{backfill-device-service-environment-variable.d.ts → nullify-si-on-device-service-environment-variable.d.ts} +0 -0
|
@@ -41,8 +41,7 @@ hooks.addPureHook('PATCH', 'resin', 'device', {
|
|
|
41
41
|
});
|
|
42
42
|
/**
|
|
43
43
|
* When a device checks in with it's initial OS version, set the corresponding should_be_operated_by__release resource
|
|
44
|
-
* using its current reported version
|
|
45
|
-
* This ensures the target hostapp field isn't overwritten by an older OS release when a device reports OS info on provision.
|
|
44
|
+
* using its current reported version.
|
|
46
45
|
*/
|
|
47
46
|
hooks.addPureHook('PATCH', 'resin', 'device', {
|
|
48
47
|
async PRERUN(args) {
|
|
@@ -79,7 +78,7 @@ async function setOSReleaseResource(api, deviceIds, osVersion, osVariant) {
|
|
|
79
78
|
id: { $in: deviceIds },
|
|
80
79
|
os_version: null,
|
|
81
80
|
},
|
|
82
|
-
$select: ['id', '
|
|
81
|
+
$select: ['id', 'is_of__device_type'],
|
|
83
82
|
},
|
|
84
83
|
});
|
|
85
84
|
if (devices.length === 0) {
|
|
@@ -96,18 +95,11 @@ async function setOSReleaseResource(api, deviceIds, osVersion, osVariant) {
|
|
|
96
95
|
},
|
|
97
96
|
});
|
|
98
97
|
return Promise.all(Array.from(devicesByDeviceTypeId.entries()).map(async ([deviceTypeId, affectedDevices]) => {
|
|
98
|
+
const affectedDeviceIds = affectedDevices.map((d) => d.id);
|
|
99
99
|
const osRelease = await getOSReleaseResource(api, osVersion, osVariant, deviceTypeId);
|
|
100
100
|
if (osRelease == null) {
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
|
-
// Only patch should_be_operated_by__release if it's null or older than the reported OS release
|
|
104
|
-
const affectedDeviceIds = affectedDevices
|
|
105
|
-
.filter((d) => d.should_be_operated_by__release == null ||
|
|
106
|
-
d.should_be_operated_by__release.__id < osRelease.id)
|
|
107
|
-
.map((d) => d.id);
|
|
108
|
-
if (affectedDeviceIds.length === 0) {
|
|
109
|
-
return;
|
|
110
|
-
}
|
|
111
103
|
await rootApi.patch({
|
|
112
104
|
resource: 'device',
|
|
113
105
|
options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target-hostapp.js","sourceRoot":"","sources":["../../../../src/features/hostapp/hooks/target-hostapp.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,SAAS,EACT,KAAK,EACL,WAAW,EACX,MAAM,IAAI,YAAY,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAC;AACpF,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC;AAEzC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE;IAC7C;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,IAAI;QAChB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,8BAA8B,IAAI,IAAI,EAAE,CAAC;YAChE,kDAAkD;YAClD,iBAAiB;YACjB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,GAAG,QAAQ,CAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,8BAA8B,EAClD,EAAE,CACF,CAAC;YACF,0CAA0C;YAC1C,0BAA0B;YAC1B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC3D,MAAM,IAAI,eAAe,CAAC,wCAAwC,CAAC,CAAC;YACrE,CAAC;YAED,kDAAkD;YAClD,4BAA4B;YAC5B,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,2BAA2B,CAChC,IAAI,CAAC,GAAG,EACR,GAAG,EACH,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAClC,CAAC;QACH,CAAC;IACF,CAAC;CACD,CAAC,CAAC;AAEH,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE;IAC7C;;;;;;OAMG;IAEH,SAAS,CAAC,EAAE,OAAO,EAAE;QACpB,IACC,OAAO,CAAC,MAAM,CAAC,kBAAkB,IAAI,IAAI;YACzC,OAAO,CAAC,MAAM,CAAC,8BAA8B,KAAK,SAAS,EAC1D,CAAC;YACF,OAAO,CAAC,MAAM,CAAC,8BAA8B,GAAG,IAAI,CAAC;QACtD,CAAC;IACF,CAAC;CACD,CAAC,CAAC;AAEH
|
|
1
|
+
{"version":3,"file":"target-hostapp.js","sourceRoot":"","sources":["../../../../src/features/hostapp/hooks/target-hostapp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import './
|
|
1
|
+
import './nullify-si-on-device-service-environment-variable.js';
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import './
|
|
1
|
+
import './nullify-si-on-device-service-environment-variable.js';
|
|
2
2
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/service-install/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/features/service-install/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,wDAAwD,CAAC"}
|
package/dist/features/service-install/hooks/nullify-si-on-device-service-environment-variable.js
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { hooks } from '@balena/pinejs';
|
|
2
|
+
function backfillDeviceAndService({ request }) {
|
|
3
|
+
delete request.values.service_install;
|
|
4
|
+
}
|
|
5
|
+
hooks.addPureHook('POST', 'resin', 'device_service_environment_variable', {
|
|
6
|
+
POSTPARSE: backfillDeviceAndService,
|
|
7
|
+
});
|
|
8
|
+
hooks.addPureHook('PATCH', 'resin', 'device_service_environment_variable', {
|
|
9
|
+
POSTPARSE: backfillDeviceAndService,
|
|
10
|
+
});
|
|
11
|
+
//# sourceMappingURL=nullify-si-on-device-service-environment-variable.js.map
|
package/dist/features/service-install/hooks/nullify-si-on-device-service-environment-variable.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nullify-si-on-device-service-environment-variable.js","sourceRoot":"","sources":["../../../../src/features/service-install/hooks/nullify-si-on-device-service-environment-variable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAkB,MAAM,gBAAgB,CAAC;AAEvD,SAAS,wBAAwB,CAAC,EAAE,OAAO,EAA+B;IACzE,OAAO,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;AACvC,CAAC;AAED,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,qCAAqC,EAAE;IACzE,SAAS,EAAE,wBAAwB;CACnC,CAAC,CAAC;AAEH,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,qCAAqC,EAAE;IAC1E,SAAS,EAAE,wBAAwB;CACnC,CAAC,CAAC"}
|
|
@@ -1,6 +1,38 @@
|
|
|
1
1
|
import { addDeleteHookForDependents } from '../../infra/cascade-delete/index.js';
|
|
2
|
+
import { hooks, sbvrUtils, errors } from '@balena/pinejs';
|
|
3
|
+
const addReadOnlyHook = (methods, resource, hook) => {
|
|
4
|
+
methods.map((method) => {
|
|
5
|
+
hooks.addHook(method, 'v7', resource, {
|
|
6
|
+
...hook,
|
|
7
|
+
sideEffects: false,
|
|
8
|
+
readOnlyTx: true,
|
|
9
|
+
});
|
|
10
|
+
});
|
|
11
|
+
};
|
|
2
12
|
// Service install resource should only be used for <= v7 translations
|
|
3
13
|
addDeleteHookForDependents('v7', 'service_install', {
|
|
4
14
|
device_service_environment_variable: 'service_install',
|
|
5
15
|
});
|
|
16
|
+
addReadOnlyHook(['POST', 'PATCH', 'PUT'], 'device_service_environment_variable', {
|
|
17
|
+
POSTPARSE: async ({ request, api }) => {
|
|
18
|
+
const { service_install: siId } = request.values;
|
|
19
|
+
if (siId == null) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
const si = await sbvrUtils.api.resin.get({
|
|
23
|
+
resource: 'service_install',
|
|
24
|
+
passthrough: api.passthrough,
|
|
25
|
+
id: siId,
|
|
26
|
+
options: {
|
|
27
|
+
$select: ['device', 'service'],
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
if (si == null) {
|
|
31
|
+
throw new errors.UnauthorizedError();
|
|
32
|
+
}
|
|
33
|
+
request.values.device = si.device.__id;
|
|
34
|
+
request.values.service = si.service.__id;
|
|
35
|
+
delete request.values.service_install;
|
|
36
|
+
},
|
|
37
|
+
});
|
|
6
38
|
//# sourceMappingURL=hooks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../../src/translations/v7/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../../src/translations/v7/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE1D,MAAM,eAAe,GAAG,CACvB,OAAmD,EACnD,QAAgB,EAChB,IAA2B,EAC1B,EAAE;IACH,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACtB,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;YACrC,GAAG,IAAI;YACP,WAAW,EAAE,KAAK;YAClB,UAAU,EAAE,IAAI;SAChB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,sEAAsE;AACtE,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,EAAE;IACnD,mCAAmC,EAAE,iBAAiB;CACtD,CAAC,CAAC;AAEH,eAAe,CACd,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EACxB,qCAAqC,EACrC;IACC,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;QACrC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAEjD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO;QACR,CAAC;QAED,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;YACxC,QAAQ,EAAE,iBAAiB;YAC3B,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,EAAE,EAAE,IAAI;YACR,OAAO,EAAE;gBACR,OAAO,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;aAC9B;SACD,CAAC,CAAC;QAEH,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YAChB,MAAM,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACtC,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;QACvC,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QACzC,OAAO,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;IACvC,CAAC;CACD,CACD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/open-balena-api",
|
|
3
3
|
"description": "Internet of things, Made Simple",
|
|
4
|
-
"version": "32.1.4-build-
|
|
4
|
+
"version": "32.1.4-build-stop-filling-in-service-install-on-dsev-528e7de2ad5bc2b6ee39b39dfdcd2f2aa847a8a4-1",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -166,6 +166,6 @@
|
|
|
166
166
|
"loader": "ts-node/esm/transpile-only"
|
|
167
167
|
},
|
|
168
168
|
"versionist": {
|
|
169
|
-
"publishedAt": "2024-12-
|
|
169
|
+
"publishedAt": "2024-12-10T11:26:11.421Z"
|
|
170
170
|
}
|
|
171
171
|
}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
import { hooks, errors } from '@balena/pinejs';
|
|
2
|
-
async function backfillDeviceAndService({ request, api, }) {
|
|
3
|
-
const { service_install: siId } = request.values;
|
|
4
|
-
if (siId == null) {
|
|
5
|
-
return;
|
|
6
|
-
}
|
|
7
|
-
const si = await api.get({
|
|
8
|
-
resource: 'service_install',
|
|
9
|
-
id: siId,
|
|
10
|
-
options: {
|
|
11
|
-
$select: ['device', 'service'],
|
|
12
|
-
},
|
|
13
|
-
});
|
|
14
|
-
if (si == null) {
|
|
15
|
-
throw new errors.UnauthorizedError();
|
|
16
|
-
}
|
|
17
|
-
request.values.device = si.device.__id;
|
|
18
|
-
request.values.service = si.service.__id;
|
|
19
|
-
}
|
|
20
|
-
hooks.addPureHook('POST', 'resin', 'device_service_environment_variable', {
|
|
21
|
-
POSTPARSE: backfillDeviceAndService,
|
|
22
|
-
});
|
|
23
|
-
hooks.addPureHook('PATCH', 'resin', 'device_service_environment_variable', {
|
|
24
|
-
POSTPARSE: backfillDeviceAndService,
|
|
25
|
-
});
|
|
26
|
-
//# sourceMappingURL=backfill-device-service-environment-variable.js.map
|
package/dist/features/service-install/hooks/backfill-device-service-environment-variable.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"backfill-device-service-environment-variable.js","sourceRoot":"","sources":["../../../../src/features/service-install/hooks/backfill-device-service-environment-variable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAkB,MAAM,gBAAgB,CAAC;AAE/D,KAAK,UAAU,wBAAwB,CAAC,EACvC,OAAO,EACP,GAAG,GAC0B;IAC7B,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAEjD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO;IACR,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC;QACxB,QAAQ,EAAE,iBAAiB;QAC3B,EAAE,EAAE,IAAI;QACR,OAAO,EAAE;YACR,OAAO,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;SAC9B;KACD,CAAC,CAAC;IAEH,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;IACtC,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;IACvC,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;AAC1C,CAAC;AAED,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,qCAAqC,EAAE;IACzE,SAAS,EAAE,wBAAwB;CACnC,CAAC,CAAC;AAEH,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,qCAAqC,EAAE;IAC1E,SAAS,EAAE,wBAAwB;CACnC,CAAC,CAAC"}
|