balena-cli 23.2.7-build-renovate-aws-actions-configure-aws-credentials-5-x-bc7e907580037871c76af3699eb9603d268868b7-1 → 23.2.7-build-os-configure-config-default-ethernet-adde76243450cd9f22dfc2414aa813c61a492748-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 -2
- package/build/commands/os/configure.js +16 -9
- package/build/commands/os/configure.js.map +1 -1
- package/npm-shrinkwrap.json +174 -432
- package/oclif.manifest.json +219 -219
- package/package.json +3 -3
- package/src/commands/os/configure.ts +23 -17
package/CHANGELOG.md
CHANGED
|
@@ -4,9 +4,11 @@ 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.2.7 - 2025-12-
|
|
7
|
+
## 23.2.7 - 2025-12-06
|
|
8
8
|
|
|
9
|
-
* Update
|
|
9
|
+
* Update @balena/lint to 9.3.7 to support async disposables [Thodoris Greasidis]
|
|
10
|
+
* Add tests for os configure --config [Thodoris Greasidis]
|
|
11
|
+
* os configure: Fix asking interactive questions when --config is used [Thodoris Greasidis]
|
|
10
12
|
|
|
11
13
|
## 23.2.6 - 2025-12-05
|
|
12
14
|
|
|
@@ -58,10 +58,21 @@ class OsConfigureCmd extends core_1.Command {
|
|
|
58
58
|
await validateDevOptionAndWarn(developmentMode, osVersion);
|
|
59
59
|
const { validateSecureBootOptionAndWarn } = await Promise.resolve().then(() => require('../../utils/config'));
|
|
60
60
|
await validateSecureBootOptionAndWarn(secureBoot, deviceTypeSlug, osVersion);
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
61
|
+
const _ = await Promise.resolve().then(() => require('lodash'));
|
|
62
|
+
const baseAnswers = configJson == null
|
|
63
|
+
? await askQuestionsForDeviceType(deviceTypeManifest, options)
|
|
64
|
+
: {
|
|
65
|
+
appUpdatePollInterval: configJson.appUpdatePollInterval,
|
|
66
|
+
network: !configJson.wifiSsid && !configJson.wifiKey ? 'ethernet' : 'wifi',
|
|
67
|
+
..._.pick(configJson, ['wifiSsid', 'wifiKey']),
|
|
68
|
+
};
|
|
69
|
+
const answers = {
|
|
70
|
+
...baseAnswers,
|
|
71
|
+
deviceType: deviceTypeSlug,
|
|
72
|
+
version: osVersion,
|
|
73
|
+
developmentMode: developmentMode,
|
|
74
|
+
secureBoot: secureBoot,
|
|
75
|
+
};
|
|
65
76
|
if (configJson == null) {
|
|
66
77
|
answers.provisioningKeyName = options['provisioning-key-name'];
|
|
67
78
|
answers.provisioningKeyExpiryDate =
|
|
@@ -70,7 +81,6 @@ class OsConfigureCmd extends core_1.Command {
|
|
|
70
81
|
configJson = await generateDeviceConfig(device, undefined, answers);
|
|
71
82
|
}
|
|
72
83
|
else {
|
|
73
|
-
answers.deviceType = deviceTypeSlug;
|
|
74
84
|
configJson = await generateApplicationConfig(app, answers);
|
|
75
85
|
}
|
|
76
86
|
if (options['initial-device-name'] != null &&
|
|
@@ -235,7 +245,7 @@ async function checkDeviceTypeCompatibility(deviceType, app) {
|
|
|
235
245
|
}
|
|
236
246
|
}
|
|
237
247
|
}
|
|
238
|
-
async function askQuestionsForDeviceType(deviceType, options
|
|
248
|
+
async function askQuestionsForDeviceType(deviceType, options) {
|
|
239
249
|
var _a;
|
|
240
250
|
const answerSources = [
|
|
241
251
|
{
|
|
@@ -247,9 +257,6 @@ async function askQuestionsForDeviceType(deviceType, options, configJson) {
|
|
|
247
257
|
const defaultAnswers = {};
|
|
248
258
|
const questions = (_a = deviceType.options) !== null && _a !== void 0 ? _a : [];
|
|
249
259
|
let extraOpts;
|
|
250
|
-
if (configJson != null) {
|
|
251
|
-
answerSources.push(configJson);
|
|
252
|
-
}
|
|
253
260
|
if (!options.advanced) {
|
|
254
261
|
const advancedGroup = questions.find((question) => question.name === 'advanced' && question.isGroup);
|
|
255
262
|
if (advancedGroup != null && Object.keys(advancedGroup).length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../src/commands/os/configure.ts"],"names":[],"mappings":";;AAiBA,sCAAmD;AAGnD,yCAA6C;AAC7C,+CAA+C;AAC/C,2CAAyE;AACzE,mDAI8B;AAG9B,MAAM,kBAAkB,GAAG,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"configure.js","sourceRoot":"","sources":["../../../src/commands/os/configure.ts"],"names":[],"mappings":"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"}
|