@balena/open-balena-api 31.2.6 → 31.2.7-build-service-install-filter-gc-df260b150b12df0176acf3ee6f888cfe3479571a-1
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -67,54 +67,57 @@ const createServiceInstalls = async ({ devices, }) => {
|
|
|
67
67
|
return [device.id, [...new Set(deviceServiceIds)]];
|
|
68
68
|
}));
|
|
69
69
|
const serviceIds = [...new Set([...targetServicesByDevice.values()].flat())];
|
|
70
|
-
|
|
71
|
-
$not: {
|
|
72
|
-
service_install: {
|
|
73
|
-
$any: {
|
|
74
|
-
$alias: 'si',
|
|
75
|
-
$expr: {
|
|
76
|
-
si: {
|
|
77
|
-
installs__service: serviceId,
|
|
78
|
-
},
|
|
79
|
-
},
|
|
80
|
-
},
|
|
81
|
-
},
|
|
82
|
-
},
|
|
83
|
-
}));
|
|
84
|
-
if (missingServiceFilters.length === 0) {
|
|
70
|
+
if (serviceIds.length === 0) {
|
|
85
71
|
console.info('[service-install-task] No service installs to create');
|
|
86
72
|
return 0;
|
|
87
73
|
}
|
|
88
|
-
const devicesToAddServiceInstalls =
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
$select: 'id',
|
|
93
|
-
$expand: {
|
|
74
|
+
const devicesToAddServiceInstalls = await (async () => {
|
|
75
|
+
// Creating the filters inside an iife so that they get GCed right after the query.
|
|
76
|
+
const missingServiceFilters = serviceIds.map((serviceId) => ({
|
|
77
|
+
$not: {
|
|
94
78
|
service_install: {
|
|
95
|
-
$
|
|
96
|
-
|
|
97
|
-
|
|
79
|
+
$any: {
|
|
80
|
+
$alias: 'si',
|
|
81
|
+
$expr: {
|
|
82
|
+
si: {
|
|
83
|
+
installs__service: serviceId,
|
|
84
|
+
},
|
|
85
|
+
},
|
|
98
86
|
},
|
|
99
87
|
},
|
|
100
88
|
},
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
89
|
+
}));
|
|
90
|
+
return (await api.resin.get({
|
|
91
|
+
resource: 'device',
|
|
92
|
+
passthrough: { req: permissions.rootRead },
|
|
93
|
+
options: {
|
|
94
|
+
$select: 'id',
|
|
95
|
+
$expand: {
|
|
96
|
+
service_install: {
|
|
97
|
+
$select: 'installs__service',
|
|
98
|
+
$filter: {
|
|
99
|
+
installs__service: { $in: serviceIds },
|
|
100
|
+
},
|
|
101
|
+
},
|
|
102
|
+
},
|
|
103
|
+
$filter: {
|
|
104
|
+
id: { $in: devices },
|
|
105
|
+
...(missingServiceFilters.length === 1
|
|
106
|
+
? missingServiceFilters[0]
|
|
107
|
+
: {
|
|
108
|
+
$or: missingServiceFilters,
|
|
109
|
+
}),
|
|
110
|
+
},
|
|
108
111
|
},
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
};
|
|
117
|
-
});
|
|
112
|
+
})).map((device) => {
|
|
113
|
+
// Transform the device to the simpler object we will need later which is smaller
|
|
114
|
+
// and will allow the larger version to be garbage collected sooner
|
|
115
|
+
return {
|
|
116
|
+
id: device.id,
|
|
117
|
+
serviceInstalls: device.service_install.map((si) => si.installs__service.__id),
|
|
118
|
+
};
|
|
119
|
+
});
|
|
120
|
+
})();
|
|
118
121
|
// This is already batched at one level, does it make sense to batch it again?
|
|
119
122
|
const remainingDevices = new Set(devices);
|
|
120
123
|
let totalSiCreated = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-installs.js","sourceRoot":"","sources":["../../../../src/features/ci-cd/tasks/service-installs.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"service-installs.js","sourceRoot":"","sources":["../../../../src/features/ci-cd/tasks/service-installs.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": "31.2.
|
|
4
|
+
"version": "31.2.7-build-service-install-filter-gc-df260b150b12df0176acf3ee6f888cfe3479571a-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-11-
|
|
169
|
+
"publishedAt": "2024-11-19T15:32:40.261Z"
|
|
170
170
|
}
|
|
171
171
|
}
|