@balena/open-balena-api 28.0.3-build-remove-service-install-form-state-get-v2-0dd888c1f12bcd7eb1766dbef60fb3cf61de505b-1 → 28.0.4-build-add-tests-for-env-vars-on-state-get-8efbe9c8b50b2dfc9861a9670bf09743b29edde3-1
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _ from 'lodash';
|
|
2
2
|
import { captureException, handleHttpErrors, } from '../../../infra/error-handling/index.js';
|
|
3
|
-
import { formatImageLocation, readTransaction, varListInsert, ConfigurationVarsToLabels, getStateDelayingEmpty, getConfig, getStateEventAdditionalFields, } from '../state-get-utils.js';
|
|
3
|
+
import { formatImageLocation, readTransaction, serviceInstallFromImage, varListInsert, ConfigurationVarsToLabels, getStateDelayingEmpty, getConfig, getStateEventAdditionalFields, } from '../state-get-utils.js';
|
|
4
4
|
import { sbvrUtils } from '@balena/pinejs';
|
|
5
5
|
import { events } from '../index.js';
|
|
6
6
|
import { getIP } from '../../../lib/utils.js';
|
|
@@ -23,11 +23,11 @@ function buildAppFromRelease(device, application, release, config) {
|
|
|
23
23
|
for (const ipr of release.contains__image) {
|
|
24
24
|
// extract the per-image information
|
|
25
25
|
const image = ipr.image[0];
|
|
26
|
-
const si = device
|
|
27
|
-
const svc = image.is_a_build_of__service[0];
|
|
26
|
+
const si = serviceInstallFromImage(device, image);
|
|
28
27
|
if (si == null) {
|
|
29
|
-
throw new Error(`Could not find service install for device: '${application.id}', image: '${image?.id}', service: '${JSON.stringify(
|
|
28
|
+
throw new Error(`Could not find service install for device: '${application.id}', image: '${image?.id}', service: '${JSON.stringify(image?.is_a_build_of__service)}', service installs: '${JSON.stringify(device.service_install)}'`);
|
|
30
29
|
}
|
|
30
|
+
const svc = si.service[0];
|
|
31
31
|
const environment = {};
|
|
32
32
|
varListInsert(ipr.image_environment_variable, environment);
|
|
33
33
|
varListInsert(application.application_environment_variable, environment);
|
|
@@ -107,21 +107,9 @@ const stateQuery = _.once(() => api.resin.prepare({
|
|
|
107
107
|
'id',
|
|
108
108
|
'is_stored_at__image_location',
|
|
109
109
|
'content_hash',
|
|
110
|
+
'is_a_build_of__service',
|
|
110
111
|
'contract',
|
|
111
112
|
],
|
|
112
|
-
$expand: {
|
|
113
|
-
is_a_build_of__service: {
|
|
114
|
-
$select: ['id', 'service_name'],
|
|
115
|
-
$expand: {
|
|
116
|
-
service_environment_variable: {
|
|
117
|
-
$select: ['name', 'value'],
|
|
118
|
-
},
|
|
119
|
-
service_label: {
|
|
120
|
-
$select: ['label_name', 'value'],
|
|
121
|
-
},
|
|
122
|
-
},
|
|
123
|
-
},
|
|
124
|
-
},
|
|
125
113
|
},
|
|
126
114
|
image_label: {
|
|
127
115
|
$select: ['label_name', 'value'],
|
|
@@ -134,8 +122,19 @@ const stateQuery = _.once(() => api.resin.prepare({
|
|
|
134
122
|
},
|
|
135
123
|
},
|
|
136
124
|
service_install: {
|
|
137
|
-
$select: ['id'
|
|
125
|
+
$select: ['id'],
|
|
138
126
|
$expand: {
|
|
127
|
+
service: {
|
|
128
|
+
$select: ['id', 'service_name'],
|
|
129
|
+
$expand: {
|
|
130
|
+
service_environment_variable: {
|
|
131
|
+
$select: ['name', 'value'],
|
|
132
|
+
},
|
|
133
|
+
service_label: {
|
|
134
|
+
$select: ['label_name', 'value'],
|
|
135
|
+
},
|
|
136
|
+
},
|
|
137
|
+
},
|
|
139
138
|
device_service_environment_variable: {
|
|
140
139
|
$select: ['name', 'value'],
|
|
141
140
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-get-v2.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-get-v2.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EACN,gBAAgB,EAChB,gBAAgB,GAChB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACN,mBAAmB,EACnB,eAAe,EACf,aAAa,EACb,yBAAyB,EACzB,qBAAqB,EACrB,SAAS,EACT,6BAA6B,GAC7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,MAAM,EAAE,GAAG,EAAE,GAAG,SAAS,CAAC;AA4C1B,SAAS,mBAAmB,CAC3B,MAAsB,EACtB,WAA8D,EAC9D,OAA6D,EAC7D,MAA0B;IAE1B,IAAI,WAAW,GAAc,EAAE,CAAC;IAChC,MAAM,QAAQ,GAA8B,EAAE,CAAC;IAE/C,wDAAwD;IACxD,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACrC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IACnC,CAAC;SAAM,CAAC;QACP,IAAI,CAAC;YACJ,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC/C,CAAC;QAAC,MAAM,CAAC;YACR,WAAW,GAAG,EAAE,CAAC;QAClB,CAAC;IACF,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QAC3C,oCAAoC;QACpC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAE3B,MAAM,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"state-get-v2.js","sourceRoot":"","sources":["../../../../src/features/device-state/routes/state-get-v2.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": "28.0.
|
|
4
|
+
"version": "28.0.4-build-add-tests-for-env-vars-on-state-get-8efbe9c8b50b2dfc9861a9670bf09743b29edde3-1",
|
|
5
5
|
"license": "AGPL-3.0",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -168,6 +168,6 @@
|
|
|
168
168
|
"loader": "ts-node/esm/transpile-only"
|
|
169
169
|
},
|
|
170
170
|
"versionist": {
|
|
171
|
-
"publishedAt": "2024-09-
|
|
171
|
+
"publishedAt": "2024-09-18T09:40:58.982Z"
|
|
172
172
|
}
|
|
173
173
|
}
|