balena-cli 23.1.0 → 23.1.1-build-some-lodash-to-native-a97c8db9364cbf0d45c403cfdb917e1f12d7efbd-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/CHANGELOG.md +4 -0
- package/build/commands/api-key/list.js +2 -2
- package/build/commands/api-key/list.js.map +1 -1
- package/build/commands/deploy/index.js +5 -3
- package/build/commands/deploy/index.js.map +1 -1
- package/build/commands/device/detect.js +9 -6
- package/build/commands/device/detect.js.map +1 -1
- package/build/commands/device/list.js +1 -2
- package/build/commands/device/list.js.map +1 -1
- package/build/commands/device/tunnel.js +2 -4
- package/build/commands/device/tunnel.js.map +1 -1
- package/build/commands/local/configure.d.ts +1 -1
- package/build/commands/local/configure.js +12 -8
- package/build/commands/local/configure.js.map +1 -1
- package/build/commands/os/configure.js +14 -18
- package/build/commands/os/configure.js.map +1 -1
- package/build/utils/cloud.js +1 -5
- package/build/utils/cloud.js.map +1 -1
- package/build/utils/compose.js +12 -5
- package/build/utils/compose.js.map +1 -1
- package/build/utils/compose_ts.js +12 -4
- package/build/utils/compose_ts.js.map +1 -1
- package/build/utils/device/api.js +2 -2
- package/build/utils/device/api.js.map +1 -1
- package/build/utils/device/deploy.js +5 -5
- package/build/utils/device/deploy.js.map +1 -1
- package/build/utils/device/live.js +4 -6
- package/build/utils/device/live.js.map +1 -1
- package/build/utils/helpers.d.ts +2 -0
- package/build/utils/helpers.js +23 -7
- package/build/utils/helpers.js.map +1 -1
- package/build/utils/logger.js +2 -3
- package/build/utils/logger.js.map +1 -1
- package/npm-shrinkwrap.json +2 -2
- package/oclif.manifest.json +672 -672
- package/package.json +2 -2
- package/src/commands/api-key/list.ts +2 -2
- package/src/commands/deploy/index.ts +5 -6
- package/src/commands/device/detect.ts +9 -6
- package/src/commands/device/list.ts +2 -3
- package/src/commands/device/tunnel.ts +2 -4
- package/src/commands/local/configure.ts +14 -10
- package/src/commands/os/configure.ts +31 -30
- package/src/utils/cloud.ts +1 -5
- package/src/utils/compose.ts +13 -12
- package/src/utils/compose_ts.ts +15 -8
- package/src/utils/device/api.ts +2 -3
- package/src/utils/device/deploy.ts +5 -5
- package/src/utils/device/live.ts +6 -6
- package/src/utils/helpers.ts +31 -6
- package/src/utils/logger.ts +2 -3
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
|
|
|
4
4
|
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
5
5
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
|
6
6
|
|
|
7
|
+
## 23.1.1 - 2025-11-18
|
|
8
|
+
|
|
9
|
+
* Drop some usage of lodash in favor of native equivalents [Matthew Yarmolinsky]
|
|
10
|
+
|
|
7
11
|
## 23.1.0 - 2025-11-18
|
|
8
12
|
|
|
9
13
|
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const core_1 = require("@oclif/core");
|
|
4
4
|
const cf = require("../../utils/common-flags");
|
|
5
5
|
const lazy_1 = require("../../utils/lazy");
|
|
6
|
+
const helpers_1 = require("../../utils/helpers");
|
|
6
7
|
class APIKeyListCmd extends core_1.Command {
|
|
7
8
|
async run() {
|
|
8
9
|
const { flags: options } = await this.parse(APIKeyListCmd);
|
|
@@ -30,8 +31,7 @@ class APIKeyListCmd extends core_1.Command {
|
|
|
30
31
|
},
|
|
31
32
|
});
|
|
32
33
|
const fields = ['id', 'name', 'created_at', 'description', 'expiry_date'];
|
|
33
|
-
|
|
34
|
-
console.log((0, lazy_1.getVisuals)().table.horizontal(keys.map((key) => _.mapValues(key, (val) => val !== null && val !== void 0 ? val : 'N/a')), fields));
|
|
34
|
+
console.log((0, lazy_1.getVisuals)().table.horizontal(keys.map((key) => (0, helpers_1.defaultValues)(key, 'N/a')), fields));
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
APIKeyListCmd.description = (0, lazy_1.stripIndent) `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/api-key/list.ts"],"names":[],"mappings":";;AAiBA,sCAA6C;AAC7C,+CAA+C;AAC/C,2CAAyE;
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/api-key/list.ts"],"names":[],"mappings":";;AAiBA,sCAA6C;AAC7C,+CAA+C;AAC/C,2CAAyE;AACzE,iDAAoD;AAEpD,MAAqB,aAAc,SAAQ,cAAO;IAoB1C,KAAK,CAAC,GAAG;QACf,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAE3D,MAAM,EAAE,cAAc,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK;YAC5B,CAAC,CAAC,CACA,MAAM,cAAc,CAAC,IAAA,mBAAY,GAAE,EAAE,OAAO,CAAC,KAAK,EAAE;gBACnD,OAAO,EAAE,OAAO;aAChB,CAAC,CACF,CAAC,KAAK,CAAC,IAAI;YACb,CAAC,CAAC,MAAM,IAAA,mBAAY,GAAE,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,MAAM,IAAA,mBAAY,GAAE,CAAC,IAAI,CAAC,GAAG,CAAC;YAC1C,QAAQ,EAAE,SAAS;YACnB,OAAO,EAAE;gBACR,OAAO,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC;gBACnE,OAAO,EAAE;oBACR,YAAY,EAAE,OAAO;oBACrB,GAAG,CAAC,OAAO,CAAC,IAAI;wBACf,CAAC,CAAC;4BACA,IAAI,EAAE;gCACL,GAAG,EAAE,IAAI;6BACT;yBACD;wBACF,CAAC,CAAC,EAAE,CAAC;iBACN;gBACD,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;aACzB;SACD,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QAC1E,OAAO,CAAC,GAAG,CACV,IAAA,iBAAU,GAAE,CAAC,KAAK,CAAC,UAAU,CAC5B,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,uBAAa,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,EAC5C,MAAM,CACN,CACD,CAAC;IACH,CAAC;;AAtDa,yBAAW,GAAG,IAAA,kBAAW,EAAA;;;;;;CAMvC,CAAC;AACa,sBAAQ,GAAG,CAAC,uBAAuB,CAAC,CAAC;AAErC,mBAAK,GAAG;IACrB,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,6BAA6B;KAC1C,CAAC;IACF,KAAK,EAAE,EAAE,CAAC,KAAK;CACf,CAAC;AAEY,2BAAa,GAAG,IAAI,CAAC;kBAlBf,aAAa"}
|
|
@@ -89,10 +89,12 @@ class DeployCmd extends core_1.Command {
|
|
|
89
89
|
}
|
|
90
90
|
}));
|
|
91
91
|
servicesToSkip = servicesToSkip.filter((d) => !!d);
|
|
92
|
-
const compositionToBuild =
|
|
93
|
-
|
|
92
|
+
const compositionToBuild = structuredClone(project.composition);
|
|
93
|
+
for (const serviceToSkip of servicesToSkip) {
|
|
94
|
+
delete compositionToBuild.services[serviceToSkip];
|
|
95
|
+
}
|
|
94
96
|
let builtImagesByService = {};
|
|
95
|
-
if (
|
|
97
|
+
if (Object.keys(compositionToBuild.services).length === 0) {
|
|
96
98
|
logger.logInfo('Everything is up to date (use --build to force a rebuild)');
|
|
97
99
|
}
|
|
98
100
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/deploy/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/deploy/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const core_1 = require("@oclif/core");
|
|
4
4
|
const lazy_1 = require("../../utils/lazy");
|
|
5
|
+
const helpers_1 = require("../../utils/helpers");
|
|
5
6
|
class DeviceDetectCmd extends core_1.Command {
|
|
6
7
|
async run() {
|
|
7
8
|
const _ = await Promise.resolve().then(() => require('lodash'));
|
|
@@ -61,12 +62,14 @@ class DeviceDetectCmd extends core_1.Command {
|
|
|
61
62
|
ux.action.stop('Reporting scan results');
|
|
62
63
|
if (!options.verbose) {
|
|
63
64
|
devicesInfo.forEach((d) => {
|
|
64
|
-
d.dockerInfo =
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
65
|
+
d.dockerInfo =
|
|
66
|
+
d.dockerInfo != null && typeof d.dockerInfo === 'object'
|
|
67
|
+
? (0, helpers_1.pick)(d.dockerInfo, DeviceDetectCmd.dockerInfoProperties)
|
|
68
|
+
: d.dockerInfo;
|
|
69
|
+
d.dockerVersion =
|
|
70
|
+
d.dockerVersion != null && typeof d.dockerVersion === 'object'
|
|
71
|
+
? (0, helpers_1.pick)(d.dockerVersion, DeviceDetectCmd.dockerVersionProperties)
|
|
72
|
+
: d.dockerVersion;
|
|
70
73
|
});
|
|
71
74
|
}
|
|
72
75
|
const cmdOutput = [...productionDevicesInfo, ...devicesInfo];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detect.js","sourceRoot":"","sources":["../../../src/commands/device/detect.ts"],"names":[],"mappings":";;AAiBA,sCAA6C;AAC7C,2CAAyD;
|
|
1
|
+
{"version":3,"file":"detect.js","sourceRoot":"","sources":["../../../src/commands/device/detect.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,8 +67,7 @@ class DeviceListCmd extends core_1.Command {
|
|
|
67
67
|
const mapped = devices.map((device) => pickAndRename(device, fields));
|
|
68
68
|
return JSON.stringify(mapped, null, 4);
|
|
69
69
|
}
|
|
70
|
-
|
|
71
|
-
console.log((0, lazy_1.getVisuals)().table.horizontal(devices.map((dev) => _.mapValues(dev, (val) => val !== null && val !== void 0 ? val : 'N/a')), fields));
|
|
70
|
+
console.log((0, lazy_1.getVisuals)().table.horizontal(devices.map((dev) => (0, helpers_1.defaultValues)(dev, 'N/a')), fields));
|
|
72
71
|
}
|
|
73
72
|
}
|
|
74
73
|
DeviceListCmd.enableJsonFlag = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/device/list.ts"],"names":[],"mappings":";;AAiBA,sCAAsC;AACtC,+CAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/device/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,7 @@ class DeviceTunnelCmd extends core_1.Command {
|
|
|
25
25
|
const { getOnlineTargetDeviceUuid } = await Promise.resolve().then(() => require('../../utils/patterns'));
|
|
26
26
|
const uuid = await getOnlineTargetDeviceUuid(sdk, params.deviceOrFleet);
|
|
27
27
|
logger.logInfo(`Opening a tunnel to ${uuid}...`);
|
|
28
|
-
const
|
|
29
|
-
const localListeners = _.chain(options.port)
|
|
28
|
+
const localListeners = options.port
|
|
30
29
|
.map((mapping) => {
|
|
31
30
|
return this.parsePortMapping(mapping);
|
|
32
31
|
})
|
|
@@ -58,8 +57,7 @@ class DeviceTunnelCmd extends core_1.Command {
|
|
|
58
57
|
logger.logWarn(` - not tunnelling ${localAddress}:${localPort} to ${uuid}:${remotePort}, failed ${JSON.stringify(err.message)}`);
|
|
59
58
|
return false;
|
|
60
59
|
}
|
|
61
|
-
})
|
|
62
|
-
.value();
|
|
60
|
+
});
|
|
63
61
|
const results = await Promise.all(localListeners);
|
|
64
62
|
if (!results.includes(true)) {
|
|
65
63
|
throw new errors_1.ExpectedError('No ports are valid for tunnelling');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../src/commands/device/tunnel.ts"],"names":[],"mappings":";;AAiBA,sCAAmD;AACnD,yCAIsB;AACtB,2CAA6D;AAC7D,6DAA4D;AAI5D,MAAqB,eAAgB,SAAQ,cAAO;IA8D5C,KAAK,CAAC,GAAG;QACf,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAE3E,MAAM,MAAM,GAAG,2CAAa,oBAAoB,EAAC,CAAC;QAElD,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,IAAA,mBAAY,GAAE,CAAC;QAE3B,MAAM,aAAa,GAAG,CACrB,QAAgB,EAChB,QAAgB,EAChB,YAAoB,EACpB,SAAiB,EACjB,aAAqB,EACrB,UAAkB,EAClB,GAAW,EACV,EAAE;YACH,MAAM,UAAU,GAAG,GAAG,QAAQ,IAAI,QAAQ,OAAO,YAAY,IAAI,SAAS,SAAS,aAAa,IAAI,UAAU,EAAE,CAAC;YAEjH,IAAI,GAAG,EAAE,CAAC;gBACT,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC,CAAC;QAEF,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,4BAAmB,EAAE,CAAC;QACjC,CAAC;QAGD,MAAM,EAAE,yBAAyB,EAAE,GAAG,2CAAa,sBAAsB,EAAC,CAAC;QAC3E,MAAM,IAAI,GAAG,MAAM,yBAAyB,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;QACxE,MAAM,CAAC,OAAO,CAAC,uBAAuB,IAAI,KAAK,CAAC,CAAC;QAEjD,MAAM,
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../../src/commands/device/tunnel.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,7 +97,7 @@ class LocalConfigureCmd extends core_1.Command {
|
|
|
97
97
|
logger.logDebug('New config:');
|
|
98
98
|
logger.logDebug(JSON.stringify(answers));
|
|
99
99
|
if (!answers.hostname) {
|
|
100
|
-
|
|
100
|
+
this.removeHostname(configurationSchema);
|
|
101
101
|
}
|
|
102
102
|
await reconfix.writeConfiguration(configurationSchema, answers, params.target);
|
|
103
103
|
});
|
|
@@ -160,7 +160,6 @@ class LocalConfigureCmd extends core_1.Command {
|
|
|
160
160
|
};
|
|
161
161
|
}
|
|
162
162
|
async prepareConnectionFile(target) {
|
|
163
|
-
const _ = await Promise.resolve().then(() => require('lodash'));
|
|
164
163
|
const imagefs = await Promise.resolve().then(() => require('balena-image-fs'));
|
|
165
164
|
const { getBootPartition } = await Promise.resolve().then(() => require('balena-config-json'));
|
|
166
165
|
const bootPartition = await getBootPartition(target);
|
|
@@ -168,15 +167,15 @@ class LocalConfigureCmd extends core_1.Command {
|
|
|
168
167
|
return await _fs.promises.readdir(this.CONNECTIONS_FOLDER);
|
|
169
168
|
});
|
|
170
169
|
let connectionFileName;
|
|
171
|
-
if (
|
|
170
|
+
if (files.includes('resin-wifi')) {
|
|
172
171
|
}
|
|
173
|
-
else if (
|
|
172
|
+
else if (files.includes('resin-sample.ignore')) {
|
|
174
173
|
await imagefs.interact(target, bootPartition, async (_fs) => {
|
|
175
174
|
const contents = await _fs.promises.readFile(`${this.CONNECTIONS_FOLDER}/resin-sample.ignore`, { encoding: 'utf8' });
|
|
176
175
|
await _fs.promises.writeFile(`${this.CONNECTIONS_FOLDER}/resin-wifi`, contents);
|
|
177
176
|
});
|
|
178
177
|
}
|
|
179
|
-
else if (
|
|
178
|
+
else if (files.includes('resin-sample')) {
|
|
180
179
|
connectionFileName = 'resin-sample';
|
|
181
180
|
}
|
|
182
181
|
else {
|
|
@@ -186,9 +185,14 @@ class LocalConfigureCmd extends core_1.Command {
|
|
|
186
185
|
}
|
|
187
186
|
return this.getConfigurationSchema(bootPartition, connectionFileName);
|
|
188
187
|
}
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
188
|
+
removeHostname(schema) {
|
|
189
|
+
schema.mapper = schema.mapper.filter((mapper) => {
|
|
190
|
+
const keys = Object.keys(mapper.template);
|
|
191
|
+
if (keys.length !== 1) {
|
|
192
|
+
return true;
|
|
193
|
+
}
|
|
194
|
+
return keys[0] !== 'hostname';
|
|
195
|
+
});
|
|
192
196
|
}
|
|
193
197
|
}
|
|
194
198
|
LocalConfigureCmd.description = (0, lazy_1.stripIndent) `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../src/commands/local/configure.ts"],"names":[],"mappings":";;AAiBA,sCAA4C;AAC5C,2CAA+C;AAE/C,MAAqB,iBAAkB,SAAQ,cAAO;IAAtD;;QA2DU,uBAAkB,GAAG,qBAAqB,CAAC;QA6DpD,oBAAe,GAAG,CAAC,IAAS,EAAE,EAAE,CAAC;YAChC;gBACC,OAAO,EAAE,cAAc;gBACvB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,IAAI,CAAC,WAAW;aACzB;YACD;gBACC,OAAO,EAAE,aAAa;gBACtB,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,IAAI,CAAC,UAAU;aACxB;YACD;gBACC,OAAO,EACN,6EAA6E;gBAC9E,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,KAAK;aACd;YACD;gBACC,OAAO,EAAE,uCAAuC;gBAChD,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,KAAK;aACd;YACD;gBACC,OAAO,EAAE,iBAAiB;gBAC1B,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,IAAI,CAAC,OAAY;oBAChB,OAAO,OAAO,CAAC,gBAAgB,CAAC;gBACjC,CAAC;aACD;YACD;gBACC,OAAO,EAAE,2CAA2C;gBACpD,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,mBAAmB;gBACzB,OAAO,EAAE,IAAI,CAAC,iBAAiB;gBAC/B,IAAI,CAAC,OAAY;oBAChB,OAAO,OAAO,CAAC,gBAAgB,CAAC;gBACjC,CAAC;aACD;SACD,CAAC;QAEF,qBAAgB,GAAG,KAAK,EAAE,IAAS,EAAE,EAAE;;YACtC,MAAM,CAAC,GAAG,2CAAa,QAAQ,EAAC,CAAC;YACjC,MAAM,QAAQ,GAAG,2CAAa,UAAU,EAAC,CAAC;YAI1C,MAAA,IAAI,CAAC,iBAAiB,oCAAtB,IAAI,CAAC,iBAAiB,GAAK,KAAK,EAAC;YAEjC,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,CAAC,CAAC;QAGO,oBAAe,GAAG,IAAA,kBAAW,EAAA;;;;;;;;;;;;;;;;;;;;;EAqBrC,CAAC;
|
|
1
|
+
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../src/commands/local/configure.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const core_1 = require("@oclif/core");
|
|
4
|
-
const _ = require("lodash");
|
|
5
4
|
const errors_1 = require("../../errors");
|
|
6
5
|
const cf = require("../../utils/common-flags");
|
|
7
6
|
const lazy_1 = require("../../utils/lazy");
|
|
@@ -252,11 +251,8 @@ async function askQuestionsForDeviceType(deviceType, options, configJson) {
|
|
|
252
251
|
answerSources.push(configJson);
|
|
253
252
|
}
|
|
254
253
|
if (!options.advanced) {
|
|
255
|
-
const advancedGroup =
|
|
256
|
-
|
|
257
|
-
isGroup: true,
|
|
258
|
-
});
|
|
259
|
-
if (!_.isEmpty(advancedGroup)) {
|
|
254
|
+
const advancedGroup = questions.find((question) => question.name === 'advanced' && question.isGroup);
|
|
255
|
+
if (advancedGroup != null && Object.keys(advancedGroup).length > 0) {
|
|
260
256
|
const helpers = await Promise.resolve().then(() => require('../../utils/helpers'));
|
|
261
257
|
answerSources.push(helpers.getGroupDefaults(advancedGroup));
|
|
262
258
|
}
|
|
@@ -273,27 +269,27 @@ async function askQuestionsForDeviceType(deviceType, options, configJson) {
|
|
|
273
269
|
(defaultAnswers.wifiSsid || defaultAnswers.wifiKey)) {
|
|
274
270
|
defaultAnswers.network = 'wifi';
|
|
275
271
|
}
|
|
276
|
-
if (
|
|
272
|
+
if (defaultAnswers != null && Object.keys(defaultAnswers).length > 0) {
|
|
277
273
|
extraOpts = { override: defaultAnswers };
|
|
278
274
|
}
|
|
279
275
|
return (await (0, lazy_1.getCliForm)().run(questions, extraOpts));
|
|
280
276
|
}
|
|
281
277
|
function getQuestionNames(deviceType) {
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
.map((groupOption) => groupOption.name)
|
|
285
|
-
.filter()
|
|
286
|
-
.value();
|
|
278
|
+
var _a, _b;
|
|
279
|
+
const questionNames = (_b = (_a = deviceType.options) === null || _a === void 0 ? void 0 : _a.flatMap((group) => (group.isGroup && group.options) || []).map((groupOption) => groupOption.name).filter(Boolean)) !== null && _b !== void 0 ? _b : [];
|
|
287
280
|
return questionNames;
|
|
288
281
|
}
|
|
289
282
|
function camelifyConfigOptions(options) {
|
|
290
|
-
return
|
|
283
|
+
return Object.fromEntries(Object.entries(options).map(([key, value]) => {
|
|
291
284
|
if (key.startsWith('config-')) {
|
|
292
|
-
return
|
|
293
|
-
|
|
294
|
-
|
|
285
|
+
return [
|
|
286
|
+
key
|
|
287
|
+
.substring('config-'.length)
|
|
288
|
+
.replace(/-[a-z]/g, (match) => match.substring(1).toUpperCase()),
|
|
289
|
+
value,
|
|
290
|
+
];
|
|
295
291
|
}
|
|
296
|
-
return key;
|
|
297
|
-
});
|
|
292
|
+
return [key, value];
|
|
293
|
+
}));
|
|
298
294
|
}
|
|
299
295
|
//# sourceMappingURL=configure.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../src/commands/os/configure.ts"],"names":[],"mappings":";;AAiBA,sCAAmD;AAGnD,
|
|
1
|
+
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../src/commands/os/configure.ts"],"names":[],"mappings":"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"}
|
package/build/utils/cloud.js
CHANGED
|
@@ -36,11 +36,7 @@ exports.getDeviceAndAppFromUUID = _.memoize(async (sdk, deviceUUID) => {
|
|
|
36
36
|
}, (_sdk, deviceUUID) => deviceUUID);
|
|
37
37
|
exports.getDeviceAndMaybeAppFromUUID = _.memoize(async (sdk, deviceUUID) => {
|
|
38
38
|
const device = await sdk.models.device.get(deviceUUID, deviceOptions);
|
|
39
|
-
|
|
40
|
-
if (_.isEmpty(apps) || _.isEmpty(apps[0])) {
|
|
41
|
-
return [device, undefined];
|
|
42
|
-
}
|
|
43
|
-
return [device, apps[0]];
|
|
39
|
+
return [device, device.belongs_to__application[0]];
|
|
44
40
|
}, (_sdk, deviceUUID) => deviceUUID);
|
|
45
41
|
async function downloadOSImage(deviceType, outputPath, OSVersion) {
|
|
46
42
|
console.info(`Getting device operating system for ${deviceType}`);
|
package/build/utils/cloud.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud.js","sourceRoot":"","sources":["../../src/utils/cloud.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cloud.js","sourceRoot":"","sources":["../../src/utils/cloud.ts"],"names":[],"mappings":"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"}
|
package/build/utils/compose.js
CHANGED
|
@@ -5,6 +5,7 @@ exports.generateOpts = generateOpts;
|
|
|
5
5
|
exports.createProject = createProject;
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const lazy_1 = require("./lazy");
|
|
8
|
+
const helpers_1 = require("./helpers");
|
|
8
9
|
function generateOpts(options) {
|
|
9
10
|
var _a;
|
|
10
11
|
const { promises: fs } = require('fs');
|
|
@@ -57,7 +58,6 @@ const getRequestRetryParameters = () => {
|
|
|
57
58
|
};
|
|
58
59
|
};
|
|
59
60
|
const createRelease = async function (sdk, logger, appId, composition, draft, semver, contract, imgDescriptors) {
|
|
60
|
-
const _ = require('lodash');
|
|
61
61
|
const crypto = require('crypto');
|
|
62
62
|
const releaseMod = require('@balena/compose/dist/release');
|
|
63
63
|
const pinejsClient = sdk.pine.clone({
|
|
@@ -85,9 +85,17 @@ const createRelease = async function (sdk, logger, appId, composition, draft, se
|
|
|
85
85
|
contract,
|
|
86
86
|
imgDescriptors,
|
|
87
87
|
});
|
|
88
|
+
for (const serviceImage of Object.values(serviceImages)) {
|
|
89
|
+
if ('created_at' in serviceImage) {
|
|
90
|
+
delete serviceImage.created_at;
|
|
91
|
+
}
|
|
92
|
+
if ('is_a_build_of__service' in serviceImage) {
|
|
93
|
+
delete serviceImage.is_a_build_of__service;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
88
96
|
return {
|
|
89
97
|
client: pinejsClient,
|
|
90
|
-
release:
|
|
98
|
+
release: (0, helpers_1.pick)(release, [
|
|
91
99
|
'id',
|
|
92
100
|
'status',
|
|
93
101
|
'commit',
|
|
@@ -99,7 +107,7 @@ const createRelease = async function (sdk, logger, appId, composition, draft, se
|
|
|
99
107
|
'start_timestamp',
|
|
100
108
|
'end_timestamp',
|
|
101
109
|
]),
|
|
102
|
-
serviceImages
|
|
110
|
+
serviceImages,
|
|
103
111
|
};
|
|
104
112
|
};
|
|
105
113
|
exports.createRelease = createRelease;
|
|
@@ -197,8 +205,7 @@ const formatDuration = (seconds) => {
|
|
|
197
205
|
: `${minutes}:${seconds.toString().padStart(2, '0')}`;
|
|
198
206
|
};
|
|
199
207
|
const renderProgressBar = function (percentage, stepCount) {
|
|
200
|
-
|
|
201
|
-
percentage = _.clamp(percentage, 0, 100);
|
|
208
|
+
percentage = Math.max(Math.min(percentage, 0), 100);
|
|
202
209
|
const barCount = Math.floor((stepCount * percentage) / 100);
|
|
203
210
|
const spaceCount = stepCount - barCount;
|
|
204
211
|
const bar = `[${'='.repeat(barCount)}>${' '.repeat(spaceCount)}]`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/utils/compose.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../src/utils/compose.ts"],"names":[],"mappings":"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"}
|