@balena/open-balena-api 29.0.1-build-renovate-major-5-chai-a17f8c3ca7aed5459c7c120e1bf9c7dcb264d998-1 → 29.0.1-build-fix-fleet-state-get-v3-8da89ef575b67ee0fa9d1a82dcd99e79db53e7f5-1
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ExpandableStringKeyOf } from 'pinejs-client-core';
|
|
2
2
|
import type { dbModule, permissions } from '@balena/pinejs';
|
|
3
|
-
import type { Device, Service } from '../../balena-model.js';
|
|
3
|
+
import type { Device, Image, Service } from '../../balena-model.js';
|
|
4
|
+
import type { PickDeferred } from '@balena/abstract-sql-to-typescript';
|
|
4
5
|
export declare const getStateEventAdditionalFields: Array<Exclude<keyof Device['Read'], ExpandableStringKeyOf<Device['Read']>>>;
|
|
5
6
|
declare const defaultConfigVariableFns: Array<(config: Dictionary<string>) => void>;
|
|
6
7
|
export declare const addDefaultConfigVariableFn: (fn: (typeof defaultConfigVariableFns)[number]) => void;
|
|
@@ -22,12 +23,18 @@ export declare function serviceInstallFromImage(device: {
|
|
|
22
23
|
}>;
|
|
23
24
|
}, image: {
|
|
24
25
|
is_a_build_of__service: Array<Pick<Service['Read'], 'id'>>;
|
|
25
|
-
} | undefined):
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
26
|
+
} | PickDeferred<Image['Read'], 'is_a_build_of__service'> | undefined): (typeof device)['service_install'][number] | undefined;
|
|
27
|
+
export declare function serviceInstallFromImage(fleet: {
|
|
28
|
+
service: Array<Pick<Service['Read'], 'id' | 'service_name'> & {
|
|
29
|
+
service_environment_variable: EnvVarList;
|
|
30
|
+
service_label: Array<{
|
|
31
|
+
label_name: string;
|
|
32
|
+
value: string;
|
|
33
|
+
}>;
|
|
34
|
+
}>;
|
|
35
|
+
}, image: {
|
|
36
|
+
is_a_build_of__service: Array<Pick<Service['Read'], 'id'>>;
|
|
37
|
+
} | undefined): (typeof fleet)['service'][number] | undefined;
|
|
31
38
|
export declare const formatImageLocation: (imageLocation: string) => string;
|
|
32
39
|
export declare const filterDeviceConfig: (configVars: Dictionary<string>) => void;
|
|
33
40
|
export declare const setReadTransaction: (newReadTransaction: dbModule.Database["readTransaction"]) => void;
|
|
@@ -34,14 +34,21 @@ export const getConfig = (device, application = device?.belongs_to__application[
|
|
|
34
34
|
setDefaultConfigVariables(config);
|
|
35
35
|
return config;
|
|
36
36
|
};
|
|
37
|
-
export function serviceInstallFromImage(
|
|
37
|
+
export function serviceInstallFromImage(deviceOrFleet, image) {
|
|
38
38
|
if (image == null) {
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
|
-
const id = image.is_a_build_of__service
|
|
42
|
-
|
|
41
|
+
const id = '__id' in image.is_a_build_of__service
|
|
42
|
+
? image.is_a_build_of__service.__id
|
|
43
|
+
: image.is_a_build_of__service[0].id;
|
|
44
|
+
if ('service_install' in deviceOrFleet) {
|
|
45
|
+
const device = deviceOrFleet;
|
|
43
46
|
return device.service_install.find(({ service }) => service.__id === id);
|
|
44
47
|
}
|
|
48
|
+
if ('service' in deviceOrFleet) {
|
|
49
|
+
const fleet = deviceOrFleet;
|
|
50
|
+
return fleet.service.find((service) => service.id === id);
|
|
51
|
+
}
|
|
45
52
|
}
|
|
46
53
|
export const formatImageLocation = (imageLocation) => imageLocation.toLowerCase();
|
|
47
54
|
// Some config vars cause issues with certain versions of resinOS.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-get-utils.js","sourceRoot":"","sources":["../../../src/features/device-state/state-get-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EACN,gCAAgC,EAChC,oCAAoC,GACpC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,qBAAqB,EACrB,uBAAuB,GACvB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"state-get-utils.js","sourceRoot":"","sources":["../../../src/features/device-state/state-get-utils.ts"],"names":[],"mappings":"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"}
|
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": "29.0.1-build-
|
|
4
|
+
"version": "29.0.1-build-fix-fleet-state-get-v3-8da89ef575b67ee0fa9d1a82dcd99e79db53e7f5-1",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -136,7 +136,7 @@
|
|
|
136
136
|
},
|
|
137
137
|
"devDependencies": {
|
|
138
138
|
"@balena/lint": "^9.0.1",
|
|
139
|
-
"@types/chai": "^
|
|
139
|
+
"@types/chai": "^4.3.19",
|
|
140
140
|
"@types/mocha": "^10.0.8",
|
|
141
141
|
"@types/mockery": "^1.4.33",
|
|
142
142
|
"@types/sinon": "^17.0.3",
|
|
@@ -168,6 +168,6 @@
|
|
|
168
168
|
"loader": "ts-node/esm/transpile-only"
|
|
169
169
|
},
|
|
170
170
|
"versionist": {
|
|
171
|
-
"publishedAt": "2024-10-
|
|
171
|
+
"publishedAt": "2024-10-02T13:22:35.530Z"
|
|
172
172
|
}
|
|
173
173
|
}
|