v20.2.6

Merge pull request #2918 from balena-io/renovate/actions-upload-artifact-digest
Update actions/upload-artifact digest to 4cec3d8
2025-06-24 10:35:39 +00:00 · 2025-02-25 19:13:51 +00:00 · 2025-02-25 19:12:56 +00:00 · 2025-02-25 18:51:27 +00:00 · 2025-02-25 18:10:50 +00:00 · 2025-02-25 18:09:54 +00:00
16 changed files with 1329 additions and 318 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -1,2 +0,0 @@
-/completion/*
-/bin/*
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -1,21 +0,0 @@
-module.exports = {
-	extends: ['./node_modules/@balena/lint/config/.eslintrc.js'],
-	parserOptions: {
-		project: 'tsconfig.dev.json',
-	},
-	root: true,
-	rules: {
-		ignoreDefinitionFiles: 0,
-		// to avoid the `warning  Forbidden non-null assertion  @typescript-eslint/no-non-null-assertion`
-		'@typescript-eslint/no-non-null-assertion': 'off',
-		'@typescript-eslint/no-shadow': 'off',
-		'@typescript-eslint/no-var-requires': 'off',
-		'no-restricted-imports': [
-			'error',
-			{
-				paths: ['resin-cli-visuals', 'chalk', 'common-tags', 'resin-cli-form'],
-			},
-		],
-		'@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
-	},
-};
--- a/.github/actions/publish/action.yml
+++ b/.github/actions/publish/action.yml
@ -39,7 +39,7 @@ runs:
      run: tar -xf ${{ runner.temp }}/custom.tgz

    - name: Setup Node.js
-      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
      with:
        node-version: ${{ inputs.NODE_VERSION }}
        cache: npm
@ -135,7 +135,7 @@ runs:
        XCODE_APP_LOADER_TEAM_ID: ${{ inputs.XCODE_APP_LOADER_TEAM_ID }}

    - name: Upload artifacts
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
      with:
        name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ strategy.job-index }}
        path: dist
--- a/.github/actions/test/action.yml
+++ b/.github/actions/test/action.yml
@ -26,7 +26,7 @@ runs:
  steps:
    # https://github.com/actions/setup-node#caching-global-packages-data
    - name: Setup Node.js
-      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
      with:
        node-version: ${{ inputs.NODE_VERSION }}
        cache: npm
@ -58,7 +58,7 @@ runs:
      run: tar --exclude-vcs -acf ${{ runner.temp }}/custom.tgz .

    - name: Upload custom artifact
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
      with:
        name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
        path: ${{ runner.temp }}/custom.tgz
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@ -1,3 +1,419 @@
+- commits:
+    - subject: Update actions/upload-artifact digest to 4cec3d8
+      hash: 6f0f7350cf65c35abd099a901266821c218478eb
+      body: |
+        Update actions/upload-artifact
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: balena-renovate[bot]
+      nested: []
+  version: 20.2.6
+  title: ""
+  date: 2025-02-25T19:13:48.297Z
+- commits:
+    - subject: Update actions/setup-node digest to 1d0ff46
+      hash: cddea24cefdfef475731e0a7d2bdec4992959a6b
+      body: |
+        Update actions/setup-node
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: balena-renovate[bot]
+      nested: []
+  version: 20.2.5
+  title: ""
+  date: 2025-02-25T18:10:47.617Z
+- commits:
+    - subject: Pin docker-modem and dockerode to avoid regression
+      hash: 2cba82e914c720e75b68bd4370a2a92b4d4a7ba0
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Ken Bannister <kb2ma@runbox.com>
+        signed-off-by: Ken Bannister <kb2ma@runbox.com>
+      author: Ken Bannister
+      nested: []
+  version: 20.2.4
+  title: ""
+  date: 2025-02-25T17:17:00.607Z
+- commits:
+    - subject: Remove unused old eslint version files
+      hash: 53be743b9dcecbb2f0d8841b6663e7af1a9006c3
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 20.2.3
+  title: ""
+  date: 2025-01-15T18:21:02.810Z
+- commits:
+    - subject: Use the promises namespace of balena-image-fs
+      hash: 29e7827eb1dbe4b0395df51f09cea38c3b2fb2e4
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+    - subject: Update balena-device-init to 8.1.3 & balena-image-fs to 7.3.0
+      hash: 1d77cf36652eaca007a25f6ebb85c8509662d576
+      body: |
+        Update balena-device-init from 8.1.0 to 8.1.3
+        Update balena-image-fs from 7.0.6 to 7.3.0
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested:
+        - commits:
+            - subject: Drop Bluebird from devDependencies
+              hash: e4b5c71032112664ba8dac4c9edc5dad5445818d
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Thodoris Greasidis
+              nested: []
+            - subject: "flowzone: Remove empty with clause"
+              hash: e83b4ef55eeebffb86d0bcda78dd45ee0651c76f
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Thodoris Greasidis
+              nested: []
+            - subject: Add the promises namespace as part of the exposed fs
+              hash: 9b73f44020de213a682afc21092e20caf68eaff8
+              body: ""
+              footer:
+                Change-type: minor
+                change-type: minor
+              author: Thodoris Greasidis
+              nested: []
+          version: balena-image-fs-7.3.0
+          title: ""
+          date: 2025-01-06T14:31:31.244Z
+        - commits:
+            - subject: Update dependency @types/node to v20
+              hash: 4a5f55ae8752b1b28638d3f4016910d5b2057d80
+              body: |
+                Update @types/node from 18.11.18 to 20.10.6
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Self-hosted Renovate Bot
+              nested: []
+          version: balena-image-fs-7.2.2
+          title: ""
+          date: 2024-01-02T18:50:24.990Z
+        - commits:
+            - subject: Remove repo config from flowzone.yml
+              hash: 3e0053a097a04c1d0c47139bc53787f07bfeb014
+              body: |
+                This functionality is being deprecated in Flowzone.
+
+                See: https://github.com/product-os/flowzone/pull/833
+              footer:
+                Change-type: patch
+                change-type: patch
+                Signed-off-by: Kyle Harding <kyle@balena.io>
+                signed-off-by: Kyle Harding <kyle@balena.io>
+              author: Kyle Harding
+              nested: []
+          version: balena-image-fs-7.2.1
+          title: ""
+          date: 2023-12-19T21:54:42.129Z
+        - commits:
+            - subject: Add support for Node 18
+              hash: 2a3bef60d9688dce26bd1c9546a28c98cf6d2566
+              body: ""
+              footer:
+                Change-type: minor
+                change-type: minor
+              author: Akis Kesoglou
+              nested: []
+          version: balena-image-fs-7.2.0
+          title: ""
+          date: 2023-01-20T14:27:37.169Z
+        - commits:
+            - subject: Update dependencies
+              hash: 9acc4bd2e793076095880f1924f8540b4d95fa9c
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: ab77
+              nested: []
+          version: balena-image-fs-7.1.2
+          title: ""
+          date: 2023-01-05T22:29:15.022Z
+        - commits:
+            - subject: Update dependency jsdoc-to-markdown to 8.0.0
+              hash: 5cf71efa734819263bd75c9938cb4367f90e1391
+              body: |
+                Update jsdoc-to-markdown to 8.0.0
+
+                Update jsdoc-to-markdown from 7.1.1 to 8.0.0
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Renovate Bot
+              nested: []
+          version: balena-image-fs-7.1.1
+          title: ""
+          date: 2022-12-20T02:52:28.901Z
+        - commits:
+            - subject: update dependencies
+              hash: 71a5bb92caa0658e45d1fb36e8652ca5ea50dee9
+              body: ""
+              footer:
+                Change-type: minor
+                change-type: minor
+              author: Zane Hitchcox
+              nested: []
+          version: balena-image-fs-7.1.0
+          title: ""
+          date: 2022-12-13T00:03:20.006Z
+        - commits:
+            - subject: "README: Remove the travisci badge"
+              hash: 3602a9c0c503502229d12cc1ec1de5bbcbc1b13c
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Thodoris Greasidis
+              nested: []
+          version: balena-device-init-8.1.3
+          title: ""
+          date: 2025-01-09T21:25:00.155Z
+        - commits:
+            - subject: Use the promises namespace of balena-image-fs
+              hash: de0af086c5d9124e4bbe5d66bf9aafe0f6c5f11b
+              body: |
+                Update balena-image-fs from 7.0.6 to 7.3.0
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Thodoris Greasidis
+              nested:
+                - commits:
+                    - subject: Drop Bluebird from devDependencies
+                      hash: e4b5c71032112664ba8dac4c9edc5dad5445818d
+                      body: ""
+                      footer:
+                        Change-type: patch
+                        change-type: patch
+                      author: Thodoris Greasidis
+                      nested: []
+                    - subject: "flowzone: Remove empty with clause"
+                      hash: e83b4ef55eeebffb86d0bcda78dd45ee0651c76f
+                      body: ""
+                      footer:
+                        Change-type: patch
+                        change-type: patch
+                      author: Thodoris Greasidis
+                      nested: []
+                    - subject: Add the promises namespace as part of the exposed fs
+                      hash: 9b73f44020de213a682afc21092e20caf68eaff8
+                      body: ""
+                      footer:
+                        Change-type: minor
+                        change-type: minor
+                      author: Thodoris Greasidis
+                      nested: []
+                  version: balena-image-fs-7.3.0
+                  title: ""
+                  date: 2025-01-06T14:31:31.244Z
+                - commits:
+                    - subject: Update dependency @types/node to v20
+                      hash: 4a5f55ae8752b1b28638d3f4016910d5b2057d80
+                      body: |
+                        Update @types/node from 18.11.18 to 20.10.6
+                      footer:
+                        Change-type: patch
+                        change-type: patch
+                      author: Self-hosted Renovate Bot
+                      nested: []
+                  version: balena-image-fs-7.2.2
+                  title: ""
+                  date: 2024-01-02T18:50:24.990Z
+                - commits:
+                    - subject: Remove repo config from flowzone.yml
+                      hash: 3e0053a097a04c1d0c47139bc53787f07bfeb014
+                      body: |
+                        This functionality is being deprecated in Flowzone.
+
+                        See: https://github.com/product-os/flowzone/pull/833
+                      footer:
+                        Change-type: patch
+                        change-type: patch
+                        Signed-off-by: Kyle Harding <kyle@balena.io>
+                        signed-off-by: Kyle Harding <kyle@balena.io>
+                      author: Kyle Harding
+                      nested: []
+                  version: balena-image-fs-7.2.1
+                  title: ""
+                  date: 2023-12-19T21:54:42.129Z
+                - commits:
+                    - subject: Add support for Node 18
+                      hash: 2a3bef60d9688dce26bd1c9546a28c98cf6d2566
+                      body: ""
+                      footer:
+                        Change-type: minor
+                        change-type: minor
+                      author: Akis Kesoglou
+                      nested: []
+                  version: balena-image-fs-7.2.0
+                  title: ""
+                  date: 2023-01-20T14:27:37.169Z
+                - commits:
+                    - subject: Update dependencies
+                      hash: 9acc4bd2e793076095880f1924f8540b4d95fa9c
+                      body: ""
+                      footer:
+                        Change-type: patch
+                        change-type: patch
+                      author: ab77
+                      nested: []
+                  version: balena-image-fs-7.1.2
+                  title: ""
+                  date: 2023-01-05T22:29:15.022Z
+                - commits:
+                    - subject: Update dependency jsdoc-to-markdown to 8.0.0
+                      hash: 5cf71efa734819263bd75c9938cb4367f90e1391
+                      body: |
+                        Update jsdoc-to-markdown to 8.0.0
+
+                        Update jsdoc-to-markdown from 7.1.1 to 8.0.0
+                      footer:
+                        Change-type: patch
+                        change-type: patch
+                      author: Renovate Bot
+                      nested: []
+                  version: balena-image-fs-7.1.1
+                  title: ""
+                  date: 2022-12-20T02:52:28.901Z
+                - commits:
+                    - subject: update dependencies
+                      hash: 71a5bb92caa0658e45d1fb36e8652ca5ea50dee9
+                      body: ""
+                      footer:
+                        Change-type: minor
+                        change-type: minor
+                      author: Zane Hitchcox
+                      nested: []
+                  version: balena-image-fs-7.1.0
+                  title: ""
+                  date: 2022-12-13T00:03:20.006Z
+          version: balena-device-init-8.1.2
+          title: ""
+          date: 2025-01-09T20:28:30.604Z
+        - commits:
+            - subject: Convert some parts to async await and simplify
+              hash: eb1105cd738998bae9c3dd604a8d25f71eb38e19
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Thodoris Greasidis
+              nested: []
+            - subject: Avoid unnecessary destructuring
+              hash: 4cea6b650ec1c911cf2fc12a4a1dc410c0e7d075
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Thodoris Greasidis
+              nested: []
+          version: balena-device-init-8.1.1
+          title: ""
+          date: 2025-01-06T06:37:04.147Z
+  version: 20.2.2
+  title: ""
+  date: 2025-01-12T14:49:03.225Z
+- commits:
+    - subject: Update balena-preload to 17.0.0
+      hash: 60bc5092e0d6014aecf57d157cac536b3c645f0f
+      body: |
+        Update balena-preload from 16.0.0 to 17.0.0
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested:
+        - commits:
+            - subject: Improve typings
+              hash: 67f0f3e9e3b4b37fbaeef2843dc4171a7d661c41
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Thodoris Greasidis
+              nested: []
+            - subject: Stop returning Bluebird promises & drop it from the dependencies
+              hash: 85375cbc1fdb0ce1ad08756f178ed55596e606d9
+              body: ""
+              footer:
+                Change-type: major
+                change-type: major
+              author: Thodoris Greasidis
+              nested: []
+          version: balena-preload-17.0.0
+          title: ""
+          date: 2024-10-21T16:20:33.486Z
+  version: 20.2.1
+  title: ""
+  date: 2025-01-01T18:04:56.723Z
+- commits:
+    - subject: "os configure: Give precedence to the boot partition located in the
+        image over the device-type.json contents"
+      hash: dbe177e76639040c5fac49746fbbcee2e3360d0a
+      body: |
+        Update balena-device-init from 8.0.0 to 8.1.0
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: Thodoris Greasidis
+      nested:
+        - commits:
+            - subject: Try to find the boot partition by inspecting the image
+              hash: de53f11c56133bf2757c5361f8dbc6afa9e826fc
+              body: ""
+              footer:
+                Change-type: minor
+                change-type: minor
+              author: Thodoris Greasidis
+              nested: []
+          version: balena-device-init-8.1.0
+          title: ""
+          date: 2024-12-30T12:41:49.474Z
+        - commits:
+            - subject: Drop the unnecessary eslint.config.js
+              hash: 91d587f34bf985bf65e6c21278e7cd70f9281656
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Thodoris Greasidis
+              nested: []
+            - subject: "packacke.json: Explicitly set type commonjs"
+              hash: f6a0be1d12f09d7d910e5ae35f48f1268542a74e
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Thodoris Greasidis
+              nested: []
+          version: balena-device-init-8.0.1
+          title: ""
+          date: 2024-12-19T13:41:14.170Z
+  version: 20.2.0
+  title: ""
+  date: 2024-12-31T18:41:45.907Z
 - commits:
    - subject: Add more realistic os configure tests
      hash: 305d65d5ed07cce767599ac4e5dd131e2a87d10d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,143 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 20.2.6 - 2025-02-25
+
+* Update actions/upload-artifact digest to 4cec3d8 [balena-renovate[bot]]
+
+## 20.2.5 - 2025-02-25
+
+* Update actions/setup-node digest to 1d0ff46 [balena-renovate[bot]]
+
+## 20.2.4 - 2025-02-25
+
+* Pin docker-modem and dockerode to avoid regression [Ken Bannister]
+
+## 20.2.3 - 2025-01-15
+
+* Remove unused old eslint version files [Otavio Jacobi]
+
+## 20.2.2 - 2025-01-12
+
+* Use the promises namespace of balena-image-fs [Thodoris Greasidis]
+
+<details>
+<summary> Update balena-device-init to 8.1.3 & balena-image-fs to 7.3.0 [Thodoris Greasidis] </summary>
+
+> ### balena-image-fs-7.3.0 - 2025-01-06
+> 
+> * Drop Bluebird from devDependencies [Thodoris Greasidis]
+> * flowzone: Remove empty with clause [Thodoris Greasidis]
+> * Add the promises namespace as part of the exposed fs [Thodoris Greasidis]
+> 
+> ### balena-image-fs-7.2.2 - 2024-01-02
+> 
+> * Update dependency @types/node to v20 [Self-hosted Renovate Bot]
+> 
+> ### balena-image-fs-7.2.1 - 2023-12-19
+> 
+> * Remove repo config from flowzone.yml [Kyle Harding]
+> 
+> ### balena-image-fs-7.2.0 - 2023-01-20
+> 
+> * Add support for Node 18 [Akis Kesoglou]
+> 
+> ### balena-image-fs-7.1.2 - 2023-01-05
+> 
+> * Update dependencies [ab77]
+> 
+> ### balena-image-fs-7.1.1 - 2022-12-20
+> 
+> * Update dependency jsdoc-to-markdown to 8.0.0 [Renovate Bot]
+> 
+> ### balena-image-fs-7.1.0 - 2022-12-13
+> 
+> * update dependencies [Zane Hitchcox]
+> 
+> ### balena-device-init-8.1.3 - 2025-01-09
+> 
+> * README: Remove the travisci badge [Thodoris Greasidis]
+> 
+> ### balena-device-init-8.1.2 - 2025-01-09
+> 
+> 
+> <details>
+> <summary> Use the promises namespace of balena-image-fs [Thodoris Greasidis] </summary>
+> 
+>> #### balena-image-fs-7.3.0 - 2025-01-06
+>> 
+>> * Drop Bluebird from devDependencies [Thodoris Greasidis]
+>> * flowzone: Remove empty with clause [Thodoris Greasidis]
+>> * Add the promises namespace as part of the exposed fs [Thodoris Greasidis]
+>> 
+>> #### balena-image-fs-7.2.2 - 2024-01-02
+>> 
+>> * Update dependency @types/node to v20 [Self-hosted Renovate Bot]
+>> 
+>> #### balena-image-fs-7.2.1 - 2023-12-19
+>> 
+>> * Remove repo config from flowzone.yml [Kyle Harding]
+>> 
+>> #### balena-image-fs-7.2.0 - 2023-01-20
+>> 
+>> * Add support for Node 18 [Akis Kesoglou]
+>> 
+>> #### balena-image-fs-7.1.2 - 2023-01-05
+>> 
+>> * Update dependencies [ab77]
+>> 
+>> #### balena-image-fs-7.1.1 - 2022-12-20
+>> 
+>> * Update dependency jsdoc-to-markdown to 8.0.0 [Renovate Bot]
+>> 
+>> #### balena-image-fs-7.1.0 - 2022-12-13
+>> 
+>> * update dependencies [Zane Hitchcox]
+>> 
+> 
+> </details>
+> 
+> 
+> ### balena-device-init-8.1.1 - 2025-01-06
+> 
+> * Convert some parts to async await and simplify [Thodoris Greasidis]
+> * Avoid unnecessary destructuring [Thodoris Greasidis]
+> 
+
+</details>
+
+## 20.2.1 - 2025-01-01
+
+
+<details>
+<summary> Update balena-preload to 17.0.0 [Thodoris Greasidis] </summary>
+
+> ### balena-preload-17.0.0 - 2024-10-21
+> 
+> * Improve typings [Thodoris Greasidis]
+> * Stop returning Bluebird promises & drop it from the dependencies [Thodoris Greasidis]
+> 
+
+</details>
+
+## 20.2.0 - 2024-12-31
+
+
+<details>
+<summary> os configure: Give precedence to the boot partition located in the image over the device-type.json contents [Thodoris Greasidis] </summary>
+
+> ### balena-device-init-8.1.0 - Invalid date
+> 
+> * Try to find the boot partition by inspecting the image [Thodoris Greasidis]
+> 
+> ### balena-device-init-8.0.1 - 2024-12-19
+> 
+> * Drop the unnecessary eslint.config.js [Thodoris Greasidis]
+> * packacke.json: Explicitly set type commonjs [Thodoris Greasidis]
+> 
+
+</details>
+
 ## 20.1.6 - 2024-12-30

 * Add more realistic os configure tests [Thodoris Greasidis]
--- a/automation/build-bin.ts
+++ b/automation/build-bin.ts
@ -305,7 +305,7 @@ async function zipPkg() {
 		);
 	}
 	await fs.mkdirp(path.dirname(outputFile));
-	await new Promise((resolve, reject) => {
+	await new Promise<void>((resolve, reject) => {
 		console.log(`Zipping standalone package to "${outputFile}"...`);

 		const archive = archiver('zip', {
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "balena-cli",
-  "version": "20.1.6",
+  "version": "20.2.6",
  "description": "The official balena Command Line Interface",
  "main": "./build/app.js",
  "homepage": "https://github.com/balena-io/balena-cli",
@ -196,10 +196,10 @@
    "@oclif/core": "^4.1.0",
    "@sentry/node": "^6.16.1",
    "balena-config-json": "^4.2.0",
-    "balena-device-init": "^8.0.0",
+    "balena-device-init": "^8.1.3",
    "balena-errors": "^4.7.3",
-    "balena-image-fs": "^7.0.6",
-    "balena-preload": "^16.0.0",
+    "balena-image-fs": "^7.3.0",
+    "balena-preload": "^17.0.0",
    "balena-sdk": "^20.8.0",
    "balena-semver": "^2.3.0",
    "balena-settings-client": "^5.0.2",
@ -212,9 +212,9 @@
    "color-hash": "^1.1.1",
    "common-tags": "^1.7.2",
    "denymount": "^2.3.0",
-    "docker-modem": "^5.0.3",
+    "docker-modem": "5.0.5",
    "docker-progress": "^5.1.3",
-    "dockerode": "^4.0.2",
+    "dockerode": "4.0.3",
    "ejs": "^3.1.6",
    "etcher-sdk": "9.1.0",
    "express": "^4.17.2",
@ -274,6 +274,6 @@
    }
  },
  "versionist": {
-    "publishedAt": "2024-12-30T17:16:10.325Z"
+    "publishedAt": "2025-02-25T19:13:49.353Z"
  }
 }
--- a/repo.yml
+++ b/repo.yml
@ -6,6 +6,8 @@ upstream:
    url: 'https://github.com/balena-io/balena-sdk'
  - repo: 'balena-config-json'
    url: 'https://github.com/balena-io-modules/balena-config-json'
+  - repo: 'balena-image-fs'
+    url: 'https://github.com/balena-io-modules/balena-image-fs'
  - repo: 'balena-device-init'
    url: 'https://github.com/balena-io-modules/balena-device-init'
  - repo: 'balena-image-manager'
--- a/src/commands/local/configure.ts
+++ b/src/commands/local/configure.ts
@ -16,7 +16,6 @@
 */

 import { Args, Command } from '@oclif/core';
-import { promisify } from 'util';
 import { stripIndent } from '../../utils/lazy';

 export default class LocalConfigureCmd extends Command {
@ -237,7 +236,7 @@ export default class LocalConfigureCmd extends Command {
 		const bootPartition = await getBootPartition(target);

 		const files = await imagefs.interact(target, bootPartition, async (_fs) => {
-			return await promisify(_fs.readdir)(this.CONNECTIONS_FOLDER);
+			return await _fs.promises.readdir(this.CONNECTIONS_FOLDER);
 		});

 		let connectionFileName;
@ -246,13 +245,14 @@ export default class LocalConfigureCmd extends Command {
 		} else if (_.includes(files, 'resin-sample.ignore')) {
 			// Fresh image, new mode, accoding to https://github.com/balena-os/meta-balena/pull/770/files
 			await imagefs.interact(target, bootPartition, async (_fs) => {
-				const readFileAsync = promisify(_fs.readFile);
-				const writeFileAsync = promisify(_fs.writeFile);
-				const contents = await readFileAsync(
+				const contents = await _fs.promises.readFile(
 					`${this.CONNECTIONS_FOLDER}/resin-sample.ignore`,
 					{ encoding: 'utf8' },
 				);
-				await writeFileAsync(`${this.CONNECTIONS_FOLDER}/resin-wifi`, contents);
+				await _fs.promises.writeFile(
+					`${this.CONNECTIONS_FOLDER}/resin-wifi`,
+					contents,
+				);
 			});
 		} else if (_.includes(files, 'resin-sample')) {
 			// Legacy mode, to be removed later
@ -266,7 +266,7 @@ export default class LocalConfigureCmd extends Command {
 		} else {
 			// In case there's no file at all (shouldn't happen normally, but the file might have been removed)
 			await imagefs.interact(target, bootPartition, async (_fs) => {
-				await promisify(_fs.writeFile)(
+				await _fs.promises.writeFile(
 					`${this.CONNECTIONS_FOLDER}/resin-wifi`,
 					this.CONNECTION_FILE,
 				);
--- a/src/commands/os/configure.ts
+++ b/src/commands/os/configure.ts
@ -18,7 +18,6 @@
 import { Flags, Args, Command } from '@oclif/core';
 import type { Interfaces } from '@oclif/core';
 import type * as BalenaSdk from 'balena-sdk';
-import { promisify } from 'util';
 import * as _ from 'lodash';
 import { ExpectedError } from '../../errors';
 import * as cf from '../../utils/common-flags';
@ -292,7 +291,7 @@ export default class OsConfigureCmd extends Command {

 			for (const { name, content } of files) {
 				await imagefs.interact(image, bootPartition, async (_fs) => {
-					await promisify(_fs.writeFile)(
+					await _fs.promises.writeFile(
 						path.join(CONNECTIONS_FOLDER, name),
 						content,
 					);
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@ -110,6 +110,27 @@ export async function getManifest(
 	const init = await import('balena-device-init');
 	const sdk = getBalenaSdk();
 	const manifest = await init.getImageManifest(image);
+	if (manifest != null) {
+		const config = manifest.configuration?.config;
+		if (config?.partition != null) {
+			const { getBootPartition } = await import('balena-config-json');
+			// Find the device-type.json property that holds the boot partition number for
+			// this device type (config.partition or config.partition.primary) and overwrite it
+			// with the boot partition number that was found by inspecting the image.
+			// since it's deprecated & no longer updated for newer releases.
+			if (typeof config.partition === 'number') {
+				config.partition = await getBootPartition(image);
+			} else if (config.partition.primary != null) {
+				config.partition.primary = await getBootPartition(image);
+			}
+			// TODO: Add handling for when we no longer include a `config.partition` at all.
+		}
+	} else {
+		// TODO: Change this in the next major to throw, after confirming that this works for all supported OS versions.
+		console.error(
+			`[warn] Error while finding a device-type.json on the provided image path. Attempting to fetch from the API.`,
+		);
+	}
 	if (
 		manifest != null &&
 		manifest.slug !== deviceType &&
--- a/src/utils/qemu.ts
+++ b/src/utils/qemu.ts
@ -50,7 +50,7 @@ export function copyQemu(context: string, arch: string) {
 		.then(() => getQemuPath(arch))
 		.then(
 			(qemu) =>
-				new Promise(function (resolve, reject) {
+				new Promise<void>(function (resolve, reject) {
 					const read = fs.createReadStream(qemu);
 					const write = fs.createWriteStream(binPath);

--- a/tests/commands/os/configure.spec.ts
+++ b/tests/commands/os/configure.spec.ts
@ -22,6 +22,7 @@ import { runCommand } from '../../helpers';
 import { promisify } from 'util';
 import * as tmp from 'tmp';
 import type * as $imagefs from 'balena-image-fs';
+import * as stripIndent from 'common-tags/lib/stripIndent';

 tmp.setGracefulCleanup();
 const tmpNameAsync = promisify(tmp.tmpName);
@ -34,6 +35,7 @@ if (process.platform !== 'win32') {
 		let api: BalenaAPIMock;
 		let tmpDummyPath: string;
 		let tmpMatchingDtJsonPartitionPath: string;
+		let tmpNonMatchingDtJsonPartitionPath: string;

 		before(async function () {
 			// We conditionally import balena-image-fs, since when imported on top level then unrelated tests on win32 failed with:
@ -47,6 +49,48 @@ if (process.platform !== 'win32') {
 				'./tests/test-data/mock-jetson-nano-6.0.13.with-boot-partition-12.img',
 				tmpMatchingDtJsonPartitionPath,
 			);
+
+			tmpNonMatchingDtJsonPartitionPath = (await tmpNameAsync()) as string;
+			// Create an image with a device-type.json that mentions a non matching boot partition.
+			// We copy the pre-existing image and modify it, since including a separate one
+			// would add 18MB more to the repository.
+			await fs.copyFile(
+				'./tests/test-data/mock-jetson-nano-6.0.13.with-boot-partition-12.img',
+				tmpNonMatchingDtJsonPartitionPath,
+			);
+			await imagefs.interact(
+				tmpNonMatchingDtJsonPartitionPath,
+				12,
+				async (_fs) => {
+					const dtJson = JSON.parse(
+						await _fs.promises.readFile('/device-type.json', {
+							encoding: 'utf8',
+						}),
+					);
+					expect(dtJson).to.have.nested.property(
+						'configuration.config.partition',
+						12,
+					);
+					dtJson.configuration.config.partition = 999;
+					await _fs.promises.writeFile(
+						'/device-type.json',
+						JSON.stringify(dtJson),
+					);
+
+					await _fs.promises.writeFile(
+						'/os-release',
+						stripIndent`
+							ID="balena-os"
+							NAME="balenaOS"
+							VERSION="6.1.25"
+							VERSION_ID="6.1.25"
+							PRETTY_NAME="balenaOS 6.1.25"
+							DISTRO_CODENAME="kirkstone"
+							MACHINE="jetson-nano"
+							META_BALENA_VERSION="6.1.25"`,
+					);
+				},
+			);
 		});

 		beforeEach(() => {
@ -61,20 +105,20 @@ if (process.platform !== 'win32') {
 		after(async () => {
 			await fs.unlink(tmpDummyPath);
 			await fs.unlink(tmpMatchingDtJsonPartitionPath);
+			await fs.unlink(tmpNonMatchingDtJsonPartitionPath);
 		});

-		it('should inject a valid config.json file to an image with partition 12 as boot & matching device-type.json ', async () => {
+		it('should detect the OS version and inject a valid config.json file to a 6.0.13 image with partition 12 as boot & matching device-type.json', async () => {
 			api.expectGetApplication();
 			api.expectGetDeviceTypes();
-			// TODO: this shouldn't be necessary & the CLI should be able to find
+			// It should not reach to /config or /device-types/v1 but instead find
 			// everything required from the device-type.json in the image.
-			api.expectGetConfigDeviceTypes();
+			// api.expectGetConfigDeviceTypes();
 			api.expectDownloadConfig();

 			const command: string[] = [
 				`os configure ${tmpMatchingDtJsonPartitionPath}`,
 				'--device-type jetson-nano',
-				'--version 6.0.13',
 				'--fleet testApp',
 				'--config-app-update-poll-interval 10',
 				'--config-network ethernet',
@ -91,16 +135,65 @@ if (process.platform !== 'win32') {
 				tmpMatchingDtJsonPartitionPath,
 				12,
 				async (_fs) => {
-					const readFileAsync = promisify(_fs.readFile);
 					const dtJson = JSON.parse(
-						await readFileAsync('/device-type.json', { encoding: 'utf8' }),
+						await _fs.promises.readFile('/device-type.json', {
+							encoding: 'utf8',
+						}),
 					);
 					// confirm that the device-type.json mentions the expected partition
 					expect(dtJson).to.have.nested.property(
 						'configuration.config.partition',
 						12,
 					);
-					return await readFileAsync('/config.json');
+					return await _fs.promises.readFile('/config.json');
+				},
+			);
+			expect(config).to.not.be.empty;
+
+			// confirm the image has the correct config.json values...
+			const configObj = JSON.parse(config.toString('utf8'));
+			expect(configObj).to.have.property('deviceType', 'jetson-nano');
+			expect(configObj).to.have.property('initialDeviceName', 'testDeviceName');
+		});
+
+		it('should detect the OS version and inject a valid config.json file to a 6.1.25 image with partition 12 as boot & a non-matching device-type.json', async () => {
+			api.expectGetApplication();
+			api.expectGetDeviceTypes();
+			// It should not reach to /config or /device-types/v1 but instead find
+			// everything required from the device-type.json in the image.
+			// api.expectGetConfigDeviceTypes();
+			api.expectDownloadConfig();
+
+			const command: string[] = [
+				`os configure ${tmpNonMatchingDtJsonPartitionPath}`,
+				'--device-type jetson-nano',
+				'--fleet testApp',
+				'--config-app-update-poll-interval 10',
+				'--config-network ethernet',
+				'--initial-device-name testDeviceName',
+				'--provisioning-key-name testKey',
+				'--provisioning-key-expiry-date 2050-12-12',
+			];
+
+			const { err } = await runCommand(command.join(' '));
+			expect(err.join('')).to.equal('');
+
+			// confirm the image contains a config.json...
+			const config = await imagefs.interact(
+				tmpNonMatchingDtJsonPartitionPath,
+				12,
+				async (_fs) => {
+					const dtJson = JSON.parse(
+						await _fs.promises.readFile('/device-type.json', {
+							encoding: 'utf8',
+						}),
+					);
+					// confirm that the device-type.json mentions the expected partition
+					expect(dtJson).to.have.nested.property(
+						'configuration.config.partition',
+						999,
+					);
+					return await _fs.promises.readFile('/config.json');
 				},
 			);
 			expect(config).to.not.be.empty;
@ -134,11 +227,24 @@ if (process.platform !== 'win32') {
 			const { err } = await runCommand(command.join(' '));
 			// Once we replace the dummy.img with one that includes a os-release & device-type.json
 			// then we should be able to change this to expect no errors.
-			expect(err.join('')).to.equal('');
+			expect(
+				err.flatMap((line) => line.split('\n')).filter((line) => line !== ''),
+			).to.deep.equal(
+				stripIndent`
+					[warn] "${tmpDummyPath}":
+					[warn]   1 partition(s) found, but none containing file "/device-type.json".
+					[warn]   Assuming default boot partition number '1'.
+					[warn] "${tmpDummyPath}":
+					[warn]   Could not find a previous "/config.json" file in partition '1'.
+					[warn]   Proceeding anyway, but this is unexpected.
+					[warn] Error while finding a device-type.json on the provided image path. Attempting to fetch from the API.`.split(
+					'\n',
+				),
+			);

 			// confirm the image contains a config.json...
 			const config = await imagefs.interact(tmpDummyPath, 1, async (_fs) => {
-				return await promisify(_fs.readFile)('/config.json');
+				return await _fs.promises.readFile('/config.json');
 			});
 			expect(config).to.not.be.empty;

--- a/tests/utils/image-manager/image-manager.spec.ts
+++ b/tests/utils/image-manager/image-manager.spec.ts
@ -56,7 +56,7 @@ describe('image-manager', function () {
 					void imageManager.getStream('raspberry-pi').then(function (stream) {
 						let result = '';

-						stream.on('data', (chunk) => (result += chunk.toString()));
+						stream.on('data', (chunk: string) => (result += chunk.toString()));

 						return stream.on('end', function () {
 							expect(result).to.equal('Cache image');
@ -91,7 +91,7 @@ describe('image-manager', function () {
 						void imageManager.getStream('raspberry-pi').then((stream) => {
 							let result = '';

-							stream.on('data', (chunk) => (result += chunk));
+							stream.on('data', (chunk: string) => (result += chunk));

 							stream.on('end', async () => {
 								expect(result).to.equal('Download image');
@ -412,7 +412,7 @@ describe('image-manager', function () {
 					.then(function (stream) {
 						let result = '';

-						stream.on('data', (chunk: string) => (result += chunk));
+						stream.on('data', (chunk) => (result += chunk as string));

 						stream.on('end', function () {
 							expect(result).to.equal('Lorem ipsum dolor sit amet');
Author	SHA1	Message	Date
flowzone-app[bot]	72d6db796c	v20.2.6	2025-02-25 19:13:51 +00:00
balena-renovate[bot]	e848eb63ee	Merge pull request #2918 from balena-io/renovate/actions-upload-artifact-digest Update actions/upload-artifact digest to 4cec3d8	2025-02-25 19:12:56 +00:00
balena-renovate[bot]	6f0f7350cf	Update actions/upload-artifact digest to 4cec3d8 Update actions/upload-artifact Change-type: patch	2025-02-25 18:51:27 +00:00
flowzone-app[bot]	07a88c700e	v20.2.5	2025-02-25 18:10:50 +00:00
balena-renovate[bot]	9cae66bd92	Merge pull request #2913 from balena-io/renovate/actions-setup-node-digest Update actions/setup-node digest to 1d0ff46	2025-02-25 18:09:54 +00:00
balena-renovate[bot]	cddea24cef	Update actions/setup-node digest to 1d0ff46 Update actions/setup-node Change-type: patch	2025-02-25 17:45:52 +00:00
flowzone-app[bot]	b1c246c0b4	v20.2.4	2025-02-25 17:17:03 +00:00
Ken Bannister	00b4d57a03	Merge pull request #2916 from balena-io/pin_docker-modem_regression Pin docker-modem and dockerode to avoid regression in docker-modem v5.0.6	2025-02-25 12:16:10 -05:00
Ken Bannister	2cba82e914	Pin docker-modem and dockerode to avoid regression Change-type: patch Signed-off-by: Ken Bannister <kb2ma@runbox.com>	2025-02-24 20:22:59 -05:00
flowzone-app[bot]	1352c5c823	v20.2.3	2025-01-15 18:21:09 +00:00
flowzone-app[bot]	c86eb97010	Merge pull request #2910 from balena-io/clean-eslint Remove unused old eslint version files	2025-01-15 18:19:22 +00:00
Otavio Jacobi	53be743b9d	Remove unused old eslint version files Change-type: patch	2025-01-15 08:37:35 -03:00
flowzone-app[bot]	d9f21b4c3f	v20.2.2	2025-01-12 14:49:07 +00:00
Thodoris Greasidis	261ab398dd	Merge pull request #2906 from balena-io/bump-balena-image-fs Use the promises namespace of balena-image-fs	2025-01-12 16:48:08 +02:00
Thodoris Greasidis	f28a9992e4	Deduplicate dependencies	2025-01-09 23:33:54 +02:00
Thodoris Greasidis	29e7827eb1	Use the promises namespace of balena-image-fs Change-type: patch	2025-01-09 23:33:54 +02:00
Thodoris Greasidis	1d77cf3665	Update balena-device-init to 8.1.3 & balena-image-fs to 7.3.0 Update balena-device-init from 8.1.0 to 8.1.3 Update balena-image-fs from 7.0.6 to 7.3.0 Change-type: patch	2025-01-09 23:33:54 +02:00
flowzone-app[bot]	017c767f61	v20.2.1	2025-01-01 18:05:02 +00:00
Thodoris Greasidis	7d79c4e24b	Merge pull request #2905 from balena-io/update-balena-preload-17.0.0 Update balena-preload to 17.0.0	2025-01-01 20:04:01 +02:00
Thodoris Greasidis	60bc5092e0	Update balena-preload to 17.0.0 Update balena-preload from 16.0.0 to 17.0.0 Change-type: patch	2024-12-31 20:42:54 +02:00
flowzone-app[bot]	a33a794931	v20.2.0	2024-12-31 18:41:50 +00:00
Ken Bannister	f0ede6fca2	Merge pull request #2901 from balena-io/balena-device-init-v-8-1-0 os configure: Locate the boot partition w/o using the device-type.json's partition field	2024-12-31 10:40:54 -08:00
Thodoris Greasidis	dbe177e766	os configure: Give precedence to the boot partition located in the image over the device-type.json contents Update balena-device-init from 8.0.0 to 8.1.0 Change-type: minor	2024-12-31 19:48:11 +02:00
Thodoris Greasidis	09f80730a8	Deduplicate dependencies	2024-12-31 19:47:11 +02:00