Add completion folder to linter targets and fix linter issues

Change-type: patch

.gitattributes

@@ -6,7 +6,7 @@
 *.sh text eol=lf
 
 # lf for the docs as it's auto-generated and will otherwise trigger an uncommited error on windows
-docs/balena-cli.md text eol=lf
+doc/cli.markdown text eol=lf
 # crlf for the eol conversion test files
 tests/test-data/projects/docker-compose/basic/service2/file2-crlf.sh eol=crlf
 tests/test-data/projects/no-docker-compose/basic/src/windows-crlf.sh eol=crlf

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @balena-io/balena-cli

.github/ISSUE_TEMPLATE.md

@@ -32,11 +32,11 @@ Please describe what actually happened instead:
   Examples:
 
 ```
-balena push myFleet
+balena push myApp
 balena push 192.168.0.12
-balena deploy myFleet
-balena deploy myFleet --build
-balena build . -f myFleet
+balena deploy myApp
+balena deploy myApp --build
+balena build . -a myApp
 balena build . -A armv7hf -d raspberrypi3
 ```
 
@@ -48,7 +48,7 @@ additional information. The `--logs` option reveals additional information for t
 
 ```
 balena build . --logs
-balena deploy myFleet --build --logs
+balena deploy myApp --build --logs
 ```
 
 # Steps to Reproduce the Problem

.github/actions/publish/action.yml

@@ -1,134 +0,0 @@
----
-name: package and draft GitHub release
-# https://github.com/product-os/flowzone/tree/master/.github/actions
-inputs:
-  json:
-    description: 'JSON stringified object containing all the inputs from the calling workflow'
-    required: true
-  secrets:
-    description: 'JSON stringified object containing all the secrets from the calling workflow'
-    required: true
-  variables:
-    description: 'JSON stringified object containing all the variables from the calling workflow'
-    required: true
-
-  # --- custom environment
-  XCODE_APP_LOADER_EMAIL:
-    type: string
-    default: 'accounts+apple@balena.io'
-  NODE_VERSION:
-    type: string
-    default: '16.x'
-  VERBOSE:
-    type: string
-    default: 'true'
-
-runs:
-  # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
-  using: 'composite'
-  steps:
-    - name: Download custom source artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
-        path: ${{ runner.temp }}
-
-    - name: Extract custom source artifact
-      shell: pwsh
-      working-directory: .
-      run: tar -xf ${{ runner.temp }}/custom.tgz
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ inputs.NODE_VERSION }}
-        cache: npm
-
-    - name: Install additional tools
-      if: runner.os == 'Windows'
-      shell: bash
-      run: |
-        choco install yq
-
-    - name: Install additional tools
-      if: runner.os == 'macOS'
-      shell: bash
-      run: |
-        brew install coreutils
-
-    # https://www.electron.build/code-signing.html
-    # https://github.com/Apple-Actions/import-codesign-certs
-    - name: Import Apple code signing certificate
-      if: runner.os == 'macOS'
-      uses: apple-actions/import-codesign-certs@v1
-      with:
-        p12-file-base64: ${{ fromJSON(inputs.secrets).APPLE_SIGNING }}
-        p12-password: ${{ fromJSON(inputs.secrets).APPLE_SIGNING_PASSWORD }}
-
-    - name: Import Windows code signing certificate
-      if: runner.os == 'Windows'
-      shell: powershell
-      run: |
-        Set-Content -Path ${{ runner.temp }}/certificate.base64 -Value $env:WINDOWS_CERTIFICATE
-        certutil -decode ${{ runner.temp }}/certificate.base64 ${{ runner.temp }}/certificate.pfx
-        Remove-Item -path ${{ runner.temp }} -include certificate.base64
-
-        Import-PfxCertificate `
-          -FilePath ${{ runner.temp }}/certificate.pfx `
-          -CertStoreLocation Cert:\CurrentUser\My `
-          -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
-
-      env:
-        WINDOWS_CERTIFICATE: ${{ fromJSON(inputs.secrets).WINDOWS_SIGNING }}
-        WINDOWS_CERTIFICATE_PASSWORD: ${{ fromJSON(inputs.secrets).WINDOWS_SIGNING_PASSWORD }}
-
-    # https://github.com/product-os/scripts/tree/master/shared
-    # https://github.com/product-os/balena-concourse/blob/master/pipelines/github-events/template.yml
-    - name: Package release
-      shell: bash
-      run: |
-        set -ea
-
-        [[ '${{ inputs.VERBOSE }}' =~ on|On|Yes|yes|true|True ]] && set -x
-
-        runner_os="$(echo "${RUNNER_OS}" | tr '[:upper:]' '[:lower:]')"
-        runner_arch="$(echo "${RUNNER_ARCH}" | tr '[:upper:]' '[:lower:]')"
-
-        if [[ $runner_os =~ darwin|macos|osx ]]; then
-            CSC_KEY_PASSWORD=${{ fromJSON(inputs.secrets).APPLE_SIGNING_PASSWORD }}
-            CSC_KEYCHAIN=signing_temp
-            CSC_LINK=${{ fromJSON(inputs.secrets).APPLE_SIGNING }}
-
-        elif [[ $runner_os =~ windows|win ]]; then
-            CSC_KEY_PASSWORD=${{ fromJSON(inputs.secrets).WINDOWS_SIGNING_PASSWORD }}
-            CSC_LINK='${{ runner.temp }}\certificate.pfx'
-
-            # patches/all/oclif.patch
-            MSYSSHELLPATH="$(which bash)"
-            MSYSTEM=MSYS
-
-            # (signtool.exe) https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md#installed-windows-sdks
-            PATH="/c/Program Files (x86)/Windows Kits/10/bin/${runner_arch}:${PATH}"
-        fi
-
-        npm run package
-
-        find dist -type f -maxdepth 1
-
-      env:
-        # https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/#improvements-for-public-repository-forks
-        # https://docs.github.com/en/actions/managing-workflow-runs/approving-workflow-runs-from-public-forks#about-workflow-runs-from-public-forks
-        CSC_FOR_PULL_REQUEST: true
-        # https://sectigo.com/resource-library/time-stamping-server
-        TIMESTAMP_SERVER: http://timestamp.sectigo.com
-        # Apple notarization (automation/build-bin.ts)
-        XCODE_APP_LOADER_EMAIL: ${{ inputs.XCODE_APP_LOADER_EMAIL }}
-        XCODE_APP_LOADER_PASSWORD: ${{ fromJSON(inputs.secrets).XCODE_APP_LOADER_PASSWORD }}
-        XCODE_APP_LOADER_TEAM_ID: ${{ inputs.XCODE_APP_LOADER_TEAM_ID }}
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
-      with:
-        name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}
-        path: dist
-        retention-days: 1

.github/actions/test/action.yml

@@ -1,59 +0,0 @@
----
-name: test release
-# https://github.com/product-os/flowzone/tree/master/.github/actions
-inputs:
-  json:
-    description: "JSON stringified object containing all the inputs from the calling workflow"
-    required: true
-  secrets:
-    description: "JSON stringified object containing all the secrets from the calling workflow"
-    required: true
-  variables:
-    description: "JSON stringified object containing all the variables from the calling workflow"
-    required: true
-
-  # --- custom environment
-  NODE_VERSION:
-    type: string
-    default: '16.x'
-  VERBOSE:
-    type: string
-    default: "true"
-
-runs:
-  # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
-  using: "composite"
-  steps:
-    # https://github.com/actions/setup-node#caching-global-packages-data
-    - name: Setup Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ inputs.NODE_VERSION }}
-        cache: npm
-
-    - name: Test release
-      shell: bash
-      run: |
-        set -ea
-
-        [[ '${{ inputs.VERBOSE }}' =~ on|On|Yes|yes|true|True ]] && set -x
-
-        if [[ -e package-lock.json ]] || [[ -e npm-shrinkwrap.json ]]; then
-            npm ci
-        else
-            npm i
-        fi
-
-        npm run build
-        npm run test
-
-    - name: Compress custom source
-      shell: pwsh
-      run: tar -acf ${{ runner.temp }}/custom.tgz .
-
-    - name: Upload custom artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
-        path: ${{ runner.temp }}/custom.tgz
-        retention-days: 1

.github/workflows/flowzone.yml

@@ -1,29 +0,0 @@
-name: Flowzone
-
-on:
-  pull_request:
-    types: [opened, synchronize, closed]
-    branches: [main, master]
-  pull_request_target:
-    types: [opened, synchronize, closed]
-    branches: [main, master]
-
-jobs:
-  flowzone:
-    name: Flowzone
-    uses: product-os/flowzone/.github/workflows/flowzone.yml@v4.7.1
-    # prevent duplicate workflow executions for pull_request and pull_request_target
-    if: |
-      (
-        github.event.pull_request.head.repo.full_name == github.repository &&
-        github.event_name == 'pull_request'
-      ) || (
-        github.event.pull_request.head.repo.full_name != github.repository &&
-        github.event_name == 'pull_request_target'
-      )
-    secrets: inherit
-    with:
-      custom_runs_on: '[["self-hosted","Linux","distro:focal","X64"],["self-hosted","Linux","distro:focal","ARM64"],["macos-12"],["windows-2019"]]'
-      repo_config: true
-      repo_description: "The official balena CLI tool."
-      github_prerelease: false

.mocharc.js

@@ -1,10 +1,8 @@
 module.exports = {
+	spec: 'tests/commands/app/create.spec.ts',
 	reporter: 'spec',
 	require: 'ts-node/register/transpile-only',
 	file: './tests/config-tests',
 	timeout: 12000,
-	// To test only, say, 'push.spec.ts', do it as follows so that
-	// requests are authenticated:
-	// spec: ['tests/auth/*.spec.ts', 'tests/**/deploy.spec.ts'],
 	spec: 'tests/**/*.spec.ts',
 };

.resinci.yml

@@ -0,0 +1,17 @@
+---
+npm:
+  platforms:
+    - name: linux
+      os: ubuntu
+      architecture: x86_64
+      node_versions:
+        - "10"
+        - "12"
+        - "14"
+    - name: linux
+      os: alpine
+      architecture: x86_64
+      node_versions:
+        - "10"
+        - "12"
+        - "14"

CONTRIBUTING.md

@@ -105,12 +105,12 @@ npm run update balena-sdk ^13.0.0 major
 
 ## Editing documentation files (README, INSTALL, Reference website...)
 
-The `docs/balena-cli.md` file is automatically generated by running `npm run build:doc` (which also
+The `doc/cli.markdown` file is automatically generated by running `npm run build:doc` (which also
 runs as part of `npm run build`). That file is then pulled by scripts in the
 [balena-io/docs](https://github.com/balena-io/docs/) GitHub repo for publishing at the [CLI
 Documentation page](https://www.balena.io/docs/reference/cli/).
 
-The content sources for the auto generation of `docs/balena-cli.md` are:
+The content sources for the auto generation of `doc/cli.markdown` are:
 
 * [Selected
   sections](https://github.com/balena-io/balena-cli/blob/v12.23.0/automation/capitanodoc/capitanodoc.ts#L199-L204)
@@ -120,44 +120,11 @@ The content sources for the auto generation of `docs/balena-cli.md` are:
   * `lib/commands/env/add.ts`
 
 The README file is manually edited, but subsections are automatically extracted for inclusion in
-`docs/balena-cli.md` by the `getCapitanoDoc()` function in
+`doc/cli.markdown` by the `getCapitanoDoc()` function in
 [`automation/capitanodoc/capitanodoc.ts`](https://github.com/balena-io/balena-cli/blob/master/automation/capitanodoc/capitanodoc.ts).
 
 The `INSTALL*.md` and `TROUBLESHOOTING.md` files are also manually edited.
 
-## Patches folder
-
-The `patches` folder contains patch files created with the
-[patch-package](https://www.npmjs.com/package/patch-package) tool. Small code changes to
-third-party modules can be made by directly editing Javascript files under the `node_modules`
-folder and then running `patch-package` to create the patch files. The patch files are then
-applied immediately after `npm install`, through the `postinstall` script defined in
-`package.json`.
-
-The subfolders of the `patches` folder are documented in the
-[apply-patches.js](https://github.com/balena-io/balena-cli/blob/master/patches/apply-patches.js)
-script.
-
-To make changes to the patch files under the `patches` folder, **do not edit them directly,**
-not even for a "single character change" because the hash values in the patch files also need
-to be recomputed by `patch-packages`. Instead, edit the relevant files under `node_modules`
-directly, and then run `patch-packages` with the `--patch-dir` option to specify the subfolder
-where the patch should be saved. For example, edit `node_modules/exit-hook/index.js` and then
-run:
-
-```sh
-$ npx patch-package --patch-dir patches/all exit-hook
-```
-
-That said, these kinds of patches should be avoided in favour of creating pull requests
-upstream. Patch files create additional maintenance work over time as the patches need to be
-updated when the dependencies are updated, and they prevent the compounding community benefit
-that sharing fixes upstream have on open source projects like the balena CLI. The typical
-scenario where these patches are used is when the upstream maintainers are unresponsive or
-unwilling to merge the required fixes, the fixes are very small and specific to the balena CLI,
-and creating a fork of the upstream repo is likely to be more long-term effort than maintaining
-the patches.
-
 ## Windows
 
 Besides the regular npm installation dependencies, the `npm run build:installer` script
@@ -201,24 +168,6 @@ Optionally, these steps may be automated by installing the
 npx npm-merge-driver install -g
 ```
 
-## `fast-boot` and `npm link` - modifying the `node_modules` folder
-
-During development or debugging, it is sometimes useful to temporarily modify the `node_modules`
-folder (with or without making the respective changes to the `npm-shrinkwrap.json` file),
-replacing dependencies with different versions. This can be achieved with the `npm link`
-command, or by manually editing or copying files to the `node_modules` folder.
-
-Unexpected behavior may then be observed because of the CLI's use of the
-[fast-boot2](https://www.npmjs.com/package/fast-boot2) package that caches module resolution.
-`fast-boot2` is configured in `lib/fast-boot.ts` to automatically invalidate the cache if
-changes are made to the `package.json` or `npm-shrinkwrap.json` files, but the cache won't
-be automatically invalidated if `npm link` is used or if manual modifications are made to the
-`node_modules` folder. In this situation:
-
-* Manually delete the module cache file (typically `~/.balena/cli-module-cache.json`), or
-* Use the `bin/balena-dev` entry point (instead of `bin/balena`) as it does not activate
-  `fast-boot2`.
-
 ## TypeScript and oclif
 
 The CLI currently contains a mix of plain JavaScript and
@@ -292,11 +241,3 @@ gotchas to bear in mind:
   `node_modules/balena-sdk/node_modules/balena-errors`  
   In the case of subclasses of `TypedError`, a string comparison may be used instead:  
   `error.name === 'BalenaApplicationNotFound'`
-
-## Further debugging notes
-
-* If you need to selectively run specific tests, `it.only` will not work in cases when authorization is required as part of the test cycle.  In order to target specific tests, control execution via `.mocharc.js` instead.  Here is an example of targeting the `deploy` tests.
-
-	replace: `spec: 'tests/**/*.spec.ts',`
-
-	with: `spec: ['tests/auth/*.spec.ts', 'tests/**/deploy.spec.ts'],`

INSTALL-ADVANCED.md

@@ -76,48 +76,24 @@ as described above.
 
 If you are a Node.js developer, you may wish to install the balena CLI via [npm](https://www.npmjs.com).
 The npm installation involves building native (platform-specific) binary modules, which require
-some development tools to be installed first, as follows.
+some additional development tools to be installed first:
 
-> **The balena CLI currently requires Node.js version 16.**  
-> **Versions 17 and later are not yet fully supported.**
+* [Node.js](https://nodejs.org/) version 10 (min **10.20.0**) or 12 (version 14 is not yet fully supported)
+  * **Linux, macOS** and **Windows Subsystem for Linux (WSL):**  
+    Installing Node via [nvm](https://github.com/nvm-sh/nvm/blob/master/README.md) is recommended.
+    When the "system" or "default" Node.js and npm packages are installed with "apt-get" in Linux
+    distributions like Ubuntu, users often report permission or compilation errors when running
+    "npm install".
+* [Python 2.7](https://www.python.org/), [git](https://git-scm.com/), [make](https://www.gnu.org/software/make/), [g++](https://gcc.gnu.org/)
+  * **Linux** and **Windows Subsystem for Linux (WSL):**  
+    `sudo apt-get install -y python git make g++`
+  * **macOS:** install Apple's Command Line Tools by running on a Terminal window:  
+    `xcode-select --install`
 
-### Install development tools
+On **Windows (not WSL),** the dependencies above and additional ones can be met by installing:
 
-#### **Linux or WSL** (Windows Subsystem for Linux)
-
-```sh
-$ sudo apt-get update && sudo apt-get -y install curl python3 git make g++
-$ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
-$ . ~/.bashrc
-$ nvm install 16
-```
-
-The `curl` command line above uses
-[nvm](https://github.com/nvm-sh/nvm/blob/master/README.md#install--update-script) to install
-Node.js, instead of using `apt-get`. Installing Node.js through `apt-get` is a common source of
-problems from permission errors to conflict with other system packages, and therefore not
-recommended.
-
-#### **macOS**
-
-* Download and install Apple's Command Line Tools from https://developer.apple.com/downloads/
-* Install Node.js through [nvm](https://github.com/nvm-sh/nvm/blob/master/README.md#install--update-script):
-
-```sh
-$ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
-$ . ~/.bashrc
-$ nvm install 16
-```
-
-#### **Windows** (not WSL)
-
-Install:
-
-  * If you'd like the ability to switch between Node.js versions, install
-- Node.js v16 from the [Nodejs.org releases page](https://nodejs.org/en/download/releases/).
-    [nvm-windows](https://github.com/coreybutler/nvm-windows#node-version-manager-nvm-for-windows)
-    instead.
-* The [MSYS2 shell](https://www.msys2.org/), which provides `git`, `make`, `g++` and more:
+* Node.js from the [Nodejs.org download page](https://nodejs.org/en/download/).
+* The [MSYS2 shell](https://www.msys2.org/), which provides `git`, `make`, `g++`, `7z` and more:
   * `pacman -S git gcc make openssh p7zip`
   * [Set a Windows environment variable](https://www.onmsft.com/how-to/how-to-set-an-environment-variable-in-windows-10): `MSYS2_PATH_TYPE=inherit`
   * Note that a bug in the MSYS2 launch script (`msys2_shell.cmd`) makes text-based
@@ -125,23 +101,26 @@ Install:
     workaround](https://github.com/msys2/MINGW-packages/issues/1633#issuecomment-240583890).
 * The Windows Driver Kit (WDK), which is needed to compile some native Node modules. It is **not**
   necessary to install Visual Studio, only the WDK, which is "step 2" in the following guides:
-  * [WDK for Windows 10](https://docs.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk#download-icon-step-2-install-refreshed-wdk-for-windows-10-version-2004)
+  * [WDK for Windows 10](https://docs.microsoft.com/en-us/windows-hardware/drivers/download-the-wdk#download-icon-step-2-install-wdk-for-windows-10-version-1903)
   * [WDK for earlier versions of Windows](https://docs.microsoft.com/en-us/windows-hardware/drivers/other-wdk-downloads#step-2-install-the-wdk)
-* The [windows-build-tools](https://www.npmjs.com/package/windows-build-tools) npm package,
-  by running the following command on an [administrator
-  console](https://www.howtogeek.com/194041/how-to-open-the-command-prompt-as-administrator-in-windows-8.1/):  
-  `npm install --global --production windows-build-tools`
+* The [windows-build-tools](https://www.npmjs.com/package/windows-build-tools) npm package (which
+  provides Python 2.7 and more), by running the following command on an [administrator
+  console](https://www.howtogeek.com/194041/how-to-open-the-command-prompt-as-administrator-in-windows-8.1/):
+  
+  `npm install -g --production windows-build-tools`
 
-### Install the balena CLI
-
-After installing the development tools, install the balena CLI with:
+With these dependencies in place, the balena CLI installation command is:
 
 ```sh
-$ npm install balena-cli --global --production --unsafe-perm
+$ npm install balena-cli -g --production --unsafe-perm
 ```
 
-`--unsafe-perm` is needed when `npm install` is executed as the `root` user (e.g. in a Docker
-container) in order to allow npm scripts like `postinstall` to be executed.
+`--unsafe-perm` is required when `npm install` is executed as the root user, or on systems where
+the global install directory is not user-writable. It allows npm install steps to download and save
+prebuilt native binaries, and also allows the execution of npm scripts like `postinstall` that are
+used to patch dependencies. It is usually possible to omit `--unsafe-perm` if installing under a
+regular (non-root) user account, especially if using a user-managed node installation such as
+[nvm](https://github.com/creationix/nvm).
 
 ## Additional Dependencies
 
@@ -155,7 +134,7 @@ system:
 
 Where Docker or balenaEngine are required, they may be installed on the local machine (where the
 balena CLI is executed), on a remote server, or on a balenaOS device running a [balenaOS development
-image](https://www.balena.io/docs/reference/OS/overview/2.x/#dev-vs-prod-images). Reasons why this
+image](https://www.balena.io/docs/reference/OS/overview/2.x/#dev-vs-prod-images)). Reasons why this
 may be desirable include:
 
 * To avoid having to install Docker on the development machine / laptop.

INSTALL-LINUX.md

@@ -1,10 +1,6 @@
 # balena CLI Installation Instructions for Linux
 
-These instructions are suitable for most Linux distributions on Intel x86, such as
-Ubuntu, Debian, Fedora, Arch Linux and other glibc-based distributions.
-For the ARM architecture and for Linux distributions not based on glibc, such as
-Alpine Linux, follow the [NPM Installation](./INSTALL-ADVANCED.md#npm-installation)
-method.
+These instructions are suitable for most Linux distributions on Intel x86, except notably for **Linux Alpine** or **Busybox**. For these distros or for the ARM architecture, follow the [NPM Installation](./INSTALL-ADVANCED.md#npm-installation) method.
 
 Selected operating system: **Linux**
 

INSTALL-MAC.md

@@ -10,14 +10,16 @@ Selected operating system: **macOS**
    Look for a file name that ends with "-installer.pkg":  
    `balena-cli-vX.Y.Z-macOS-x64-installer.pkg`  
 
-2. Double click on the downloaded file to run the installer and follow the installer's
-   instructions.
+2. Double click the downloaded file to run the installer. After the installation completes,
+   close and re-open any open [command
+   terminal](https://www.balena.io/docs/reference/cli/#choosing-a-shell-command-promptterminal)
+   windows (so that the changes made by the installer to the PATH environment variable can take
+   effect).
 
-3. Check that the installation was successful:
-   - [Open the Terminal
-   app](https://support.apple.com/en-gb/guide/terminal/apd5265185d-f365-44cb-8b09-71a064a42125/mac).
-   - On the terminal prompt, type `balena version` and hit Enter. It should display
-     the version of the balena CLI that you have installed.
+3. Check that the installation was successful by running the following commands on a
+   command terminal:  
+   * `balena version` - should print the CLI's version
+   * `balena help` - should print a list of available commands
 
 No further steps are required to run most CLI commands. The `balena ssh`, `build`, `deploy`
 and `preload` commands may require additional software to be installed, as described

INSTALL-WINDOWS.md

@@ -10,14 +10,16 @@ Selected operating system: **Windows**
    Look for a file name that ends with "-installer.exe":  
    `balena-cli-vX.Y.Z-windows-x64-installer.exe`  
 
-2. Double click on the downloaded file to run the installer and follow the installer's
-   instructions.
+2. Double click the downloaded file to run the installer. After the installation completes,
+   close and re-open any open [command
+   terminal](https://www.balena.io/docs/reference/cli/#choosing-a-shell-command-promptterminal)
+   windows (so that the changes made by the installer to the PATH environment variable can take
+   effect).
 
-3. Check that the installation was successful:
-   - Click on the Windows Start Menu, type PowerShell, and then click
-     on Windows PowerShell.
-   - On the command prompt, type `balena version` and hit Enter. It should display
-     the version of the balena CLI that you have installed.
+3. Check that the installation was successful by running the following commands on a
+   command terminal:  
+   * `balena version` - should print the CLI's version
+   * `balena help` - should print a list of available commands
 
 No further steps are required to run most CLI commands. The `balena ssh`, `scan`, `build`,
 `deploy` and `preload` commands may require additional software to be installed, as

README.md

@@ -50,14 +50,14 @@ are supported. Alternative shells include:
 
 On **macOS** and **Linux,** the standard terminal window is supported. Optionally, `bash` command
 auto completion may be enabled by copying the
-[balena_comp](https://github.com/balena-io/balena-cli/blob/master/completion/balena-completion.bash)
+[balena-completion.bash](https://github.com/balena-io/balena-cli/blob/master/balena-completion.bash)
 file to your system's `bash_completion` directory: check [Docker's command completion
 guide](https://docs.docker.com/compose/completion/) for system setup instructions.
 
 ## Logging in
 
 Several CLI commands require access to your balenaCloud account, for example in order to push a
-new release to your fleet. Those commands require creating a CLI login session by running:
+new release to your application. Those commands require creating a CLI login session by running:
 
 ```sh
 $ balena login
@@ -144,7 +144,7 @@ To learn more, troubleshoot issues, or to contact us for support:
 
 * Check the [masterclass tutorials](https://www.balena.io/docs/learn/more/masterclasses/overview/)
 * Check our [FAQ / troubleshooting document](https://github.com/balena-io/balena-cli/blob/master/TROUBLESHOOTING.md)
-* Ask us a question in the [balena forums](https://forums.balena.io/c/product-support)
+* Ask us a question through the [balenaCloud forum](https://forums.balena.io/c/balena-cloud)
 
 For CLI bug reports or feature requests, check the
 [CLI GitHub issues](https://github.com/balena-io/balena-cli/issues/).
@@ -156,18 +156,14 @@ of major, minor and patch version releases.
 
 The latest release of a major version of the balena CLI will remain compatible with
 the balenaCloud backend services for at least one year from the date when the
-following major version is released. For example, balena CLI v11.36.0, as the
-latest v11 release, would remain compatible with the balenaCloud backend for one
-year from the date when v12.0.0 was released.
+following major version is released. For example, balena CLI v10.17.5, as the
+latest v10 release, would remain compatible with the balenaCloud backend for one
+year from the date when v11.0.0 is released.
 
-Half way through to that period (6 months after the release of the next major
-version), older major versions of the balena CLI will start printing a deprecation
-warning message when it is used interactively (when `stderr` is attached to a TTY
-device file). At the end of that period, older major versions will exit with an
-error message unless the `--unsupported` flag is used.  This behavior was
-introduced in CLI version 12.47.0 and is also documented by `balena help`.
-To take advantage of the latest backend features and ensure compatibility, users
-are encouraged to regularly update the balena CLI to the latest version.
+At the end of this period, the older major version is considered deprecated and
+some of the functionality that depends on balenaCloud services may stop working
+at any time.
+Users are encouraged to regularly update the balena CLI to the latest version.
 
 ## Contributing (including editing documentation files)
 

TROUBLESHOOTING.md

@@ -31,11 +31,6 @@ command again.
 
 Check whether the SD card is locked (a physical switch on the side of the card).
 
-## I get `connect ETIMEDOUT` with `balena tunnel`
-
-Please update the CLI to the latest version. This issue was fixed in v12.38.5.
-For more details, see: https://github.com/balena-io/balena-cli/issues/2172
-
 ## I get EINVAL errors on Cygwin
 
 The errors may look something like this:

automation/build-bin.ts

@@ -17,34 +17,35 @@
 
 import type { JsonVersions } from '../lib/commands/version';
 
-import { run as oclifRun } from 'oclif';
+import { run as oclifRun } from '@oclif/dev-cli';
 import * as archiver from 'archiver';
 import * as Bluebird from 'bluebird';
 import { execFile } from 'child_process';
 import * as filehound from 'filehound';
-import { Stats } from 'fs';
 import * as fs from 'fs-extra';
-import * as klaw from 'klaw';
 import * as _ from 'lodash';
 import * as path from 'path';
 import * as rimraf from 'rimraf';
 import * as semver from 'semver';
-import { promisify } from 'util';
+import * as util from 'util';
+import * as klaw from 'klaw';
+import { Stats } from 'fs';
 
-import { stripIndent } from '../build/utils/lazy';
+import { stripIndent } from '../lib/utils/lazy';
 import {
 	diffLines,
+	getSubprocessStdout,
 	loadPackageJson,
 	ROOT,
 	StdOutTap,
 	whichSpawn,
 } from './utils';
 
-const execFileAsync = promisify(execFile);
-
 export const packageJSON = loadPackageJson();
 export const version = 'v' + packageJSON.version;
 const arch = process.arch;
+const MSYS2_BASH =
+	process.env.MSYSSHELLPATH || 'C:\\msys64\\usr\\bin\\bash.exe';
 
 function dPath(...paths: string[]) {
 	return path.join(ROOT, 'dist', ...paths);
@@ -62,7 +63,7 @@ const standaloneZips: PathByPlatform = {
 
 const oclifInstallers: PathByPlatform = {
 	darwin: dPath('macos', `balena-${version}.pkg`),
-	win32: dPath('win32', `balena-${version}-${arch}.exe`),
+	win32: dPath('win', `balena-${version}-${arch}.exe`),
 };
 
 const renamedOclifInstallers: PathByPlatform = {
@@ -87,14 +88,13 @@ async function diffPkgOutput(pkgOut: string) {
 		'tests',
 		'test-data',
 		'pkg',
-		`expected-warnings-${process.platform}-${arch}.txt`,
+		`expected-warnings-${process.platform}.txt`,
 	);
 	const absSavedPath = path.join(ROOT, relSavedPath);
 	const ignoreStartsWith = [
 		'> pkg@',
 		'> Fetching base Node.js binaries',
 		'  fetched-',
-		'prebuild-install WARN install No prebuilt binaries found',
 	];
 	const modulesRE =
 		process.platform === 'win32'
@@ -180,18 +180,9 @@ async function execPkg(...args: any[]) {
  * to be directly executed from inside another binary executable.)
  */
 async function buildPkg() {
-	// https://github.com/vercel/pkg#targets
-	let targets = `linux-${arch}`;
-	// TBC: not possible to build for macOS or Windows arm64 on x64 nodes
-	if (process.platform === 'darwin') {
-		targets = `macos-x64`;
-	}
-	if (process.platform === 'win32') {
-		targets = `win-x64`;
-	}
 	const args = [
-		'--targets',
-		targets,
+		'--target',
+		'host',
 		'--output',
 		'build-bin/balena',
 		'package.json',
@@ -255,17 +246,7 @@ async function testPkg() {
 	console.log(`Testing standalone package "${pkgBalenaPath}"...`);
 	// Run `balena version -j`, parse its stdout as JSON, and check that the
 	// reported Node.js major version matches semver.major(process.version)
-	let { stdout, stderr } = await execFileAsync(pkgBalenaPath, [
-		'version',
-		'-j',
-	]);
-	const { filterCliOutputForTests } = await import('../tests/helpers');
-	const filtered = filterCliOutputForTests({
-		err: stderr.split(/\r?\n/),
-		out: stdout.split(/\r?\n/),
-	});
-	stdout = filtered.out.join('\n');
-	stderr = filtered.err.join('\n');
+	const stdout = await getSubprocessStdout(pkgBalenaPath, ['version', '-j']);
 	let pkgNodeVersion = '';
 	let pkgNodeMajorVersion = 0;
 	try {
@@ -282,10 +263,6 @@ async function testPkg() {
 			`Mismatched major version: built-in pkg Node version="${pkgNodeVersion}" vs process.version="${process.version}"`,
 		);
 	}
-	if (filtered.err.length > 0) {
-		const err = filtered.err.join('\n');
-		throw new Error(`"${pkgBalenaPath}": non-empty stderr "${err}"`);
-	}
 	console.log('Success! (standalone package test successful)');
 }
 
@@ -318,7 +295,7 @@ async function zipPkg() {
 		archive.on('warning', console.warn);
 
 		archive.pipe(outputStream);
-		archive.finalize().catch(reject);
+		archive.finalize();
 	});
 }
 
@@ -330,10 +307,6 @@ async function signFilesForNotarization() {
 				if (!item.stats.isFile()) {
 					return;
 				}
-				if (path.basename(item.path).endsWith('.node.bak')) {
-					console.log('Removing pkg .node.bak file', item.path);
-					fs.unlinkSync(item.path);
-				}
 				if (
 					path.basename(item.path).endsWith('.zip') &&
 					path.dirname(item.path).includes('test')
@@ -432,28 +405,22 @@ async function renameInstallerFiles() {
 
 /**
  * If the CSC_LINK and CSC_KEY_PASSWORD env vars are set, digitally sign the
- * executable installer using Microsoft SignTool.exe (Sign Tool)
- * https://learn.microsoft.com/en-us/dotnet/framework/tools/signtool-exe
+ * executable installer by running the balena-io/scripts/shared/sign-exe.sh
+ * script (which must be in the PATH) using a MSYS2 bash shell.
  */
 async function signWindowsInstaller() {
 	if (process.env.CSC_LINK && process.env.CSC_KEY_PASSWORD) {
 		const exeName = renamedOclifInstallers[process.platform];
+		const execFileAsync = util.promisify<string, string[], void>(execFile);
+
 		console.log(`Signing installer "${exeName}"`);
-		// trust ...
-		await execFileAsync('signtool.exe', [
-			'sign',
-			'-t',
-			process.env.TIMESTAMP_SERVER || 'http://timestamp.comodoca.com',
+		await execFileAsync(MSYS2_BASH, [
+			'sign-exe.sh',
 			'-f',
-			process.env.CSC_LINK,
-			'-p',
-			process.env.CSC_KEY_PASSWORD,
+			exeName,
 			'-d',
 			`balena-cli ${version}`,
-			exeName,
 		]);
-		// ... but verify
-		await execFileAsync('signtool.exe', ['verify', '-pa', '-v', exeName]);
 	} else {
 		console.log(
 			'Skipping installer signing step because CSC_* env vars are not set',
@@ -465,26 +432,18 @@ async function signWindowsInstaller() {
  * Wait for Apple Installer Notarization to continue
  */
 async function notarizeMacInstaller(): Promise<void> {
-	const teamId = process.env.XCODE_APP_LOADER_TEAM_ID || '66H43P8FRG';
-	const appleId =
-		process.env.XCODE_APP_LOADER_EMAIL || 'accounts+apple@balena.io';
-	const appleIdPassword = process.env.XCODE_APP_LOADER_PASSWORD;
-
-	if (appleIdPassword && teamId) {
-		const { notarize } = await import('@electron/notarize');
-		// https://github.com/electron/notarize#readme
-		await notarize({
-			tool: 'notarytool',
-			teamId,
-			appPath: renamedOclifInstallers.darwin,
-			appleId,
-			appleIdPassword,
-		});
-	}
+	const appleId = 'accounts+apple@balena.io';
+	const { notarize } = await import('electron-notarize');
+	await notarize({
+		appBundleId: 'io.balena.etcher',
+		appPath: renamedOclifInstallers.darwin,
+		appleId,
+		appleIdPassword: '@keychain:CLI_PASSWORD',
+	});
 }
 
 /**
- * Run the `oclif pack:win` or `pack:macos` command (depending on the value
+ * Run the `oclif-dev pack:win` or `pack:macos` command (depending on the value
  * of process.platform) to generate the native installers (which end up under
  * the 'dist' folder). There are some harcoded options such as selecting only
  * 64-bit binaries under Windows.
@@ -514,7 +473,7 @@ export async function buildOclifInstaller() {
 			await signFilesForNotarization();
 		}
 		console.log('=======================================================');
-		console.log(`oclif "${packCmd}" "${packOpts.join('" "')}"`);
+		console.log(`oclif-dev "${packCmd}" "${packOpts.join('" "')}"`);
 		console.log(`cwd="${process.cwd()}" ROOT="${ROOT}"`);
 		console.log('=======================================================');
 		await oclifRun([packCmd].concat(...packOpts));

automation/capitanodoc/capitanodoc.ts

@@ -34,15 +34,15 @@ const capitanoDoc = {
 			files: ['build/commands/api-key/generate.js'],
 		},
 		{
-			title: 'Fleet',
+			title: 'Application',
 			files: [
-				'build/commands/fleets.js',
-				'build/commands/fleet/index.js',
-				'build/commands/fleet/create.js',
-				'build/commands/fleet/purge.js',
-				'build/commands/fleet/rename.js',
-				'build/commands/fleet/restart.js',
-				'build/commands/fleet/rm.js',
+				'build/commands/apps.js',
+				'build/commands/app/index.js',
+				'build/commands/app/create.js',
+				'build/commands/app/purge.js',
+				'build/commands/app/rename.js',
+				'build/commands/app/restart.js',
+				'build/commands/app/rm.js',
 			],
 		},
 		{
@@ -75,14 +75,6 @@ const capitanoDoc = {
 				'build/commands/device/shutdown.js',
 			],
 		},
-		{
-			title: 'Releases',
-			files: [
-				'build/commands/releases.js',
-				'build/commands/release/index.js',
-				'build/commands/release/finalize.js',
-			],
-		},
 		{
 			title: 'Environment Variables',
 			files: [

automation/capitanodoc/index.ts

@@ -58,7 +58,7 @@ class FakeHelpCommand {
 
 	examples = [
 		'$ balena help',
-		'$ balena help login',
+		'$ balena help apps',
 		'$ balena help os download',
 	];
 
@@ -86,7 +86,7 @@ function importOclifCommands(jsFilename: string): OclifCommand[] {
 
 	const command: OclifCommand =
 		jsFilename === 'help'
-			? (new FakeHelpCommand() as unknown as OclifCommand)
+			? ((new FakeHelpCommand() as unknown) as OclifCommand)
 			: (require(path.join(process.cwd(), jsFilename)).default as OclifCommand);
 
 	return [command];
@@ -101,9 +101,8 @@ async function printMarkdown() {
 		console.log(await renderMarkdown());
 	} catch (error) {
 		console.error(error);
-		process.exitCode = 1;
+		process.exit(1);
 	}
 }
 
-// tslint:disable-next-line:no-floating-promises
 printMarkdown();

automation/check-doc.js

@@ -15,25 +15,24 @@
  * limitations under the License.
  */
 
-// tslint:disable-next-line:import-blacklist
-import { stripIndent } from 'common-tags';
-import * as _ from 'lodash';
-import { promises as fs } from 'fs';
-import * as path from 'path';
-import { simpleGit } from 'simple-git';
+const stripIndent = require('common-tags/lib/stripIndent');
+const _ = require('lodash');
+const { promises: fs } = require('fs');
+const path = require('path');
+const simplegit = require('simple-git/promise');
 
 const ROOT = path.normalize(path.join(__dirname, '..'));
 
 /**
- * Compare the timestamp of balena-cli.md with the timestamp of staged files,
- * issuing an error if balena-cli.md is older.
- * If balena-cli.md does not require updating and the developer cannot run
+ * Compare the timestamp of cli.markdown with the timestamp of staged files,
+ * issuing an error if cli.markdown is older.
+ * If cli.markdown does not require updating and the developer cannot run
  * `npm run build` on their laptop, the error message suggests a workaround
  * using `touch`.
  */
 async function checkBuildTimestamps() {
-	const git = simpleGit(ROOT);
-	const docFile = path.join(ROOT, 'docs', 'balena-cli.md');
+	const git = simplegit(ROOT);
+	const docFile = path.join(ROOT, 'doc', 'cli.markdown');
 	const [docStat, gitStatus] = await Promise.all([
 		fs.stat(docFile),
 		git.status(),
@@ -82,5 +81,4 @@ async function run() {
 	}
 }
 
-// tslint:disable-next-line:no-floating-promises
 run();

automation/check-npm-version.js

@@ -6,8 +6,6 @@
  *
  * We don't `require('semver')` to allow this script to be run as a npm
  * 'preinstall' hook, at which point no dependencies have been installed.
- *
- * @param {string} version
  */
 function parseSemver(version) {
 	const match = /v?(\d+)\.(\d+).(\d+)/.exec(version);
@@ -18,10 +16,6 @@ function parseSemver(version) {
 	return [parseInt(major, 10), parseInt(minor, 10), parseInt(patch, 10)];
 }
 
-/**
- * @param {string} v1
- * @param {string} v2
- */
 function semverGte(v1, v2) {
 	let v1Array = parseSemver(v1);
 	let v2Array = parseSemver(v2);
@@ -47,25 +41,17 @@ function checkNpmVersion() {
 		// the reason is that it would unnecessarily prevent end users from
 		// using npm v6.4.1 that ships with Node 8.  (It is OK for the
 		// shrinkwrap file to get damaged if it is not going to be reused.)
-		throw new Error(`\
------------------------------------------------------------------------------
+		console.error(`\
+-------------------------------------------------------------------------------
 Error: npm version '${npmVersion}' detected. Please upgrade to npm v${requiredVersion} or later
 because of a bug that causes the 'npm-shrinkwrap.json' file to be damaged.
 At this point, however, your 'npm-shrinkwrap.json' file has already been
 damaged. Please revert it to the master branch state with a command such as:
 "git checkout master -- npm-shrinkwrap.json"
 Then re-run "npm install" using npm version ${requiredVersion} or later.
------------------------------------------------------------------------------`);
+-------------------------------------------------------------------------------`);
+		process.exit(1);
 	}
 }
 
-function main() {
-	try {
-		checkNpmVersion();
-	} catch (e) {
-		console.error(e.message || e);
-		process.exitCode = 1;
-	}
-}
-
-main();
+checkNpmVersion();

automation/deploy-bin.ts

@@ -54,18 +54,17 @@ export async function release() {
 	try {
 		await createGitHubRelease();
 	} catch (err) {
-		throw new Error(`Error creating GitHub release:\n${err}`);
+		console.error('Release failed');
+		console.error(err);
+		process.exit(1);
 	}
 }
 
 /** Return a cached Octokit instance, creating a new one as needed. */
 const getOctokit = _.once(function () {
-	const Octokit = (
-		require('@octokit/rest') as typeof import('@octokit/rest')
-	).Octokit.plugin(
-		(
-			require('@octokit/plugin-throttling') as typeof import('@octokit/plugin-throttling')
-		).throttling,
+	const Octokit = (require('@octokit/rest') as typeof import('@octokit/rest')).Octokit.plugin(
+		(require('@octokit/plugin-throttling') as typeof import('@octokit/plugin-throttling'))
+			.throttling,
 	);
 	return new Octokit({
 		auth: GITHUB_TOKEN,
@@ -111,8 +110,7 @@ function getPageNumbers(
 	if (!response.headers.link) {
 		return res;
 	}
-	const parse =
-		require('parse-link-header') as typeof import('parse-link-header');
+	const parse = require('parse-link-header') as typeof import('parse-link-header');
 	const parsed = parse(response.headers.link);
 	if (parsed == null) {
 		throw new Error(`Failed to parse link header: '${response.headers.link}'`);
@@ -160,14 +158,11 @@ async function updateGitHubReleaseDescriptions(
 		per_page: perPage,
 	});
 	let errCount = 0;
-	type Release =
-		import('@octokit/rest').RestEndpointMethodTypes['repos']['listReleases']['response']['data'][0];
-	for await (const response of octokit.paginate.iterator<Release>(options)) {
-		const {
-			page: thisPage,
-			pages: totalPages,
-			ordinal,
-		} = getPageNumbers(response, perPage);
+	for await (const response of octokit.paginate.iterator(options)) {
+		const { page: thisPage, pages: totalPages, ordinal } = getPageNumbers(
+			response,
+			perPage,
+		);
 		let i = 0;
 		for (const cliRelease of response.data) {
 			const prefix = `[#${ordinal + i++} pg ${thisPage}/${totalPages}]`;

automation/run.ts

@@ -35,6 +35,11 @@ process.env.DEBUG = ['0', 'no', 'false', '', undefined].includes(
 	? ''
 	: '1';
 
+function exitWithError(error: Error | string): never {
+	console.error(`Error: ${error}`);
+	process.exit(1);
+}
+
 /**
  * Trivial command-line parser. Check whether the command-line argument is one
  * of the following strings, then call the appropriate functions:
@@ -44,12 +49,12 @@ process.env.DEBUG = ['0', 'no', 'false', '', undefined].includes(
  *
  * @param args Arguments to parse (default is process.argv.slice(2))
  */
-async function parse(args?: string[]) {
+export async function run(args?: string[]) {
 	args = args || process.argv.slice(2);
-	console.error(`[debug] automation/run.ts process.argv=[${process.argv}]`);
-	console.error(`[debug] automation/run.ts args=[${args}]`);
+	console.log(`automation/run.ts process.argv=[${process.argv}]\n`);
+	console.log(`automation/run.ts args=[${args}]`);
 	if (_.isEmpty(args)) {
-		throw new Error('missing command-line arguments');
+		return exitWithError('missing command-line arguments');
 	}
 	const commands: { [cmd: string]: () => void | Promise<void> } = {
 		'build:installer': buildOclifInstaller,
@@ -61,7 +66,7 @@ async function parse(args?: string[]) {
 	};
 	for (const arg of args) {
 		if (!commands.hasOwnProperty(arg)) {
-			throw new Error(`command unknown: ${arg}`);
+			return exitWithError(`command unknown: ${arg}`);
 		}
 	}
 
@@ -85,23 +90,9 @@ async function parse(args?: string[]) {
 			const cmdFunc = commands[arg];
 			await cmdFunc();
 		} catch (err) {
-			if (typeof err === 'object') {
-				err.message = `"${arg}": ${err.message}`;
-			}
-			throw err;
+			return exitWithError(`"${arg}": ${err}`);
 		}
 	}
 }
 
-/** See jsdoc for parse() function above */
-export async function run(args?: string[]) {
-	try {
-		await parse(args);
-	} catch (e) {
-		console.error(e.message ? `Error: ${e.message}` : e);
-		process.exitCode = 1;
-	}
-}
-
-// tslint:disable-next-line:no-floating-promises
 run();

automation/update-module.ts

@@ -11,7 +11,8 @@ const validateChangeType = (maybeChangeType: string = 'minor') => {
 		case 'major':
 			return maybeChangeType;
 		default:
-			throw new Error(`Invalid change type: '${maybeChangeType}'`);
+			console.error(`Invalid change type: '${maybeChangeType}'`);
+			return process.exit(1);
 	}
 };
 
@@ -36,8 +37,8 @@ const run = async (cmd: string) => {
 			}
 			resolve({ stdout, stderr });
 		});
-		p.stdout?.pipe(process.stdout);
-		p.stderr?.pipe(process.stderr);
+		p.stdout.pipe(process.stdout);
+		p.stderr.pipe(process.stderr);
 	});
 };
 
@@ -64,17 +65,24 @@ const getUpstreams = async () => {
 	return upstream;
 };
 
-const getUsage = (upstreams: Upstream[], upstreamName: string) => `
+const printUsage = (upstreams: Upstream[], upstreamName: string) => {
+	console.error(
+		`
 Usage: npm run update ${upstreamName} $version [$changeType=minor]
 
 Upstream names: ${upstreams.map(({ repo }) => repo).join(', ')}
-`;
+`,
+	);
+	return process.exit(1);
+};
 
-async function $main() {
+// TODO: Drop the wrapper function once we move to TS 3.8,
+// which will support top level await.
+async function main() {
 	const upstreams = await getUpstreams();
 
 	if (process.argv.length < 3) {
-		throw new Error(getUsage(upstreams, '$upstreamName'));
+		return printUsage(upstreams, '$upstreamName');
 	}
 
 	const upstreamName = process.argv[2];
@@ -82,15 +90,16 @@ async function $main() {
 	const upstream = upstreams.find((v) => v.repo === upstreamName);
 
 	if (!upstream) {
-		throw new Error(
+		console.error(
 			`Invalid upstream name '${upstreamName}', valid options: ${upstreams
 				.map(({ repo }) => repo)
 				.join(', ')}`,
 		);
+		return process.exit(1);
 	}
 
 	if (process.argv.length < 4) {
-		throw new Error(getUsage(upstreams, upstreamName));
+		printUsage(upstreams, upstreamName);
 	}
 
 	const packageName = upstream.module || upstream.repo;
@@ -99,7 +108,8 @@ async function $main() {
 	await run(`npm install ${packageName}@${process.argv[3]}`);
 	const newVersion = await getVersion(packageName);
 	if (newVersion === oldVersion) {
-		throw new Error(`Already on version '${newVersion}'`);
+		console.error(`Already on version '${newVersion}'`);
+		return process.exit(1);
 	}
 
 	console.log(`Updated ${upstreamName} from ${oldVersion} to ${newVersion}`);
@@ -127,14 +137,4 @@ async function $main() {
 	);
 }
 
-async function main() {
-	try {
-		await $main();
-	} catch (e) {
-		console.error(e);
-		process.exitCode = 1;
-	}
-}
-
-// tslint:disable-next-line:no-floating-promises
 main();

automation/utils.ts

@@ -21,6 +21,22 @@ import * as path from 'path';
 
 export const ROOT = path.join(__dirname, '..');
 
+const nodeEngineWarn = `\
+------------------------------------------------------------------------------
+Warning: Node version "v14.x.x" does not match required versions ">=10.20.0 <13.0.0".
+This may cause unexpected behavior. To upgrade Node, visit:
+https://nodejs.org/en/download/
+------------------------------------------------------------------------------
+`;
+const nodeEngineWarnArray = nodeEngineWarn.split('\n').filter((l) => l);
+
+export function matchesNodeEngineVersionWarn(line: string) {
+	line = line.replace(/"v14\.\d{1,3}\.\d{1,3}"/, '"v14.x.x"');
+	return (
+		line === nodeEngineWarn || nodeEngineWarnArray.includes(line.trimEnd())
+	);
+}
+
 /** Tap and buffer this process' stdout and stderr */
 export class StdOutTap {
 	public stdoutBuf: string[] = [];
@@ -88,6 +104,60 @@ export function loadPackageJson() {
 	return require(path.join(ROOT, 'package.json'));
 }
 
+/**
+ * Run the executable at execPath as a child process, and resolve a promise
+ * to the executable's stdout output as a string. Reject the promise if
+ * anything is printed to stderr, or if the child process exits with a
+ * non-zero exit code.
+ * @param execPath Executable path
+ * @param args Command-line argument for the executable
+ */
+export async function getSubprocessStdout(
+	execPath: string,
+	args: string[],
+): Promise<string> {
+	const child = spawn(execPath, args);
+	return new Promise((resolve, reject) => {
+		let stdout = '';
+		child.stdout.on('error', reject);
+		child.stderr.on('error', reject);
+		child.stdout.on('data', (data: Buffer) => {
+			try {
+				stdout = data.toString();
+			} catch (err) {
+				reject(err);
+			}
+		});
+		child.stderr.on('data', (data: Buffer) => {
+			try {
+				const stderr = data.toString();
+
+				// ignore any debug lines, but ensure that we parse
+				// every line provided to the stderr stream
+				const lines = _.filter(
+					stderr.trim().split(/\r?\n/),
+					(line) =>
+						!line.startsWith('[debug]') && !matchesNodeEngineVersionWarn(line),
+				);
+				if (lines.length > 0) {
+					reject(
+						new Error(`"${execPath}": non-empty stderr "${lines.join('\n')}"`),
+					);
+				}
+			} catch (err) {
+				reject(err);
+			}
+		});
+		child.on('exit', (code: number) => {
+			if (code) {
+				reject(new Error(`"${execPath}": non-zero exit code "${code}"`));
+			} else {
+				resolve(stdout);
+			}
+		});
+	});
+}
+
 /**
  * Error handling wrapper around the npm `which` package:
  * "Like the unix which utility. Finds the first instance of a specified
@@ -117,7 +187,7 @@ export async function which(program: string): Promise<string> {
  */
 export async function whichSpawn(
 	programName: string,
-	args: string[] = [],
+	args?: string[],
 ): Promise<void> {
 	const program = await which(programName);
 	let error: Error | undefined;

bin/balena

@@ -9,15 +9,14 @@ process.env.UV_THREADPOOL_SIZE = '64';
 // Disable oclif registering ts-node
 process.env.OCLIF_TS_NODE = 0;
 
-async function run() {
-	// Use fast-boot to cache require lookups, speeding up startup
-	await require('../build/fast-boot').start();
+// Use fast-boot to cache require lookups, speeding up startup
+require('fast-boot2').start({
+	cacheScope: __dirname + '/..',
+	cacheFile: __dirname + '/.fast-boot.json',
+});
 
-	// Set the desired es version for downstream modules that support it
-	require('@balena/es-version').set('es2018');
+// Set the desired es version for downstream modules that support it
+require('@balena/es-version').set('es2018');
 
-	// Run the CLI
-	await require('../build/app').run();
-}
-
-run();
+// Run the CLI
+require('../build/app').run();

bin/balena-dev

@@ -11,22 +11,6 @@
 // operations otherwise, if the pool runs out.
 process.env.UV_THREADPOOL_SIZE = '64';
 
-// Note on `fast-boot2`: We do not use `fast-boot2` with `balena-dev` because:
-// * fast-boot2's cacheKiller option is configured to include the timestamps of
-//   the package.json and npm-shrinkwrap.json files, to avoid unexpected CLI
-//   behavior when changes are made to dependencies during development. This is
-//   generally a good thing, however, `balena-dev` (a few lines below) edits
-//   `package.json` to modify oclif paths, and this results in cache
-//   invalidation and a performance hit rather than speedup.
-// * Even if the timestamps are removed from cacheKiller, so that there is no
-//   cache invalidation, fast-boot's speedup is barely noticeable when ts-node
-//   is used, e.g. 1.43s vs 1.4s when running `balena version`.
-// * `fast-boot` causes unexpected behavior when used with `npm link` or
-//   when the `node_modules` folder is manually modified (affecting transitive
-//   dependencies) during development (e.g. bug investigations). A workaround
-//   is to use `balena-dev` without `fast-boot`. See also notes in
-//   `CONTRIBUTING.md`.
-
 const path = require('path');
 const rootDir = path.join(__dirname, '..');
 
@@ -47,6 +31,12 @@ process.on('SIGINT', function () {
 	process.exit();
 });
 
+// Use fast-boot to cache require lookups, speeding up startup
+require('fast-boot2').start({
+	cacheScope: __dirname + '/..',
+	cacheFile: '.fast-boot.json',
+});
+
 // Set the desired es version for downstream modules that support it
 require('@balena/es-version').set('es2018');
 

completion/balena_bash_template

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#TEMPLATE FILE FOR BASH COMPLETION#
-
 _balena_complete()
 {
   local cur prev

completion/balena_zsh_template

@@ -1,8 +1,6 @@
 #compdef balena
 #autoload
 
-#TEMPLATE FILE FOR ZSH COMPLETION#
-
 _balena() {
   typeset -A opt_args
   local context state line curcontext="$curcontext"
@@ -28,7 +26,7 @@ _balena_main_cmds() {
 (( $+functions[_balena_sec_cmds] )) ||
 _balena_sec_cmds() {
   case $line[1] in
-$sub_cmds_prev$
+    $sub_cmds_prev$
   esac
 }
 

completion/bash/balena_comp

@@ -1,27 +1,22 @@
 #!/bin/bash
 
-#GENERATED FILE DON'T MODIFY#
-
 _balena_complete()
 {
   local cur prev
 
   # Valid top-level completions
-  main_commands="build deploy envs fleets join keys leave login logout logs note orgs preload push releases scan settings ssh support tags tunnel version whoami api-key api-keys app block config device device devices env fleet fleet internal key key local os release release tag util"
+  main_commands="apps build deploy envs join keys leave login logout logs note orgs preload push scan settings ssh support tags tunnel version whoami api-key app app config device device devices env internal key key local os tag util"
   # Sub-completions
-  api_key_cmds="generate revoke"
-  app_cmds="create"
-  block_cmds="create"
+  api_key_cmds="generate"
+  app_cmds="create purge rename restart rm"
   config_cmds="generate inject read reconfigure write"
-  device_cmds="deactivate identify init local-mode move os-update pin public-url purge reboot register rename restart rm shutdown track-fleet"
+  device_cmds="deactivate identify init local-mode move os-update public-url purge reboot register rename restart rm shutdown"
   devices_cmds="supported"
   env_cmds="add rename rm"
-  fleet_cmds="create pin purge rename restart rm track-latest"
   internal_cmds="osinit"
   key_cmds="add rm"
   local_cmds="configure flash"
   os_cmds="build-config configure download initialize versions"
-  release_cmds="finalize invalidate validate"
   tag_cmds="rm set"
 
 
@@ -42,9 +37,6 @@ _balena_complete()
       app)
         COMPREPLY=( $(compgen -W "$app_cmds" -- $cur) )
         ;;
-      block)
-        COMPREPLY=( $(compgen -W "$block_cmds" -- $cur) )
-        ;;
       config)
         COMPREPLY=( $(compgen -W "$config_cmds" -- $cur) )
         ;;
@@ -57,9 +49,6 @@ _balena_complete()
       env)
         COMPREPLY=( $(compgen -W "$env_cmds" -- $cur) )
         ;;
-      fleet)
-        COMPREPLY=( $(compgen -W "$fleet_cmds" -- $cur) )
-        ;;
       internal)
         COMPREPLY=( $(compgen -W "$internal_cmds" -- $cur) )
         ;;
@@ -72,9 +61,6 @@ _balena_complete()
       os)
         COMPREPLY=( $(compgen -W "$os_cmds" -- $cur) )
         ;;
-      release)
-        COMPREPLY=( $(compgen -W "$release_cmds" -- $cur) )
-        ;;
       tag)
         COMPREPLY=( $(compgen -W "$tag_cmds" -- $cur) )
         ;;

completion/completion.bash

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+_BALENA_COMPLETION_DIR=$(builtin cd "`dirname "${BASH_SOURCE[0]}"`" > /dev/null && pwd)
+source "$_BALENA_COMPLETION_DIR/bash/balena_comp"

completion/completion.zsh

@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+_BALENA_COMPLETION_DIR=$(builtin cd -q "`dirname "$0"`" > /dev/null && pwd)
+fpath+=$_BALENA_COMPLETION_DIR/zsh/
+
+

completion/generate-completion.js

@@ -47,27 +47,13 @@ for (const key of Object.keys(commandsJson.commands)) {
 const mainCommandsStr = mainCommands.join(' ');
 
 // GENERATE BASH COMPLETION FILE
-bashFilePathIn = path.join(__dirname, '/templates/bash.template');
-bashFilePathOut = path.join(__dirname, 'balena-completion.bash');
-
-try {
-	fs.unlinkSync(bashFilePathOut);
-} catch (error) {
-	process.exitCode = 1;
-	return console.error(error);
-}
-
+bashFilePathIn = path.join(__dirname, 'balena_bash_template');
+bashFilePathOut = path.join(__dirname, 'bash/balena_comp');
 fs.readFile(bashFilePathIn, 'utf8', function (err, data) {
 	if (err) {
 		process.exitCode = 1;
 		return console.error(err);
 	}
-
-	data = data.replace(
-		'#TEMPLATE FILE FOR BASH COMPLETION#',
-		"#GENERATED FILE DON'T MODIFY#",
-	);
-
 	data = data.replace(
 		/\$main_commands\$/g,
 		'main_commands="' + mainCommandsStr + '"',
@@ -109,27 +95,13 @@ fs.readFile(bashFilePathIn, 'utf8', function (err, data) {
 });
 
 // GENERATE ZSH COMPLETION FILE
-zshFilePathIn = path.join(__dirname, '/templates/zsh.template');
-zshFilePathOut = path.join(__dirname, '_balena');
-
-try {
-	fs.unlinkSync(zshFilePathOut);
-} catch (error) {
-	process.exitCode = 1;
-	return console.error(error);
-}
-
+zshFilePathIn = path.join(__dirname, 'balena_zsh_template');
+zshFilePathOut = path.join(__dirname, 'zsh/_balena');
 fs.readFile(zshFilePathIn, 'utf8', function (err, data) {
 	if (err) {
 		process.exitCode = 1;
 		return console.error(err);
 	}
-
-	data = data.replace(
-		'#TEMPLATE FILE FOR ZSH COMPLETION#',
-		"#GENERATED FILE DON'T MODIFY#",
-	);
-
 	data = data.replace(
 		/\$main_commands\$/g,
 		'main_commands=( ' + mainCommandsStr + ' )',

completion/zsh/_balena

@@ -1,28 +1,23 @@
 #compdef balena
 #autoload
 
-#GENERATED FILE DON'T MODIFY#
-
 _balena() {
   typeset -A opt_args
   local context state line curcontext="$curcontext"
 
   # Valid top-level completions
-  main_commands=( build deploy envs fleets join keys leave login logout logs note orgs preload push releases scan settings ssh support tags tunnel version whoami api-key api-keys app block config device device devices env fleet fleet internal key key local os release release tag util )
+  main_commands=( apps build deploy envs join keys leave login logout logs note orgs preload push scan settings ssh support tags tunnel version whoami api-key app app config device device devices env internal key key local os tag util )
   # Sub-completions
-  api_key_cmds=( generate revoke )
-  app_cmds=( create )
-  block_cmds=( create )
+  api_key_cmds=( generate )
+  app_cmds=( create purge rename restart rm )
   config_cmds=( generate inject read reconfigure write )
-  device_cmds=( deactivate identify init local-mode move os-update pin public-url purge reboot register rename restart rm shutdown track-fleet )
+  device_cmds=( deactivate identify init local-mode move os-update public-url purge reboot register rename restart rm shutdown )
   devices_cmds=( supported )
   env_cmds=( add rename rm )
-  fleet_cmds=( create pin purge rename restart rm track-latest )
   internal_cmds=( osinit )
   key_cmds=( add rm )
   local_cmds=( configure flash )
   os_cmds=( build-config configure download initialize versions )
-  release_cmds=( finalize invalidate validate )
   tag_cmds=( rm set )
 
 
@@ -42,15 +37,12 @@ _balena_main_cmds() {
 (( $+functions[_balena_sec_cmds] )) ||
 _balena_sec_cmds() {
   case $line[1] in
-      "api-key")
+          "api-key")
         _describe -t api_key_cmds 'api-key_cmd' api_key_cmds "$@" && ret=0
       ;;
       "app")
         _describe -t app_cmds 'app_cmd' app_cmds "$@" && ret=0
       ;;
-      "block")
-        _describe -t block_cmds 'block_cmd' block_cmds "$@" && ret=0
-      ;;
       "config")
         _describe -t config_cmds 'config_cmd' config_cmds "$@" && ret=0
       ;;
@@ -63,9 +55,6 @@ _balena_sec_cmds() {
       "env")
         _describe -t env_cmds 'env_cmd' env_cmds "$@" && ret=0
       ;;
-      "fleet")
-        _describe -t fleet_cmds 'fleet_cmd' fleet_cmds "$@" && ret=0
-      ;;
       "internal")
         _describe -t internal_cmds 'internal_cmd' internal_cmds "$@" && ret=0
       ;;
@@ -78,9 +67,6 @@ _balena_sec_cmds() {
       "os")
         _describe -t os_cmds 'os_cmd' os_cmds "$@" && ret=0
       ;;
-      "release")
-        _describe -t release_cmds 'release_cmd' release_cmds "$@" && ret=0
-      ;;
       "tag")
         _describe -t tag_cmds 'tag_cmd' tag_cmds "$@" && ret=0
       ;;

doc/automated-init.md

@@ -0,0 +1,112 @@
+# Provisioning balena devices in automated (non-interactive) mode
+
+This document describes how to run the `device init` command in non-interactive mode.
+
+It requires collecting some preliminary information _once_.
+
+The final command to provision the device looks like this:
+
+```bash
+balena device init --app APP_ID --os-version OS_VERSION --drive DRIVE --config CONFIG_FILE --yes
+
+```
+
+You can run this command as many times as you need, putting the new medium (SD card / USB stick) each time.
+
+But before you can run it you need to collect the parameters and build the configuration file. Keep reading to figure out how to do it.
+
+
+## Collect all the required parameters.
+
+1. `DEVICE_TYPE`. Run
+	```bash
+	balena devices supported
+	```
+	and find the _slug_ for your target device type, like _raspberrypi3_.
+
+1. `APP_ID`. Create an application (`balena app create APP_NAME --type DEVICE_TYPE`) or find an existing one (`balena apps`) and notice its ID.
+
+1. `OS_VERSION`. Run
+	```bash
+	balena os versions DEVICE_TYPE
+	```
+	and pick the version that you need, like _v2.0.6+rev1.prod_.
+	_Note_ that even though we support _semver ranges_ it's recommended to use the exact version when doing the automated provisioning as it
+	guarantees full compatibility between the steps.
+
+1. `DRIVE`. Plug in your target medium (SD card or the USB stick, depending on your device type) and run
+	```bash
+	balena util available-drives
+	```
+	and get the drive name, like _/dev/sdb_ or _/dev/mmcblk0_.
+	The balena CLI will not display the system drives to protect you,
+	but still please check very carefully that you've picked the correct drive as it will be erased during the provisioning process.
+
+Now we have all the parameters -- time to build the config file.
+
+## Build the config file
+
+Interactive device provisioning process often includes collecting some extra device configuration, like the networking mode and wifi credentials.
+
+To skip this interactive step we need to buid this configuration once and save it to the JSON file for later reuse.
+
+Let's say we will place it into the `CONFIG_FILE` path, like _./balena-os/raspberrypi3-config.json_.
+
+We also need to put the OS image somewhere, let's call this path `OS_IMAGE_PATH`, it can be something like _./balena-os/raspberrypi3-v2.0.6+rev1.prod.img_.
+
+1. First we need to download the OS image once. That's needed for building the config, and will speedup the subsequent operations as the downloaded OS image is placed into the local cache.
+
+	Run:
+	```bash
+	balena os download DEVICE_TYPE --output OS_IMAGE_PATH --version OS_VERSION
+	```
+
+1. Now we're ready to build the config:
+
+	```bash
+	balena os build-config OS_IMAGE_PATH DEVICE_TYPE --output CONFIG_FILE
+	```
+
+	This will run you through the interactive configuration wizard and in the end save the generated config as `CONFIG_FILE`. You can then verify it's not empty:
+
+	```bash
+	cat CONFIG_FILE
+	```
+
+## Done
+
+Now you're ready to run the command in the beginning of this guide.
+
+Please note again that all of these steps only need to be done once (unless you need to change something), and once all the parameters are collected the main init command can be run unchanged.
+
+But there are still some nuances to cover, please read below. 
+
+## Nuances
+
+### `sudo` password on *nix systems
+
+In order to write the image to the raw device we need the root permissions, this is unavoidable.
+
+To improve the security we only run the minimal subcommand with `sudo`.
+
+This means that with the default setup you're interrupted closer to the end of the device init process to enter your sudo password for this subcommand to work.
+
+There are several ways to eliminate it and make the process fully non-interactive.
+
+#### Option 1: make passwordless sudo.
+
+Obviously you shouldn't do that if the machine you're working on has access to any sensitive resources or information.
+
+But if you're using a machine dedicated to balena provisioning this can be fine, and also the simplest thing to do.
+
+#### Option 2: `NOPASSWD` directive
+
+You can configure the `balena` CLI command to be sudo-runnable without the password. Check [this post](https://askubuntu.com/questions/159007/how-do-i-run-specific-sudo-commands-without-a-password) for an example.
+
+### Extra initialization config
+
+As of June 2017 all the supported devices should not require any other interactive configuration.
+
+But by the design of our system it is _possible_ (though it doesn't look very likely it's going to happen any time soon) that some extra initialization options may be requested for the specific device types.
+
+If that is the case please raise the issue in the balena CLI repository and the maintainers will add the necessary options to build the similar JSON config for this step.

gulpfile.js

@@ -0,0 +1,15 @@
+const gulp = require('gulp');
+const inlinesource = require('gulp-inline-source');
+
+const OPTIONS = {
+	files: {
+		pages: 'lib/auth/pages/*.ejs',
+	},
+};
+
+gulp.task('pages', () =>
+	gulp
+		.src(OPTIONS.files.pages)
+		.pipe(inlinesource())
+		.pipe(gulp.dest('build/auth/pages')),
+);

lib/app.ts

@@ -16,14 +16,8 @@
  */
 
 import * as packageJSON from '../package.json';
-import {
-	AppOptions,
-	checkDeletedCommand,
-	preparseArgs,
-	unsupportedFlag,
-} from './preparser';
 import { CliSettings } from './utils/bootstrap';
-import { onceAsync } from './utils/lazy';
+import { onceAsync, stripIndent } from './utils/lazy';
 
 /**
  * Sentry.io setup
@@ -33,7 +27,6 @@ export const setupSentry = onceAsync(async () => {
 	const config = await import('./config');
 	const Sentry = await import('@sentry/node');
 	Sentry.init({
-		autoSessionTracking: false,
 		dsn: config.sentryDsn,
 		release: packageJSON.version,
 	});
@@ -50,8 +43,13 @@ export const setupSentry = onceAsync(async () => {
 async function checkNodeVersion() {
 	const validNodeVersions = packageJSON.engines.node;
 	if (!(await import('semver')).satisfies(process.version, validNodeVersions)) {
-		const { getNodeEngineVersionWarn } = await import('./utils/messages');
-		console.warn(getNodeEngineVersionWarn(process.version, validNodeVersions));
+		console.warn(stripIndent`
+			------------------------------------------------------------------------------
+			Warning: Node version "${process.version}" does not match required versions "${validNodeVersions}".
+			This may cause unexpected behavior. To upgrade Node, visit:
+			https://nodejs.org/en/download/
+			------------------------------------------------------------------------------
+			`);
 	}
 }
 
@@ -77,13 +75,11 @@ export function setMaxListeners(maxListeners: number) {
 /** Selected CLI initialization steps */
 async function init() {
 	if (process.env.BALENARC_NO_SENTRY) {
-		if (process.env.DEBUG) {
-			console.error(`WARN: disabling Sentry.io error reporting`);
-		}
+		console.error(`WARN: disabling Sentry.io error reporting`);
 	} else {
 		await setupSentry();
 	}
-	await checkNodeVersion();
+	checkNodeVersion();
 
 	const settings = new CliSettings();
 
@@ -93,70 +89,43 @@ async function init() {
 	setupBalenaSdkSharedOptions(settings);
 
 	// check for CLI updates once a day
-	if (!process.env.BALENARC_OFFLINE_MODE) {
-		(await import('./utils/update')).notify();
-	}
+	(await import('./utils/update')).notify();
 }
 
 /** Execute the oclif parser and the CLI command. */
-async function oclifRun(command: string[], options: AppOptions) {
-	let deprecationPromise: Promise<void>;
-	// check and enforce the CLI's deprecation policy
-	if (unsupportedFlag || process.env.BALENARC_UNSUPPORTED) {
-		deprecationPromise = Promise.resolve();
-	} else {
-		const { DeprecationChecker } = await import('./deprecation');
-		const deprecationChecker = new DeprecationChecker(packageJSON.version);
-		// warnAndAbortIfDeprecated uses previously cached data only
-		await deprecationChecker.warnAndAbortIfDeprecated();
-		// checkForNewReleasesIfNeeded may query the npm registry
-		deprecationPromise = deprecationChecker.checkForNewReleasesIfNeeded();
-	}
-
-	const runPromise = (async function (shouldFlush: boolean) {
-		const { CustomMain } = await import('./utils/oclif-utils');
-		let isEEXIT = false;
-		try {
-			await CustomMain.run(command);
-		} catch (error) {
-			// oclif sometimes exits with ExitError code EEXIT 0 (not an error),
-			// for example the `balena help` command.
+async function oclifRun(
+	command: string[],
+	options: import('./preparser').AppOptions,
+) {
+	const { CustomMain } = await import('./utils/oclif-utils');
+	const runPromise = CustomMain.run(command).then(
+		() => {
+			if (!options.noFlush) {
+				return require('@oclif/command/flush');
+			}
+		},
+		(error) => {
+			// oclif sometimes exits with ExitError code 0 (not an error)
 			// (Avoid `error instanceof ExitError` here for the reasons explained
 			// in the CONTRIBUTING.md file regarding the `instanceof` operator.)
 			if (error.oclif?.exit === 0) {
-				isEEXIT = true;
+				return;
 			} else {
 				throw error;
 			}
-		}
-		if (shouldFlush) {
-			await import('@oclif/command/flush');
-		}
-		// TODO: figure out why we need to call fast-boot stop() here, in
-		// addition to calling it in the main `run()` function in this file.
-		// If it is not called here as well, there is a process exit delay of
-		// 1 second when the fast-boot2 cache is modified (1 second is the
-		// default cache saving timeout). Try for example `balena help`.
-		// I have found that, when oclif's `Error: EEXIT: 0` is caught in
-		// the try/catch block above, execution does not get past the
-		// Promise.all() call below, but I don't understand why.
-		if (isEEXIT) {
-			(await import('./fast-boot')).stop();
-		}
-	})(!options.noFlush);
-
+		},
+	);
 	const { trackPromise } = await import('./hooks/prerun/track');
-
-	await Promise.all([trackPromise, deprecationPromise, runPromise]);
+	await Promise.all([trackPromise, runPromise]);
 }
 
 /** CLI entrypoint. Called by the `bin/balena` and `bin/balena-dev` scripts. */
-export async function run(cliArgs = process.argv, options: AppOptions = {}) {
+export async function run(
+	cliArgs = process.argv,
+	options: import('./preparser').AppOptions = {},
+) {
 	try {
-		const { setOfflineModeEnvVars, normalizeEnvVars, pkgExec } = await import(
-			'./utils/bootstrap'
-		);
-		setOfflineModeEnvVars();
+		const { normalizeEnvVars, pkgExec } = await import('./utils/bootstrap');
 		normalizeEnvVars();
 
 		// The 'pkgExec' special/internal command provides a Node.js interpreter
@@ -167,6 +136,8 @@ export async function run(cliArgs = process.argv, options: AppOptions = {}) {
 
 		await init();
 
+		const { preparseArgs, checkDeletedCommand } = await import('./preparser');
+
 		// Look for commands that have been removed and if so, exit with a notice
 		checkDeletedCommand(cliArgs.slice(2));
 
@@ -175,13 +146,6 @@ export async function run(cliArgs = process.argv, options: AppOptions = {}) {
 	} catch (err) {
 		await (await import('./errors')).handleError(err);
 	} finally {
-		try {
-			(await import('./fast-boot')).stop();
-		} catch (e) {
-			if (process.env.DEBUG) {
-				console.error(`[debug] Stopping fast-boot: ${e}`);
-			}
-		}
 		// Windows fix: reading from stdin prevents the process from exiting
 		process.stdin.pause();
 	}

lib/auth/index.ts

@@ -56,7 +56,7 @@ export async function login({ host = '127.0.0.1', port = 0 }) {
 
 	console.info(`Opening web browser for URL:\n${loginUrl}`);
 	const open = await import('open');
-	await open(loginUrl, { wait: false });
+	open(loginUrl, { wait: false });
 
 	const balena = getBalenaSdk();
 	const token = await loginServer.awaitForToken();

lib/auth/server.ts

@@ -59,15 +59,14 @@ export class LoginServer extends EventEmitter {
 		app.set('views', path.join(__dirname, 'pages'));
 
 		this.server = await new Promise<import('net').Server>((resolve, reject) => {
-			const callback = (err: Error) => {
+			const server = app.listen(port, host, (err: Error) => {
 				if (err) {
 					this.emit('error', err);
 					reject(err);
 				} else {
 					resolve(server);
 				}
-			};
-			const server = app.listen(port, host, callback as any);
+			});
 			server.on('connection', (socket) => this.serverSockets.push(socket));
 		});
 

lib/auth/utils.ts

@@ -14,44 +14,57 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import * as _ from 'lodash';
+import * as url from 'url';
 import { getBalenaSdk } from '../utils/lazy';
 
 /**
- * Get dashboard CLI login URL
+ * @summary Get dashboard CLI login URL
+ * @function
+ * @protected
  *
- * @param callbackUrl - Callback url, e.g. 'http://127.0.0.1:3000'
- * @returns Dashboard login URL, e.g.:
- * 'https://dashboard.balena-cloud.com/login/cli/http%253A%252F%252F127.0.0.1%253A59581%252Fauth'
+ * @param {String} callbackUrl - callback url
+ * @fulfil {String} - dashboard login url
+ * @returns {Promise}
+ *
+ * @example
+ * utils.getDashboardLoginURL('http://127.0.0.1:3000').then (url) ->
+ * 	console.log(url)
  */
-export async function getDashboardLoginURL(
-	callbackUrl: string,
-): Promise<string> {
+export const getDashboardLoginURL = (callbackUrl: string) => {
 	// Encode percentages signs from the escaped url
 	// characters to avoid angular getting confused.
 	callbackUrl = encodeURIComponent(callbackUrl).replace(/%/g, '%25');
 
-	const [{ URL }, dashboardUrl] = await Promise.all([
-		import('url'),
-		getBalenaSdk().settings.get('dashboardUrl'),
-	]);
-	return new URL(`/login/cli/${callbackUrl}`, dashboardUrl).href;
-}
+	return getBalenaSdk()
+		.settings.get('dashboardUrl')
+		.then((dashboardUrl) =>
+			url.resolve(dashboardUrl, `/login/cli/${callbackUrl}`),
+		);
+};
 
 /**
- * Log in using a token, but only if the token is valid.
+ * @summary Log in using a token, but only if the token is valid
+ * @function
+ * @protected
  *
+ * @description
  * This function checks that the token is not only well-structured
  * but that it also authenticates with the server successfully.
  *
  * If authenticated, the token is persisted, if not then the previous
  * login state is restored.
  *
- * @param token - session token or api key
- * @returns whether the login was successful or not
+ * @param {String} token - session token or api key
+ * @fulfil {Boolean} - whether the login was successful or not
+ * @returns {Promise}
+ *
+ * utils.loginIfTokenValid('...').then (loggedIn) ->
+ *   if loggedIn
+ *     console.log('Token is valid!')
  */
-export async function loginIfTokenValid(token?: string): Promise<boolean> {
-	token = (token || '').trim();
-	if (!token) {
+export const loginIfTokenValid = async (token: string): Promise<boolean> => {
+	if (_.isEmpty(token?.trim())) {
 		return false;
 	}
 	const balena = getBalenaSdk();
@@ -73,4 +86,4 @@ export async function loginIfTokenValid(token?: string): Promise<boolean> {
 		}
 	}
 	return isLoggedIn;
-}
+};

lib/command.ts

@@ -16,12 +16,7 @@
  */
 
 import Command from '@oclif/command';
-import {
-	InsufficientPrivilegesError,
-	NotAvailableInOfflineModeError,
-} from './errors';
-import { stripIndent } from './utils/lazy';
-import * as output from './framework/output';
+import { InsufficientPrivilegesError } from './errors';
 
 export default abstract class BalenaCommand extends Command {
 	/**
@@ -45,13 +40,6 @@ export default abstract class BalenaCommand extends Command {
 	 */
 	public static authenticated = false;
 
-	/**
-	 * Require an internet connection to run.
-	 * When set to true, command will exit with an error
-	 * if user is running in offline mode (BALENARC_OFFLINE_MODE).
-	 */
-	public static offlineCompatible = false;
-
 	/**
 	 * Accept piped input.
 	 * When set to true, command will read from stdin during init
@@ -109,29 +97,6 @@ export default abstract class BalenaCommand extends Command {
 		}
 	}
 
-	/**
-	 * Throw NotAvailableInOfflineModeError if in offline mode.
-	 *
-	 * Called automatically if `onlineOnly=true`.
-	 * Can be called explicitly by command implementation, if e.g.:
-	 *  - check should only be done conditionally
-	 *  - other code needs to execute before check
-	 *
-	 *  Note, currently public to allow use outside of derived commands
-	 *  (as some command implementations require this. Can be made protected
-	 *  if this changes).
-	 *
-	 * @throws {NotAvailableInOfflineModeError}
-	 */
-	public static checkNotUsingOfflineMode() {
-		if (process.env.BALENARC_OFFLINE_MODE) {
-			throw new NotAvailableInOfflineModeError(stripIndent`
-		This command requires an internet connection, and cannot be used in offline mode.
-		To leave offline mode, unset the BALENARC_OFFLINE_MODE environment variable.
-		`);
-		}
-	}
-
 	/**
 	 * Read stdin contents and make available to command.
 	 *
@@ -160,15 +125,8 @@ export default abstract class BalenaCommand extends Command {
 			await BalenaCommand.checkLoggedIn();
 		}
 
-		if (!ctr.offlineCompatible) {
-			BalenaCommand.checkNotUsingOfflineMode();
-		}
-
 		if (ctr.readStdin) {
 			await this.getStdin();
 		}
 	}
-
-	protected outputMessage = output.outputMessage;
-	protected outputData = output.outputData;
 }

lib/commands/api-key/revoke.ts

@@ -1,80 +0,0 @@
-/**
- * @license
- * Copyright 2016-2020 Balena Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { flags } from '@oclif/command';
-import Command from '../../command';
-import * as cf from '../../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../../utils/lazy';
-
-interface FlagsDef {
-	help: void;
-}
-
-interface ArgsDef {
-	ids: string;
-}
-
-export default class RevokeCmd extends Command {
-	public static description = stripIndent`
-		Revoke balenaCloud API keys.
-
-		Revoke balenaCloud API keys with the given
-		comma-separated list of ids.
-
-		The given balenaCloud API keys will no longer be usable.
-`;
-	public static examples = [
-		'$ balena api-key revoke 123',
-		'$ balena api-key revoke 123,124,456',
-	];
-
-	public static args = [
-		{
-			name: 'ids',
-			description: 'the API key ids',
-			required: true,
-		},
-	];
-
-	public static usage = 'api-key revoke <ids>';
-
-	public static flags: flags.Input<FlagsDef> = {
-		help: cf.help,
-	};
-
-	public static authenticated = true;
-
-	public async run() {
-		const { args: params } = this.parse<FlagsDef, ArgsDef>(RevokeCmd);
-
-		try {
-			const apiKeyIds = params.ids.split(',');
-			if (apiKeyIds.filter((apiKeyId) => !apiKeyId.match(/^\d+$/)).length > 0) {
-				console.log('API key ids must be positive integers');
-				return;
-			}
-			await Promise.all(
-				apiKeyIds.map(
-					async (id) => await getBalenaSdk().models.apiKey.revoke(Number(id)),
-				),
-			);
-			console.log('Successfully revoked the given API keys');
-		} catch (e) {
-			throw e;
-		}
-	}
-}

lib/commands/api-keys/index.ts

@@ -1,95 +0,0 @@
-/**
- * @license
- * Copyright 2016-2020 Balena Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { flags } from '@oclif/command';
-import Command from '../../command';
-import * as cf from '../../utils/common-flags';
-import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
-
-interface FlagsDef {
-	help: void;
-	user?: void;
-	fleet?: string;
-}
-
-export default class ApiKeysCmd extends Command {
-	public static description = stripIndent`
-		Print a list of balenaCloud API keys.
-
-		Print a list of balenaCloud API keys.
-
-		Print a list of balenaCloud API keys for the current user or for a specific fleet with the \`--fleet\` option.
-`;
-	public static examples = ['$ balena api-keys'];
-
-	public static args = [];
-
-	public static usage = 'api-keys';
-
-	public static flags: flags.Input<FlagsDef> = {
-		help: cf.help,
-		user: flags.boolean({
-			char: 'u',
-			description: 'show API keys for your user',
-		}),
-		fleet: cf.fleet,
-	};
-
-	public static authenticated = true;
-
-	public async run() {
-		const { flags: options } = this.parse<FlagsDef, {}>(ApiKeysCmd);
-
-		try {
-			const { getApplication } = await import('../../utils/sdk');
-			const actorId = options.fleet
-				? (
-						await getApplication(getBalenaSdk(), options.fleet, {
-							$select: 'actor',
-						})
-				  ).actor
-				: await getBalenaSdk().auth.getUserActorId();
-			const keys = await getBalenaSdk().pine.get({
-				resource: 'api_key',
-				options: {
-					$select: ['id', 'created_at', 'name', 'description', 'expiry_date'],
-					$filter: {
-						is_of__actor: actorId,
-						...(options.user
-							? {
-									name: {
-										$ne: null,
-									},
-							  }
-							: {}),
-					},
-					$orderby: 'name asc',
-				},
-			});
-			const fields = ['id', 'name', 'created_at', 'description', 'expiry_date'];
-			const _ = await import('lodash');
-			console.log(
-				getVisuals().table.horizontal(
-					keys.map((key) => _.mapValues(key, (val) => val ?? 'N/a')),
-					fields,
-				),
-			);
-		} catch (e) {
-			throw e;
-		}
-	}
-}

lib/commands/app/create.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2016-2021 Balena Ltd.
+ * Copyright 2016-2020 Balena Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
  */
 
 import { flags } from '@oclif/command';
-
 import Command from '../../command';
 import { ExpectedError } from '../../errors';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import type { Application } from 'balena-sdk';
 
 interface FlagsDef {
 	organization?: string;
@@ -34,16 +34,16 @@ interface ArgsDef {
 
 export default class AppCreateCmd extends Command {
 	public static description = stripIndent`
-		Create an app.
+		Create an application.
 
-		Create a new balena app.
+		Create a new balena application.
 
-		You can specify the organization the app should belong to using
+		You can specify the organization the application should belong to using
 		the \`--organization\` option. The organization's handle, not its name,
 		should be provided. Organization handles can be listed with the
 		\`balena orgs\` command.
 
-		The app's default device type is specified with the \`--type\` option.
+		The application's default device type is specified with the \`--type\` option.
 		The \`balena devices supported\` command can be used to list the available
 		device types.
 
@@ -63,7 +63,7 @@ export default class AppCreateCmd extends Command {
 	public static args = [
 		{
 			name: 'name',
-			description: 'app name',
+			description: 'application name',
 			required: true,
 		},
 	];
@@ -73,12 +73,13 @@ export default class AppCreateCmd extends Command {
 	public static flags: flags.Input<FlagsDef> = {
 		organization: flags.string({
 			char: 'o',
-			description: 'handle of the organization the app should belong to',
+			description:
+				'handle of the organization the application should belong to',
 		}),
 		type: flags.string({
 			char: 't',
 			description:
-				'app device type (Check available types with `balena devices supported`)',
+				'application device type (Check available types with `balena devices supported`)',
 		}),
 		help: cf.help,
 	};
@@ -100,40 +101,41 @@ export default class AppCreateCmd extends Command {
 			options.organization?.toLowerCase() || (await this.getOrganization());
 
 		// Create application
+		let application: Application;
 		try {
-			const application = await getBalenaSdk().models.application.create({
+			application = await getBalenaSdk().models.application.create({
 				name: params.name,
 				deviceType,
 				organization,
-				applicationClass: 'app',
 			});
-
-			// Output
-			console.log(
-				`App created: slug "${application.slug}", device type "${deviceType}"`,
-			);
 		} catch (err) {
 			if ((err.message || '').toLowerCase().includes('unique')) {
 				// BalenaRequestError: Request error: "organization" and "app_name" must be unique.
 				throw new ExpectedError(
-					`Error: An app or block or fleet with the name "${params.name}" already exists in organization "${organization}".`,
+					`Error: application "${params.name}" already exists in organization "${organization}".`,
 				);
 			} else if ((err.message || '').toLowerCase().includes('unauthorized')) {
 				// BalenaRequestError: Request error: Unauthorized
 				throw new ExpectedError(
-					`Error: You are not authorized to create apps in organization "${organization}".`,
+					`Error: You are not authorized to create applications in organization "${organization}".`,
 				);
 			}
 
 			throw err;
 		}
+
+		// Output
+		const { isV13 } = await import('../../utils/version');
+		console.log(
+			isV13()
+				? `Application created: slug "${application.slug}", device type "${deviceType}"`
+				: `Application created: ${application.slug} (${deviceType}, id ${application.id})`,
+		);
 	}
 
 	async getOrganization() {
 		const { getOwnOrganizations } = await import('../../utils/sdk');
-		const organizations = await getOwnOrganizations(getBalenaSdk(), {
-			$select: ['name', 'handle'],
-		});
+		const organizations = await getOwnOrganizations(getBalenaSdk());
 
 		if (organizations.length === 0) {
 			// User is not a member of any organizations (should not happen).

lib/commands/app/index.ts

@@ -0,0 +1,90 @@
+/**
+ * @license
+ * Copyright 2016-2020 Balena Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { flags } from '@oclif/command';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import * as ca from '../../utils/common-args';
+import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
+import { applicationIdInfo } from '../../utils/messages';
+import type { Release } from 'balena-sdk';
+
+interface FlagsDef {
+	help: void;
+}
+
+interface ArgsDef {
+	application: string;
+}
+
+export default class AppCmd extends Command {
+	public static description = stripIndent`
+		Display information about a single application.
+
+		Display detailed information about a single balena application.
+
+		${applicationIdInfo.split('\n').join('\n\t\t')}
+`;
+	public static examples = ['$ balena app MyApp', '$ balena app myorg/myapp'];
+
+	public static args = [ca.applicationRequired];
+
+	public static usage = 'app <nameOrSlug>';
+
+	public static flags: flags.Input<FlagsDef> = {
+		help: cf.help,
+	};
+
+	public static authenticated = true;
+	public static primary = true;
+
+	public async run() {
+		const { args: params } = this.parse<FlagsDef, ArgsDef>(AppCmd);
+
+		const { getApplication } = await import('../../utils/sdk');
+
+		const application = (await getApplication(
+			getBalenaSdk(),
+			params.application,
+			{
+				$expand: {
+					is_for__device_type: { $select: 'slug' },
+					should_be_running__release: { $select: 'commit' },
+				},
+			},
+		)) as ApplicationWithDeviceType & {
+			should_be_running__release: [Release?];
+			// For display purposes:
+			device_type: string;
+			commit?: string;
+		};
+
+		application.device_type = application.is_for__device_type[0].slug;
+		application.commit = application.should_be_running__release[0]?.commit;
+
+		// Emulate table.vertical title output, but avoid uppercasing and inserting spaces
+		console.log(`== ${application.app_name}`);
+		console.log(
+			getVisuals().table.vertical(application, [
+				'id',
+				'device_type',
+				'slug',
+				'commit',
+			]),
+		);
+	}
+}

lib/commands/app/purge.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import type { flags } from '@oclif/command';
-
+import { flags } from '@oclif/command';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import * as ca from '../../utils/common-args';
@@ -28,27 +27,27 @@ interface FlagsDef {
 }
 
 interface ArgsDef {
-	fleet: string;
+	application: string;
 }
 
-export default class FleetPurgeCmd extends Command {
+export default class AppPurgeCmd extends Command {
 	public static description = stripIndent`
-		Purge data from a fleet.
+		Purge data from an application.
 
-		Purge data from all devices belonging to a fleet.
-		This will clear the fleet's '/data' directory.
+		Purge data from all devices belonging to an application.
+		This will clear the application's /data directory.
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 	`;
 
 	public static examples = [
-		'$ balena fleet purge MyFleet',
-		'$ balena fleet purge myorg/myfleet',
+		'$ balena app purge MyApp',
+		'$ balena app purge myorg/myapp',
 	];
 
-	public static args = [ca.fleetRequired];
+	public static args = [ca.applicationRequired];
 
-	public static usage = 'fleet purge <fleet>';
+	public static usage = 'app purge <application>';
 
 	public static flags: flags.Input<FlagsDef> = {
 		help: cf.help,
@@ -57,7 +56,7 @@ export default class FleetPurgeCmd extends Command {
 	public static authenticated = true;
 
 	public async run() {
-		const { args: params } = this.parse<FlagsDef, ArgsDef>(FleetPurgeCmd);
+		const { args: params } = this.parse<FlagsDef, ArgsDef>(AppPurgeCmd);
 
 		const { getApplication } = await import('../../utils/sdk');
 
@@ -65,9 +64,7 @@ export default class FleetPurgeCmd extends Command {
 
 		// balena.models.application.purge only accepts a numeric id
 		// so we must first fetch the app to get it's id,
-		const application = await getApplication(balena, params.fleet, {
-			$select: 'id',
-		});
+		const application = await getApplication(balena, params.application);
 
 		try {
 			await balena.models.application.purge(application.id);

lib/commands/app/rename.ts

@@ -15,28 +15,28 @@
  * limitations under the License.
  */
 
-import type { flags } from '@oclif/command';
-
+import { flags } from '@oclif/command';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import * as ca from '../../utils/common-args';
 import { getBalenaSdk, stripIndent, getCliForm } from '../../utils/lazy';
 import { applicationIdInfo } from '../../utils/messages';
+import type { ApplicationType } from 'balena-sdk';
 
 interface FlagsDef {
 	help: void;
 }
 
 interface ArgsDef {
-	fleet: string;
+	application: string;
 	newName?: string;
 }
 
-export default class FleetRenameCmd extends Command {
+export default class AppRenameCmd extends Command {
 	public static description = stripIndent`
-		Rename a fleet.
+		Rename an application.
 
-		Rename a fleet.
+		Rename an application.
 
 		Note, if the \`newName\` parameter is omitted, it will be
 		prompted for interactively.
@@ -45,20 +45,20 @@ export default class FleetRenameCmd extends Command {
 	`;
 
 	public static examples = [
-		'$ balena fleet rename OldName',
-		'$ balena fleet rename OldName NewName',
-		'$ balena fleet rename myorg/oldname NewName',
+		'$ balena app rename OldName',
+		'$ balena app rename OldName NewName',
+		'$ balena app rename myorg/oldname NewName',
 	];
 
 	public static args = [
-		ca.fleetRequired,
+		ca.applicationRequired,
 		{
 			name: 'newName',
-			description: 'the new name for the fleet',
+			description: 'the new name for the application',
 		},
 	];
 
-	public static usage = 'fleet rename <fleet> [newName]';
+	public static usage = 'app rename <application> [newName]';
 
 	public static flags: flags.Input<FlagsDef> = {
 		help: cf.help,
@@ -67,7 +67,7 @@ export default class FleetRenameCmd extends Command {
 	public static authenticated = true;
 
 	public async run() {
-		const { args: params } = this.parse<FlagsDef, ArgsDef>(FleetRenameCmd);
+		const { args: params } = this.parse<FlagsDef, ArgsDef>(AppRenameCmd);
 
 		const { validateApplicationName } = await import('../../utils/validation');
 		const { ExpectedError } = await import('../../errors');
@@ -76,25 +76,26 @@ export default class FleetRenameCmd extends Command {
 
 		// Disambiguate target application (if params.params is a number, it could either be an ID or a numerical name)
 		const { getApplication } = await import('../../utils/sdk');
-		const application = await getApplication(balena, params.fleet, {
-			$select: ['id', 'app_name', 'slug'],
+		const application = await getApplication(balena, params.application, {
 			$expand: {
 				application_type: {
-					$select: 'slug',
+					$select: ['is_legacy'],
 				},
 			},
 		});
 
 		// Check app exists
 		if (!application) {
-			throw new ExpectedError(`Error: fleet ${params.fleet} not found.`);
+			throw new ExpectedError(
+				'Error: application ${params.nameOrSlug} not found.',
+			);
 		}
 
 		// Check app supports renaming
-		const appType = application.application_type[0];
-		if (appType.slug === 'legacy-v1' || appType.slug === 'legacy-v2') {
+		const appType = (application.application_type as ApplicationType[])?.[0];
+		if (appType.is_legacy) {
 			throw new ExpectedError(
-				`Fleet ${params.fleet} is of 'legacy' type, and cannot be renamed.`,
+				`Application ${params.application} is of 'legacy' type, and cannot be renamed.`,
 			);
 		}
 
@@ -102,43 +103,32 @@ export default class FleetRenameCmd extends Command {
 		const newName =
 			params.newName ||
 			(await getCliForm().ask({
-				message: 'Please enter the new name for this fleet:',
+				message: 'Please enter the new name for this application:',
 				type: 'input',
 				validate: validateApplicationName,
 			})) ||
 			'';
 
-		// Check they haven't used slug in new name
-		if (newName.includes('/')) {
-			throw new ExpectedError(
-				`New fleet name cannot include '/', please check that you are not specifying fleet slug.`,
-			);
-		}
-
 		// Rename
 		try {
 			await balena.models.application.rename(application.id, newName);
 		} catch (e) {
 			// BalenaRequestError: Request error: "organization" and "app_name" must be unique.
 			if ((e.message || '').toLowerCase().includes('unique')) {
-				throw new ExpectedError(`Error: fleet ${newName} already exists.`);
-			}
-			// BalenaRequestError: Request error: App name may only contain [a-zA-Z0-9_-].
-			if ((e.message || '').toLowerCase().includes('name may only contain')) {
 				throw new ExpectedError(
-					`Error: new fleet name may only include characters [a-zA-Z0-9_-].`,
+					`Error: application ${params.application} already exists.`,
 				);
 			}
 			throw e;
 		}
 
 		// Get application again, to be sure of results
-		const renamedApplication = await getApplication(balena, application.id, {
-			$select: ['app_name', 'slug'],
-		});
+		const renamedApplication = await balena.models.application.get(
+			application.id,
+		);
 
 		// Output result
-		console.log(`Fleet renamed`);
+		console.log(`Application renamed`);
 		console.log('From:');
 		console.log(`\tname: ${application.app_name}`);
 		console.log(`\tslug: ${application.slug}`);

lib/commands/app/restart.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import type { flags } from '@oclif/command';
-
+import { flags } from '@oclif/command';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import * as ca from '../../utils/common-args';
@@ -28,26 +27,26 @@ interface FlagsDef {
 }
 
 interface ArgsDef {
-	fleet: string;
+	application: string;
 }
 
-export default class FleetRestartCmd extends Command {
+export default class AppRestartCmd extends Command {
 	public static description = stripIndent`
-		Restart a fleet.
+		Restart an application.
 
-		Restart all devices belonging to a fleet.
+		Restart all devices belonging to an application.
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 	`;
 
 	public static examples = [
-		'$ balena fleet restart MyFleet',
-		'$ balena fleet restart myorg/myfleet',
+		'$ balena app restart MyApp',
+		'$ balena app restart myorg/myapp',
 	];
 
-	public static args = [ca.fleetRequired];
+	public static args = [ca.applicationRequired];
 
-	public static usage = 'fleet restart <fleet>';
+	public static usage = 'app restart <application>';
 
 	public static flags: flags.Input<FlagsDef> = {
 		help: cf.help,
@@ -56,17 +55,15 @@ export default class FleetRestartCmd extends Command {
 	public static authenticated = true;
 
 	public async run() {
-		const { args: params } = this.parse<FlagsDef, ArgsDef>(FleetRestartCmd);
+		const { args: params } = this.parse<FlagsDef, ArgsDef>(AppRestartCmd);
 
 		const { getApplication } = await import('../../utils/sdk');
 
 		const balena = getBalenaSdk();
 
-		// Disambiguate application
-		const application = await getApplication(balena, params.fleet, {
-			$select: 'slug',
-		});
+		// Disambiguate application (if is a number, it could either be an ID or a numerical name)
+		const application = await getApplication(balena, params.application);
 
-		await balena.models.application.restart(application.slug);
+		await balena.models.application.restart(application.id);
 	}
 }

lib/commands/app/rm.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import type { flags } from '@oclif/command';
-
+import { flags } from '@oclif/command';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import * as ca from '../../utils/common-args';
@@ -29,14 +28,14 @@ interface FlagsDef {
 }
 
 interface ArgsDef {
-	fleet: string;
+	application: string;
 }
 
-export default class FleetRmCmd extends Command {
+export default class AppRmCmd extends Command {
 	public static description = stripIndent`
-		Remove a fleet.
+		Remove an application.
 
-		Permanently remove a fleet.
+		Permanently remove a balena application.
 
 		The --yes option may be used to avoid interactive confirmation.
 
@@ -44,14 +43,14 @@ export default class FleetRmCmd extends Command {
 	`;
 
 	public static examples = [
-		'$ balena fleet rm MyFleet',
-		'$ balena fleet rm MyFleet --yes',
-		'$ balena fleet rm myorg/myfleet',
+		'$ balena app rm MyApp',
+		'$ balena app rm MyApp --yes',
+		'$ balena app rm myorg/myapp',
 	];
 
-	public static args = [ca.fleetRequired];
+	public static args = [ca.applicationRequired];
 
-	public static usage = 'fleet rm <fleet>';
+	public static usage = 'app rm <application>';
 
 	public static flags: flags.Input<FlagsDef> = {
 		yes: cf.yes,
@@ -62,7 +61,7 @@ export default class FleetRmCmd extends Command {
 
 	public async run() {
 		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
-			FleetRmCmd,
+			AppRmCmd,
 		);
 
 		const { confirm } = await import('../../utils/patterns');
@@ -72,15 +71,13 @@ export default class FleetRmCmd extends Command {
 		// Confirm
 		await confirm(
 			options.yes ?? false,
-			`Are you sure you want to delete fleet ${params.fleet}?`,
+			`Are you sure you want to delete application ${params.application}?`,
 		);
 
 		// Disambiguate application (if is a number, it could either be an ID or a numerical name)
-		const application = await getApplication(balena, params.fleet, {
-			$select: 'slug',
-		});
+		const application = await getApplication(balena, params.application);
 
 		// Remove
-		await balena.models.application.remove(application.slug);
+		await balena.models.application.remove(application.id);
 	}
 }

lib/commands/apps.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2016-2021 Balena Ltd.
+ * Copyright 2016-2020 Balena Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,79 +16,81 @@
  */
 
 import { flags } from '@oclif/command';
-
 import Command from '../command';
 import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
-import type { DataSetOutputOptions } from '../framework';
+import { getBalenaSdk, getVisuals, stripIndent } from '../utils/lazy';
 
 interface ExtendedApplication extends ApplicationWithDeviceType {
-	device_count: number;
-	online_devices: number;
-	device_type?: string;
+	device_count?: number;
+	online_devices?: number;
 }
 
-interface FlagsDef extends DataSetOutputOptions {
+interface FlagsDef {
 	help: void;
-	verbose?: boolean;
+	verbose: boolean;
 }
 
-export default class FleetsCmd extends Command {
+export default class AppsCmd extends Command {
 	public static description = stripIndent`
-		List all fleets.
+		List all applications.
 
-		List all your balena fleets.
+		list all your balena applications.
 
-		For detailed information on a particular fleet, use
-		\`balena fleet <fleet>\`
+		For detailed information on a particular application,
+		use \`balena app <application>\` instead.
 	`;
 
-	public static examples = ['$ balena fleets'];
+	public static examples = ['$ balena apps'];
 
-	public static usage = 'fleets';
+	public static usage = 'apps';
 
 	public static flags: flags.Input<FlagsDef> = {
-		...cf.dataSetOutputFlags,
 		help: cf.help,
+		verbose: flags.boolean({
+			default: false,
+			char: 'v',
+			description: 'No-op since release v12.0.0',
+		}),
 	};
 
 	public static authenticated = true;
 	public static primary = true;
 
 	public async run() {
-		const { flags: options } = this.parse<FlagsDef, {}>(FleetsCmd);
+		this.parse<FlagsDef, {}>(AppsCmd);
 
 		const balena = getBalenaSdk();
 
 		// Get applications
-		const applications =
-			(await balena.models.application.getAllDirectlyAccessible({
-				$select: ['id', 'app_name', 'slug'],
-				$expand: {
-					is_for__device_type: { $select: 'slug' },
-					owns__device: { $select: 'is_online' },
-				},
-			})) as ExtendedApplication[];
+		const applications = (await balena.models.application.getAll({
+			$select: ['id', 'app_name', 'slug'],
+			$expand: {
+				is_for__device_type: { $select: 'slug' },
+				owns__device: { $select: 'is_online' },
+			},
+		})) as ExtendedApplication[];
 
+		const _ = await import('lodash');
 		// Add extended properties
 		applications.forEach((application) => {
 			application.device_count = application.owns__device?.length ?? 0;
-			application.online_devices =
-				application.owns__device?.filter((d) => d.is_online).length || 0;
+			application.online_devices = _.sumBy(application.owns__device, (d) =>
+				d.is_online === true ? 1 : 0,
+			);
+			// @ts-expect-error
 			application.device_type = application.is_for__device_type[0].slug;
 		});
 
-		await this.outputData(
-			applications,
-			[
+		// Display
+		console.log(
+			getVisuals().table.horizontal(applications, [
 				'id',
 				'app_name',
 				'slug',
 				'device_type',
-				'device_count',
 				'online_devices',
-			],
-			options,
+				'device_count',
+			]),
 		);
 	}
 }

lib/commands/block/create.ts

@@ -1,150 +0,0 @@
-/**
- * @license
- * Copyright 2016-2021 Balena Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { flags } from '@oclif/command';
-
-import Command from '../../command';
-import { ExpectedError } from '../../errors';
-import * as cf from '../../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../../utils/lazy';
-
-interface FlagsDef {
-	organization?: string;
-	type?: string; // application device type
-	help: void;
-}
-
-interface ArgsDef {
-	name: string;
-}
-
-export default class BlockCreateCmd extends Command {
-	public static description = stripIndent`
-		Create an block.
-
-		Create a new balena block.
-
-		You can specify the organization the block should belong to using
-		the \`--organization\` option. The organization's handle, not its name,
-		should be provided. Organization handles can be listed with the
-		\`balena orgs\` command.
-
-		The block's default device type is specified with the \`--type\` option.
-		The \`balena devices supported\` command can be used to list the available
-		device types.
-
-		Interactive dropdowns will be shown for selection if no device type or
-		organization is specified and there are multiple options to choose from.
-		If there is a single option to choose from, it will be chosen automatically.
-		This interactive behavior can be disabled by explicitly specifying a device
-		type and organization.
-	`;
-
-	public static examples = [
-		'$ balena block create MyBlock',
-		'$ balena block create MyBlock --organization mmyorg',
-		'$ balena block create MyBlock -o myorg --type raspberry-pi',
-	];
-
-	public static args = [
-		{
-			name: 'name',
-			description: 'block name',
-			required: true,
-		},
-	];
-
-	public static usage = 'block create <name>';
-
-	public static flags: flags.Input<FlagsDef> = {
-		organization: flags.string({
-			char: 'o',
-			description: 'handle of the organization the block should belong to',
-		}),
-		type: flags.string({
-			char: 't',
-			description:
-				'block device type (Check available types with `balena devices supported`)',
-		}),
-		help: cf.help,
-	};
-
-	public static authenticated = true;
-
-	public async run() {
-		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
-			BlockCreateCmd,
-		);
-
-		// Ascertain device type
-		const deviceType =
-			options.type ||
-			(await (await import('../../utils/patterns')).selectDeviceType());
-
-		// Ascertain organization
-		const organization =
-			options.organization?.toLowerCase() || (await this.getOrganization());
-
-		// Create application
-		try {
-			const application = await getBalenaSdk().models.application.create({
-				name: params.name,
-				deviceType,
-				organization,
-				applicationClass: 'block',
-			});
-
-			// Output
-			console.log(
-				`Block created: slug "${application.slug}", device type "${deviceType}"`,
-			);
-		} catch (err) {
-			if ((err.message || '').toLowerCase().includes('unique')) {
-				// BalenaRequestError: Request error: "organization" and "app_name" must be unique.
-				throw new ExpectedError(
-					`Error: An app or block or fleet with the name "${params.name}" already exists in organization "${organization}".`,
-				);
-			} else if ((err.message || '').toLowerCase().includes('unauthorized')) {
-				// BalenaRequestError: Request error: Unauthorized
-				throw new ExpectedError(
-					`Error: You are not authorized to create blocks in organization "${organization}".`,
-				);
-			}
-
-			throw err;
-		}
-	}
-
-	async getOrganization() {
-		const { getOwnOrganizations } = await import('../../utils/sdk');
-		const organizations = await getOwnOrganizations(getBalenaSdk(), {
-			$select: ['name', 'handle'],
-		});
-
-		if (organizations.length === 0) {
-			// User is not a member of any organizations (should not happen).
-			throw new Error('This account is not a member of any organizations');
-		} else if (organizations.length === 1) {
-			// User is a member of only one organization - use this.
-			return organizations[0].handle;
-		} else {
-			// User is a member of multiple organizations -
-			const { selectOrganization } = await import('../../utils/patterns');
-			return selectOrganization(organizations);
-		}
-	}
-}

lib/commands/build.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2016-2021 Balena Ltd.
+ * Copyright 2016-2020 Balena Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,8 @@
 import { flags } from '@oclif/command';
 import Command from '../command';
 import { getBalenaSdk } from '../utils/lazy';
-import * as cf from '../utils/common-flags';
 import * as compose from '../utils/compose';
-import type { ApplicationType, BalenaSDK } from 'balena-sdk';
+import type { Application, ApplicationType, BalenaSDK } from 'balena-sdk';
 import {
 	buildArgDeprecation,
 	dockerignoreHelp,
@@ -34,7 +33,7 @@ import { dockerCliFlags } from '../utils/docker';
 interface FlagsDef extends ComposeCliFlags, DockerCliFlags {
 	arch?: string;
 	deviceType?: string;
-	fleet?: string;
+	application?: string;
 	source?: string; // Not part of command profile - source param copied here.
 	help: void;
 }
@@ -52,7 +51,7 @@ the provided docker daemon in your development machine or balena device.
 (See also the \`balena push\` command for the option of building images in the
 balenaCloud build servers.)
 
-You must specify either a fleet, or the device type and architecture.
+You must provide either an application or a device-type/architecture pair.
 
 This command will look into the given source directory (or the current working
 directory if one isn't specified) for a docker-compose.yml file, and if found,
@@ -66,12 +65,12 @@ ${registrySecretsHelp}
 ${dockerignoreHelp}
 `;
 	public static examples = [
-		'$ balena build --fleet myFleet',
-		'$ balena build ./source/ --fleet myorg/myfleet',
+		'$ balena build --application myApp',
+		'$ balena build ./source/ --application myApp',
 		'$ balena build --deviceType raspberrypi3 --arch armv7hf --emulated',
-		'$ balena build --docker /var/run/docker.sock --fleet myFleet   # Linux, Mac',
-		'$ balena build --docker //./pipe/docker_engine --fleet myFleet # Windows',
-		'$ balena build --dockerHost my.docker.host --dockerPort 2376 --ca ca.pem --key key.pem --cert cert.pem -f myFleet',
+		'$ balena build --docker /var/run/docker.sock --application myApp   # Linux, Mac',
+		'$ balena build --docker //./pipe/docker_engine --application myApp # Windows',
+		'$ balena build --dockerHost my.docker.host --dockerPort 2376 --ca ca.pem --key key.pem --cert cert.pem -a myApp',
 	];
 
 	public static args = [
@@ -92,7 +91,10 @@ ${dockerignoreHelp}
 			description: 'the type of device this build is for',
 			char: 'd',
 		}),
-		fleet: cf.fleet,
+		application: flags.string({
+			description: 'name of the target balena application this build is for',
+			char: 'a',
+		}),
 		...composeCliFlags,
 		...dockerCliFlags,
 		// NOTE: Not supporting -h for help, because of clash with -h in DockerCliFlags
@@ -107,8 +109,10 @@ ${dockerignoreHelp}
 			BuildCmd,
 		);
 
-		await Command.checkLoggedInIf(!!options.fleet);
+		await Command.checkLoggedInIf(!!options.application);
 
+		// compositions with many services trigger misleading warnings
+		// @ts-ignore editing property that isn't typed but does exist
 		(await import('events')).defaultMaxListeners = 1000;
 
 		const sdk = getBalenaSdk();
@@ -151,12 +155,14 @@ ${dockerignoreHelp}
 	protected async validateOptions(opts: FlagsDef, sdk: BalenaSDK) {
 		// Validate option combinations
 		if (
-			(opts.fleet == null && (opts.arch == null || opts.deviceType == null)) ||
-			(opts.fleet != null && (opts.arch != null || opts.deviceType != null))
+			(opts.application == null &&
+				(opts.arch == null || opts.deviceType == null)) ||
+			(opts.application != null &&
+				(opts.arch != null || opts.deviceType != null))
 		) {
 			const { ExpectedError } = await import('../errors');
 			throw new ExpectedError(
-				'You must specify either a fleet (-f), or the device type (-d) and architecture (-A)',
+				'You must specify either an application or an arch/deviceType pair to build for',
 			);
 		}
 
@@ -177,9 +183,9 @@ ${dockerignoreHelp}
 	}
 
 	protected async getAppAndResolveArch(opts: FlagsDef) {
-		if (opts.fleet) {
+		if (opts.application) {
 			const { getAppWithArch } = await import('../utils/helpers');
-			const app = await getAppWithArch(opts.fleet);
+			const app = await getAppWithArch(opts.application);
 			opts.arch = app.arch;
 			opts.deviceType = app.is_for__device_type[0].slug;
 			return app;
@@ -208,19 +214,17 @@ ${dockerignoreHelp}
 	 *   buildEmulated
 	 *   buildOpts: arguments to forward to docker build command
 	 *
-	 * @param {Dockerode} docker
+	 * @param {DockerToolbelt} docker
 	 * @param {Logger} logger
 	 * @param {ComposeOpts} composeOpts
 	 * @param opts
 	 */
 	protected async buildProject(
-		docker: import('dockerode'),
+		docker: import('docker-toolbelt'),
 		logger: import('../utils/logger'),
 		composeOpts: ComposeOpts,
 		opts: {
-			app?: {
-				application_type: [Pick<ApplicationType, 'supports_multicontainer'>];
-			};
+			app?: Application;
 			arch: string;
 			deviceType: string;
 			buildEmulated: boolean;
@@ -229,21 +233,16 @@ ${dockerignoreHelp}
 	) {
 		const { loadProject } = await import('../utils/compose_ts');
 
-		const project = await loadProject(
-			logger,
-			composeOpts,
-			undefined,
-			opts.buildOpts.t,
-		);
+		const project = await loadProject(logger, composeOpts);
 
-		const appType = opts.app?.application_type?.[0];
+		const appType = (opts.app?.application_type as ApplicationType[])?.[0];
 		if (
 			appType != null &&
 			project.descriptors.length > 1 &&
 			!appType.supports_multicontainer
 		) {
 			logger.logWarn(
-				'Target fleet does not support multiple containers.\n' +
+				'Target application does not support multiple containers.\n' +
 					'Continuing with build, but you will not be able to deploy.',
 			);
 		}
@@ -261,6 +260,7 @@ ${dockerignoreHelp}
 			inlineLogs: composeOpts.inlineLogs,
 			convertEol: composeOpts.convertEol,
 			dockerfilePath: composeOpts.dockerfilePath,
+			nogitignore: composeOpts.nogitignore,
 			multiDockerignore: composeOpts.multiDockerignore,
 		});
 	}

lib/commands/config/generate.ts

@@ -19,18 +19,13 @@ import { flags } from '@oclif/command';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, getCliForm, stripIndent } from '../../utils/lazy';
-import {
-	applicationIdInfo,
-	devModeInfo,
-	secureBootInfo,
-} from '../../utils/messages';
-import type { BalenaSDK, PineDeferred } from 'balena-sdk';
+import { applicationIdInfo } from '../../utils/messages';
+import type { PineDeferred } from 'balena-sdk';
 
 interface FlagsDef {
 	version: string; // OS version
-	fleet?: string;
-	dev?: boolean; // balenaOS development variant
-	secureBoot?: boolean;
+	application?: string;
+	app?: string; // application alias
 	device?: string;
 	deviceApiKey?: string;
 	deviceType?: string;
@@ -41,8 +36,6 @@ interface FlagsDef {
 	wifiSsid?: string;
 	wifiKey?: string;
 	appUpdatePollInterval?: string;
-	'provisioning-key-name'?: string;
-	'provisioning-key-expiry-date'?: string;
 	help: void;
 }
 
@@ -50,19 +43,16 @@ export default class ConfigGenerateCmd extends Command {
 	public static description = stripIndent`
 		Generate a config.json file.
 
-		Generate a config.json file for a device or fleet.
+		Generate a config.json file for a device or application.
 
-		The target balenaOS version must be specified with the --version option.
+		Calling this command with the exact version number of the targeted image is required.
 
-		${devModeInfo.split('\n').join('\n\t\t')}
+		This command is interactive by default, but you can do this automatically without interactivity
+		by specifying an option for each question on the command line, if you know the questions
+		that will be asked for the relevant device type.
 
-		${secureBootInfo.split('\n').join('\n\t\t')}
-
-		To configure an image for a fleet of mixed device types, use the --fleet option
-		alongside the --deviceType option to specify the target device type.
-
-		To avoid interactive questions, specify a command line option for each question that
-		would otherwise be asked.
+		In case that you want to configure an image for an application with mixed device types,
+		you can pass the --deviceType argument along with --application to specify the target device type.
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 	`;
@@ -70,13 +60,13 @@ export default class ConfigGenerateCmd extends Command {
 	public static examples = [
 		'$ balena config generate --device 7cf02a6 --version 2.12.7',
 		'$ balena config generate --device 7cf02a6 --version 2.12.7 --generate-device-api-key',
-		'$ balena config generate --device 7cf02a6 --version 2.12.7 --deviceApiKey <existingDeviceKey>',
+		'$ balena config generate --device 7cf02a6 --version 2.12.7 --device-api-key <existingDeviceKey>',
 		'$ balena config generate --device 7cf02a6 --version 2.12.7 --output config.json',
-		'$ balena config generate --fleet myorg/fleet --version 2.12.7 --dev',
-		'$ balena config generate --fleet myorg/fleet --version 2.12.7 --secureBoot',
-		'$ balena config generate --fleet myorg/fleet --version 2.12.7 --deviceType fincm3',
-		'$ balena config generate --fleet myorg/fleet --version 2.12.7 --output config.json',
-		'$ balena config generate --fleet myorg/fleet --version 2.12.7 --network wifi --wifiSsid mySsid --wifiKey abcdefgh --appUpdatePollInterval 15',
+		'$ balena config generate --app MyApp --version 2.12.7',
+		'$ balena config generate --app myorg/myapp --version 2.12.7',
+		'$ balena config generate --app MyApp --version 2.12.7 --deviceType fincm3',
+		'$ balena config generate --app MyApp --version 2.12.7 --output config.json',
+		'$ balena config generate --app MyApp --version 2.12.7 --network wifi --wifiSsid mySsid --wifiKey abcdefgh --appUpdatePollInterval 1',
 	];
 
 	public static usage = 'config generate';
@@ -86,25 +76,20 @@ export default class ConfigGenerateCmd extends Command {
 			description: 'a balenaOS version',
 			required: true,
 		}),
-		fleet: { ...cf.fleet, exclusive: ['device'] },
-		dev: cf.dev,
-		secureBoot: cf.secureBoot,
-		device: {
-			...cf.device,
-			exclusive: [
-				'fleet',
-				'provisioning-key-name',
-				'provisioning-key-expiry-date',
-			],
-		},
+		application: { ...cf.application, exclusive: ['app', 'device'] },
+		app: { ...cf.app, exclusive: ['application', 'device'] },
+		device: flags.string({
+			description: 'device uuid',
+			char: 'd',
+			exclusive: ['application', 'app'],
+		}),
 		deviceApiKey: flags.string({
 			description:
 				'custom device key - note that this is only supported on balenaOS 2.0.3+',
 			char: 'k',
 		}),
 		deviceType: flags.string({
-			description:
-				"device type slug (run 'balena devices supported' for possible values)",
+			description: 'device type slug',
 		}),
 		'generate-device-api-key': flags.boolean({
 			description: 'generate a fresh device key for the device',
@@ -128,53 +113,38 @@ export default class ConfigGenerateCmd extends Command {
 		}),
 		appUpdatePollInterval: flags.string({
 			description:
-				'supervisor cloud polling interval in minutes (e.g. for device variables)',
-		}),
-		'provisioning-key-name': flags.string({
-			description: 'custom key name assigned to generated provisioning api key',
-			exclusive: ['device'],
-		}),
-		'provisioning-key-expiry-date': flags.string({
-			description:
-				'expiry date assigned to generated provisioning api key (format: YYYY-MM-DD)',
-			exclusive: ['device'],
+				'how frequently (in minutes) to poll for application updates',
 		}),
 		help: cf.help,
 	};
 
 	public static authenticated = true;
 
-	public async getApplication(balena: BalenaSDK, fleet: string) {
-		const { getApplication } = await import('../../utils/sdk');
-		return await getApplication(balena, fleet, {
-			$select: 'slug',
-			$expand: {
-				is_for__device_type: { $select: 'slug' },
-			},
-		});
-	}
-
 	public async run() {
 		const { flags: options } = this.parse<FlagsDef, {}>(ConfigGenerateCmd);
+
+		const { getApplication } = await import('../../utils/sdk');
+
 		const balena = getBalenaSdk();
 
 		await this.validateOptions(options);
 
 		let resourceDeviceType: string;
-		let application: Awaited<ReturnType<typeof this.getApplication>> | null =
-			null;
+		let application: ApplicationWithDeviceType | null = null;
 		let device:
 			| (DeviceWithDeviceType & { belongs_to__application: PineDeferred })
 			| null = null;
 		if (options.device != null) {
-			const rawDevice = await balena.models.device.get(options.device, {
-				$expand: { is_of__device_type: { $select: 'slug' } },
-			});
+			const { tryAsInteger } = await import('../../utils/validation');
+			const rawDevice = await balena.models.device.get(
+				tryAsInteger(options.device),
+				{ $expand: { is_of__device_type: { $select: 'slug' } } },
+			);
 			if (!rawDevice.belongs_to__application) {
 				const { ExpectedError } = await import('../../errors');
 				throw new ExpectedError(stripIndent`
-					Device ${options.device} does not appear to belong to an accessible fleet.
-					Try with a different device, or use '--fleet' instead of '--device'.`);
+					Device ${options.device} does not appear to belong to an accessible application.
+					Try with a different device, or use '--application' instead of '--device'.`);
 			}
 			device = rawDevice as DeviceWithDeviceType & {
 				belongs_to__application: PineDeferred;
@@ -182,51 +152,43 @@ export default class ConfigGenerateCmd extends Command {
 			resourceDeviceType = device.is_of__device_type[0].slug;
 		} else {
 			// Disambiguate application (if is a number, it could either be an ID or a numerical name)
-			application = await this.getApplication(balena, options.fleet!);
+			application = (await getApplication(balena, options.application!, {
+				$expand: {
+					is_for__device_type: { $select: 'slug' },
+				},
+			})) as ApplicationWithDeviceType;
 			resourceDeviceType = application.is_for__device_type[0].slug;
 		}
 
 		const deviceType = options.deviceType || resourceDeviceType;
 
+		const deviceManifest = await balena.models.device.getManifestBySlug(
+			deviceType,
+		);
+
 		// Check compatibility if application and deviceType provided
-		if (options.fleet && options.deviceType) {
+		if (options.application && options.deviceType) {
+			const appDeviceManifest = await balena.models.device.getManifestBySlug(
+				resourceDeviceType,
+			);
+
 			const helpers = await import('../../utils/helpers');
 			if (
-				!(await helpers.areDeviceTypesCompatible(
-					resourceDeviceType,
-					deviceType,
-				))
+				!helpers.areDeviceTypesCompatible(appDeviceManifest, deviceManifest)
 			) {
-				const { ExpectedError } = await import('../../errors');
-				throw new ExpectedError(
-					`Device type ${options.deviceType} is incompatible with fleet ${options.fleet}`,
+				throw new balena.errors.BalenaInvalidDeviceType(
+					`Device type ${options.deviceType} is incompatible with application ${options.application}`,
 				);
 			}
 		}
 
-		const deviceManifest =
-			await balena.models.config.getDeviceTypeManifestBySlug(deviceType);
-
-		const { validateSecureBootOptionAndWarn } = await import(
-			'../../utils/config'
-		);
-		await validateSecureBootOptionAndWarn(
-			options.secureBoot,
-			deviceType,
-			options.version,
-		);
-
 		// Prompt for values
 		// Pass params as an override: if there is any param with exactly the same name as a
 		// required option, that value is used (and the corresponding question is not asked)
 		const answers = await getCliForm().run(deviceManifest.options, {
-			override: { ...options, app: options.fleet, application: options.fleet },
+			override: options,
 		});
 		answers.version = options.version;
-		answers.developmentMode = options.dev;
-		answers.secureBoot = options.secureBoot;
-		answers.provisioningKeyName = options['provisioning-key-name'];
-		answers.provisioningKeyExpiryDate = options['provisioning-key-expiry-date'];
 
 		// Generate config
 		const { generateDeviceConfig, generateApplicationConfig } = await import(
@@ -256,7 +218,7 @@ export default class ConfigGenerateCmd extends Command {
 	}
 
 	protected readonly missingDeviceOrAppMessage = stripIndent`
-		Either a device or a fleet must be specified.
+		Either a device or an application must be specified.
 
 		See the help page for examples:
 
@@ -264,19 +226,21 @@ export default class ConfigGenerateCmd extends Command {
   	`;
 
 	protected readonly deviceTypeNotAllowedMessage =
-		'The --deviceType option can only be used alongside the --fleet option';
+		'The --deviceType option can only be used alongside the --application option';
 
 	protected async validateOptions(options: FlagsDef) {
 		const { ExpectedError } = await import('../../errors');
 
-		if (options.device == null && options.fleet == null) {
+		// Prefer options.application over options.app
+		options.application = options.application || options.app;
+		delete options.app;
+
+		if (options.device == null && options.application == null) {
 			throw new ExpectedError(this.missingDeviceOrAppMessage);
 		}
 
-		if (!options.fleet && options.deviceType) {
+		if (!options.application && options.deviceType) {
 			throw new ExpectedError(this.deviceTypeNotAllowedMessage);
 		}
-		const { validateDevOptionAndWarn } = await import('../../utils/config');
-		await validateDevOptionAndWarn(options.dev, options.version);
 	}
 }

lib/commands/config/inject.ts

@@ -21,7 +21,7 @@ import * as cf from '../../utils/common-flags';
 import { getVisuals, stripIndent } from '../../utils/lazy';
 
 interface FlagsDef {
-	type?: string;
+	type: string;
 	drive?: string;
 	help: void;
 }
@@ -32,18 +32,15 @@ interface ArgsDef {
 
 export default class ConfigInjectCmd extends Command {
 	public static description = stripIndent`
-		Inject a config.json file to a balenaOS image or attached media.
+		Inject a configuration file into a device or OS image.
 
-		Inject a 'config.json' file to a balenaOS image file or attached SD card or
-		USB stick.
-
-		Documentation for the balenaOS 'config.json' file can be found at:
-		https://www.balena.io/docs/reference/OS/configuration/
+		Inject a config.json file to the mounted filesystem,
+		e.g. the SD card of a provisioned device or balenaOS image.
 	`;
 
 	public static examples = [
-		'$ balena config inject my/config.json',
-		'$ balena config inject my/config.json --drive /dev/disk2',
+		'$ balena config inject my/config.json --type raspberrypi3',
+		'$ balena config inject my/config.json --type raspberrypi3 --drive /dev/disk2',
 	];
 
 	public static args = [
@@ -57,19 +54,21 @@ export default class ConfigInjectCmd extends Command {
 	public static usage = 'config inject <file>';
 
 	public static flags: flags.Input<FlagsDef> = {
+		type: cf.deviceType,
 		drive: cf.driveOrImg,
 		help: cf.help,
 	};
 
+	public static authenticated = true;
+
 	public static root = true;
-	public static offlineCompatible = true;
 
 	public async run() {
 		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
 			ConfigInjectCmd,
 		);
 
-		const { safeUmount } = await import('../../utils/umount');
+		const { safeUmount } = await import('../../utils/helpers');
 
 		const drive =
 			options.drive || (await getVisuals().drive('Select the device/OS drive'));
@@ -81,7 +80,7 @@ export default class ConfigInjectCmd extends Command {
 		);
 
 		const config = await import('balena-config-json');
-		await config.write(drive, '', configJSON);
+		await config.write(drive, options.type, configJSON);
 
 		console.info('Done');
 	}

lib/commands/config/read.ts

@@ -21,57 +21,49 @@ import * as cf from '../../utils/common-flags';
 import { getVisuals, stripIndent } from '../../utils/lazy';
 
 interface FlagsDef {
-	type?: string;
+	type: string;
 	drive?: string;
 	help: void;
-	json: boolean;
 }
 
 export default class ConfigReadCmd extends Command {
 	public static description = stripIndent`
-		Read the config.json file of a balenaOS image or attached media.
+		Read the configuration of a device or OS image.
 
-		Read the 'config.json' file of a balenaOS image file or attached SD card or
-		USB stick.
-
-		Documentation for the balenaOS 'config.json' file can be found at:
-		https://www.balena.io/docs/reference/OS/configuration/
+		Read the config.json file from the mounted filesystem,
+		e.g. the SD card of a provisioned device or balenaOS image.
 	`;
 
 	public static examples = [
-		'$ balena config read',
-		'$ balena config read --drive /dev/disk2',
-		'$ balena config read --drive balena.img',
+		'$ balena config read --type raspberrypi3',
+		'$ balena config read --type raspberrypi3 --drive /dev/disk2',
 	];
 
 	public static usage = 'config read';
 
 	public static flags: flags.Input<FlagsDef> = {
+		type: cf.deviceType,
 		drive: cf.driveOrImg,
 		help: cf.help,
-		json: cf.json,
 	};
 
+	public static authenticated = true;
+
 	public static root = true;
-	public static offlineCompatible = true;
 
 	public async run() {
 		const { flags: options } = this.parse<FlagsDef, {}>(ConfigReadCmd);
 
-		const { safeUmount } = await import('../../utils/umount');
+		const { safeUmount } = await import('../../utils/helpers');
 
 		const drive =
 			options.drive || (await getVisuals().drive('Select the device drive'));
 		await safeUmount(drive);
 
 		const config = await import('balena-config-json');
-		const configJSON = await config.read(drive, '');
+		const configJSON = await config.read(drive, options.type);
 
-		if (options.json) {
-			console.log(JSON.stringify(configJSON, null, 4));
-		} else {
-			const prettyjson = await import('prettyjson');
-			console.log(prettyjson.render(configJSON));
-		}
+		const prettyjson = await import('prettyjson');
+		console.info(prettyjson.render(configJSON));
 	}
 }

lib/commands/config/reconfigure.ts

@@ -21,73 +21,54 @@ import * as cf from '../../utils/common-flags';
 import { getVisuals, stripIndent } from '../../utils/lazy';
 
 interface FlagsDef {
-	type?: string;
+	type: string;
 	drive?: string;
 	advanced: boolean;
 	help: void;
-	version?: string;
 }
 
 export default class ConfigReconfigureCmd extends Command {
 	public static description = stripIndent`
-		Interactively reconfigure a balenaOS image file or attached media.
+		Interactively reconfigure a device or OS image.
 
-		Interactively reconfigure a balenaOS image file or attached media.
-
-		This command extracts the device UUID from the 'config.json' file of the
-		chosen balenaOS image file or attached media, and then passes the UUID as
-		the '--device' argument to the 'balena os configure' command.
-
-		For finer-grained or scripted control of the operation, use the
-		'balena config read' and 'balena os configure' commands separately.
+		Interactively reconfigure a provisioned device or OS image.
 `;
 	public static examples = [
-		'$ balena config reconfigure',
-		'$ balena config reconfigure --drive /dev/disk3',
-		'$ balena config reconfigure --drive balena.img --advanced',
+		'$ balena config reconfigure --type raspberrypi3',
+		'$ balena config reconfigure --type raspberrypi3 --advanced',
+		'$ balena config reconfigure --type raspberrypi3 --drive /dev/disk2',
 	];
 
 	public static usage = 'config reconfigure';
 
 	public static flags: flags.Input<FlagsDef> = {
+		type: cf.deviceType,
 		drive: cf.driveOrImg,
 		advanced: flags.boolean({
 			description: 'show advanced commands',
 			char: 'v',
 		}),
 		help: cf.help,
-		version: flags.string({
-			description: 'balenaOS version, for example "2.32.0" or "2.44.0+rev1"',
-		}),
 	};
 
 	public static authenticated = true;
+
 	public static root = true;
 
 	public async run() {
 		const { flags: options } = this.parse<FlagsDef, {}>(ConfigReconfigureCmd);
 
-		const { safeUmount } = await import('../../utils/umount');
+		const { safeUmount } = await import('../../utils/helpers');
 
 		const drive =
 			options.drive || (await getVisuals().drive('Select the device drive'));
 		await safeUmount(drive);
 
 		const config = await import('balena-config-json');
-		const { uuid } = await config.read(drive, '');
+		const { uuid } = await config.read(drive, options.type);
 		await safeUmount(drive);
 
-		if (!uuid) {
-			const { ExpectedError } = await import('../../errors');
-			throw new ExpectedError(
-				`Error: UUID not found in 'config.json' file for '${drive}'`,
-			);
-		}
-
 		const configureCommand = ['os', 'configure', drive, '--device', uuid];
-		if (options.version) {
-			configureCommand.push('--version', options.version);
-		}
 		if (options.advanced) {
 			configureCommand.push('--advanced');
 		}

lib/commands/config/write.ts

@@ -21,7 +21,7 @@ import * as cf from '../../utils/common-flags';
 import { getVisuals, stripIndent } from '../../utils/lazy';
 
 interface FlagsDef {
-	type?: string;
+	type: string;
 	drive?: string;
 	help: void;
 }
@@ -33,19 +33,16 @@ interface ArgsDef {
 
 export default class ConfigWriteCmd extends Command {
 	public static description = stripIndent`
-		Write a key-value pair to the config.json file of an OS image or attached media.
+		Write a key-value pair to configuration of a device or OS image.
 
-		Write a key-value pair to the 'config.json' file of a balenaOS image file or
-		attached SD card or USB stick.
-
-		Documentation for the balenaOS 'config.json' file can be found at:
-		https://www.balena.io/docs/reference/OS/configuration/
+		Write a key-value pair to the config.json file on the mounted filesystem,
+		e.g. the SD card of a provisioned device or balenaOS image.
 	`;
 
 	public static examples = [
-		'$ balena config write ntpServers "0.resinio.pool.ntp.org 1.resinio.pool.ntp.org"',
-		'$ balena config write --drive /dev/disk2 hostname custom-hostname',
-		'$ balena config write --drive balena.img os.network.connectivity.interval 300',
+		'$ balena config write --type raspberrypi3 username johndoe',
+		'$ balena config write --type raspberrypi3 --drive /dev/disk2 username johndoe',
+		'$ balena config write --type raspberrypi3 files.network/settings "..."',
 	];
 
 	public static args = [
@@ -64,45 +61,37 @@ export default class ConfigWriteCmd extends Command {
 	public static usage = 'config write <key> <value>';
 
 	public static flags: flags.Input<FlagsDef> = {
+		type: cf.deviceType,
 		drive: cf.driveOrImg,
 		help: cf.help,
 	};
 
+	public static authenticated = true;
+
 	public static root = true;
-	public static offlineCompatible = true;
 
 	public async run() {
 		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
 			ConfigWriteCmd,
 		);
 
-		const { denyMount, safeUmount } = await import('../../utils/umount');
+		const { safeUmount } = await import('../../utils/helpers');
 
 		const drive =
 			options.drive || (await getVisuals().drive('Select the device drive'));
 		await safeUmount(drive);
 
 		const config = await import('balena-config-json');
-		const configJSON = await config.read(drive, '');
+		const configJSON = await config.read(drive, options.type);
 
 		console.info(`Setting ${params.key} to ${params.value}`);
-		ConfigWriteCmd.updateConfigJson(configJSON, params.key, params.value);
+		const _ = await import('lodash');
+		_.set(configJSON, params.key, params.value);
 
-		await denyMount(drive, async () => {
-			await safeUmount(drive);
-			await config.write(drive, '', configJSON);
-		});
+		await safeUmount(drive);
+
+		await config.write(drive, options.type, configJSON);
 
 		console.info('Done');
 	}
-
-	/** Call Lodash's _.setWith(). Moved here for ease of testing. */
-	static updateConfigJson(configJSON: object, key: string, value: string) {
-		const _ = require('lodash') as typeof import('lodash');
-		// note: _.setWith() is needed instead of _.set() because, given a key
-		// like `os.udevRules.101`, _.set() creates a udevRules array (rather
-		// than a dictionary) and sets the 101st array element to value, while
-		// we actually want udevRules to be dictionary like { '101': value }
-		_.setWith(configJSON, key, value, (v) => v || {});
-	}
 }

lib/commands/deploy.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2016-2021 Balena Ltd.
+ * Copyright 2016-2020 Balena Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 import { flags } from '@oclif/command';
-import type { ImageDescriptor } from '@balena/compose/dist/parse';
+import type { ImageDescriptor } from 'resin-compose-parse';
 
 import Command from '../command';
 import { ExpectedError } from '../errors';
@@ -26,7 +26,6 @@ import {
 	registrySecretsHelp,
 	buildArgDeprecation,
 } from '../utils/messages';
-import * as ca from '../utils/common-args';
 import * as compose from '../utils/compose';
 import type {
 	BuiltImage,
@@ -34,7 +33,7 @@ import type {
 	ComposeOpts,
 	Release as ComposeReleaseInfo,
 } from '../utils/compose-types';
-import type { BuildOpts, DockerCliFlags } from '../utils/docker';
+import type { DockerCliFlags } from '../utils/docker';
 import {
 	applyReleaseTagKeysAndValues,
 	buildProject,
@@ -43,13 +42,15 @@ import {
 	parseReleaseTagKeysAndValues,
 } from '../utils/compose_ts';
 import { dockerCliFlags } from '../utils/docker';
-import type { ApplicationType, DeviceType, Release } from 'balena-sdk';
+import type {
+	Application,
+	ApplicationType,
+	DeviceType,
+	Release,
+} from 'balena-sdk';
 
-interface ApplicationWithArch {
-	id: number;
+interface ApplicationWithArch extends Application {
 	arch: string;
-	is_for__device_type: [Pick<DeviceType, 'slug'>];
-	application_type: [Pick<ApplicationType, 'slug' | 'supports_multicontainer'>];
 }
 
 interface FlagsDef extends ComposeCliFlags, DockerCliFlags {
@@ -57,24 +58,22 @@ interface FlagsDef extends ComposeCliFlags, DockerCliFlags {
 	build: boolean;
 	nologupload: boolean;
 	'release-tag'?: string[];
-	draft: boolean;
-	note?: string;
 	help: void;
 }
 
 interface ArgsDef {
-	fleet: string;
+	appName: string;
 	image?: string;
 }
 
 export default class DeployCmd extends Command {
 	public static description = `\
-Deploy a single image or a multicontainer project to a balena fleet.
+Deploy a single image or a multicontainer project to a balena application.
 
-Usage: \`deploy <fleet> ([image] | --build [--source build-dir])\`
+Usage: \`deploy <appName> ([image] | --build [--source build-dir])\`
 
-Use this command to deploy an image or a complete multicontainer project to a
-fleet, optionally building it first. The source images are searched for
+Use this command to deploy an image or a complete multicontainer project to an
+application, optionally building it first. The source images are searched for
 (and optionally built) using the docker daemon in your development machine or
 balena device. (See also the \`balena push\` command for the option of building
 the image in the balenaCloud build servers.)
@@ -82,15 +81,13 @@ the image in the balenaCloud build servers.)
 Unless an image is specified, this command will look into the current directory
 (or the one specified by --source) for a docker-compose.yml file.  If one is
 found, this command will deploy each service defined in the compose file,
-building it first if an image for it doesn't exist. Image names will be looked
-up according to the scheme: \`<projectName>_<serviceName>\`.
+building it first if an image for it doesn't exist. If a compose file isn't
+found, the command will look for a Dockerfile[.template] file (or alternative
+Dockerfile specified with the \`-f\` option), and if yet that isn't found, it
+will try to generate one.
 
-If a compose file isn't found, the command will look for a Dockerfile[.template]
-file (or alternative Dockerfile specified with the \`-f\` option), and if yet
-that isn't found, it will try to generate one.
-
-To deploy to a fleet where you are a collaborator, use fleet slug including the
-organization:  \`balena deploy <organization>/<fleet>\`.
+To deploy to an app on which you're a collaborator, use
+\`balena deploy <appOwnerUsername>/<appName>\`.
 
 ${registrySecretsHelp}
 
@@ -98,22 +95,25 @@ ${dockerignoreHelp}
 `;
 
 	public static examples = [
-		'$ balena deploy myFleet',
-		'$ balena deploy myorg/myfleet --build --source myBuildDir/',
-		'$ balena deploy myorg/myfleet --build --source myBuildDir/ --note "this is the note for this release"',
-		'$ balena deploy myorg/myfleet myRepo/myImage',
-		'$ balena deploy myFleet myRepo/myImage --release-tag key1 "" key2 "value2 with spaces"',
+		'$ balena deploy myApp',
+		'$ balena deploy myApp --build --source myBuildDir/',
+		'$ balena deploy myApp myApp/myImage',
+		'$ balena deploy myApp myApp/myImage --release-tag key1 "" key2 "value2 with spaces"',
 	];
 
 	public static args = [
-		ca.fleetRequired,
+		{
+			name: 'appName',
+			description: 'the name of the application to deploy to',
+			required: true,
+		},
 		{
 			name: 'image',
 			description: 'the image to deploy',
 		},
 	];
 
-	public static usage = 'deploy <fleet> [image]';
+	public static usage = 'deploy <appName> [image]';
 
 	public static flags: flags.Input<FlagsDef> = {
 		source: flags.string({
@@ -137,15 +137,6 @@ ${dockerignoreHelp}
 			`,
 			multiple: true,
 		}),
-		draft: flags.boolean({
-			description: stripIndent`
-				Deploy the release as a draft. Draft releases are ignored
-				by the 'track latest' release policy but can be used through release pinning.
-				Draft releases can be marked as final through the API. Releases are created
-				as final by default unless this option is given.`,
-			default: false,
-		}),
-		note: flags.string({ description: 'The notes for this release' }),
 		...composeCliFlags,
 		...dockerCliFlags,
 		// NOTE: Not supporting -h for help, because of clash with -h in DockerCliFlags
@@ -162,12 +153,14 @@ ${dockerignoreHelp}
 			DeployCmd,
 		);
 
+		// compositions with many services trigger misleading warnings
+		// @ts-ignore editing property that isn't typed but does exist
 		(await import('events')).defaultMaxListeners = 1000;
 
 		const logger = await Command.getLogger();
 		logger.logDebug('Parsing input...');
 
-		const { fleet, image } = params;
+		const { appName, image } = params;
 
 		// Build args are under consideration for removal - warn user
 		if (options.buildArg) {
@@ -195,19 +188,21 @@ ${dockerignoreHelp}
 				options['registry-secrets'],
 			);
 		} else {
-			const { dockerfilePath, registrySecrets } =
-				await validateProjectDirectory(sdk, {
-					dockerfilePath: options.dockerfile,
-					noParentCheck: options['noparent-check'] || false,
-					projectPath: options.source || '.',
-					registrySecretsPath: options['registry-secrets'],
-				});
+			const {
+				dockerfilePath,
+				registrySecrets,
+			} = await validateProjectDirectory(sdk, {
+				dockerfilePath: options.dockerfile,
+				noParentCheck: options['noparent-check'] || false,
+				projectPath: options.source || '.',
+				registrySecretsPath: options['registry-secrets'],
+			});
 			options.dockerfile = dockerfilePath;
 			options['registry-secrets'] = registrySecrets;
 		}
 
 		const helpers = await import('../utils/helpers');
-		const app = await helpers.getAppWithArch(fleet);
+		const app = await helpers.getAppWithArch(appName);
 
 		const dockerUtils = await import('../utils/docker');
 		const [docker, buildOpts, composeOpts] = await Promise.all([
@@ -218,12 +213,11 @@ ${dockerignoreHelp}
 
 		const release = await this.deployProject(docker, logger, composeOpts, {
 			app,
-			appName: fleet, // may be prefixed by 'owner/', unlike app.app_name
+			appName, // may be prefixed by 'owner/', unlike app.app_name
 			image,
 			shouldPerformBuild: !!options.build,
 			shouldUploadLogs: !options.nologupload,
 			buildEmulated: !!options.emulated,
-			createAsDraft: options.draft,
 			buildOpts,
 		});
 		await applyReleaseTagKeysAndValues(
@@ -232,13 +226,10 @@ ${dockerignoreHelp}
 			releaseTagKeys,
 			releaseTagValues,
 		);
-		if (options.note) {
-			await sdk.models.release.setNote(release.id, options.note);
-		}
 	}
 
 	async deployProject(
-		docker: import('dockerode'),
+		docker: import('docker-toolbelt'),
 		logger: import('../utils/logger'),
 		composeOpts: ComposeOpts,
 		opts: {
@@ -249,8 +240,7 @@ ${dockerignoreHelp}
 			shouldPerformBuild: boolean;
 			shouldUploadLogs: boolean;
 			buildEmulated: boolean;
-			buildOpts: BuildOpts;
-			createAsDraft: boolean;
+			buildOpts: any; // arguments to forward to docker build command
 		},
 	) {
 		const _ = await import('lodash');
@@ -260,18 +250,13 @@ ${dockerignoreHelp}
 			'../utils/compose_ts'
 		);
 
-		const appType = opts.app.application_type[0];
+		const appType = (opts.app?.application_type as ApplicationType[])?.[0];
 
 		try {
-			const project = await loadProject(
-				logger,
-				composeOpts,
-				opts.image,
-				opts.buildOpts.t,
-			);
+			const project = await loadProject(logger, composeOpts, opts.image);
 			if (project.descriptors.length > 1 && !appType?.supports_multicontainer) {
 				throw new ExpectedError(
-					'Target fleet does not support multiple containers. Aborting!',
+					'Target application does not support multiple containers. Aborting!',
 				);
 			}
 
@@ -317,12 +302,13 @@ ${dockerignoreHelp}
 					projectName: project.name,
 					composition: compositionToBuild,
 					arch: opts.app.arch,
-					deviceType: opts.app.is_for__device_type[0].slug,
+					deviceType: (opts.app?.is_for__device_type as DeviceType[])?.[0].slug,
 					emulated: opts.buildEmulated,
 					buildOpts: opts.buildOpts,
 					inlineLogs: composeOpts.inlineLogs,
 					convertEol: composeOpts.convertEol,
 					dockerfilePath: composeOpts.dockerfilePath,
+					nogitignore: composeOpts.nogitignore,
 					multiDockerignore: composeOpts.multiDockerignore,
 				});
 				builtImagesByService = _.keyBy(builtImages, 'serviceName');
@@ -338,11 +324,11 @@ ${dockerignoreHelp}
 			);
 
 			let release: Release | ComposeReleaseInfo['release'];
-			if (appType.slug === 'legacy-v1' || appType.slug === 'legacy-v2') {
+			if (appType?.is_legacy) {
 				const { deployLegacy } = require('../utils/deploy-legacy');
 
 				const msg = getChalk().yellow(
-					'Target fleet requires legacy deploy method.',
+					'Target application requires legacy deploy method.',
 				);
 				logger.logWarn(msg);
 
@@ -386,8 +372,6 @@ ${dockerignoreHelp}
 					`Bearer ${auth}`,
 					apiEndpoint,
 					!opts.shouldUploadLogs,
-					composeOpts.projectPath,
-					opts.createAsDraft,
 				);
 			}
 

lib/commands/device/identify.ts

@@ -20,6 +20,7 @@ import type { IArg } from '@oclif/parser/lib/args';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import { tryAsInteger } from '../../utils/validation';
 import { ExpectedError } from '../../errors';
 
 interface FlagsDef {
@@ -42,6 +43,7 @@ export default class DeviceIdentifyCmd extends Command {
 		{
 			name: 'uuid',
 			description: 'the uuid of the device to identify',
+			parse: (dev) => tryAsInteger(dev),
 			required: true,
 		},
 	];

lib/commands/device/index.ts

@@ -21,12 +21,12 @@ import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { expandForAppName } from '../../utils/helpers';
 import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
-
+import { tryAsInteger } from '../../utils/validation';
 import type { Application, Release } from 'balena-sdk';
 
 interface ExtendedDevice extends DeviceWithDeviceType {
 	dashboard_url?: string;
-	fleet: string; // 'org/name' slug
+	application_name?: string;
 	device_type?: string;
 	commit?: string;
 	last_seen?: string;
@@ -43,7 +43,6 @@ interface ExtendedDevice extends DeviceWithDeviceType {
 
 interface FlagsDef {
 	help: void;
-	view: boolean;
 }
 
 interface ArgsDef {
@@ -56,15 +55,13 @@ export default class DeviceCmd extends Command {
 
 		Show information about a single device.
 		`;
-	public static examples = [
-		'$ balena device 7cf02a6',
-		'$ balena device 7cf02a6 --view',
-	];
+	public static examples = ['$ balena device 7cf02a6'];
 
 	public static args: Array<IArg<any>> = [
 		{
 			name: 'uuid',
 			description: 'the device uuid',
+			parse: (dev) => tryAsInteger(dev),
 			required: true,
 		},
 	];
@@ -73,19 +70,13 @@ export default class DeviceCmd extends Command {
 
 	public static flags: flags.Input<FlagsDef> = {
 		help: cf.help,
-		view: flags.boolean({
-			default: false,
-			description: 'open device dashboard page',
-		}),
 	};
 
 	public static authenticated = true;
 	public static primary = true;
 
 	public async run() {
-		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
-			DeviceCmd,
-		);
+		const { args: params } = this.parse<FlagsDef, ArgsDef>(DeviceCmd);
 
 		const balena = getBalenaSdk();
 
@@ -116,22 +107,13 @@ export default class DeviceCmd extends Command {
 			],
 			...expandForAppName,
 		})) as ExtendedDevice;
-
-		if (options.view) {
-			const open = await import('open');
-			const dashboardUrl = balena.models.device.getDashboardUrl(device.uuid);
-			await open(dashboardUrl, { wait: false });
-			return;
-		}
-
 		device.status = device.overall_status;
 
 		device.dashboard_url = balena.models.device.getDashboardUrl(device.uuid);
 
-		const belongsToApplication =
-			device.belongs_to__application as Application[];
-		device.fleet = belongsToApplication?.[0]
-			? belongsToApplication[0].slug
+		const belongsToApplication = device.belongs_to__application as Application[];
+		device.application_name = belongsToApplication?.[0]
+			? belongsToApplication[0].app_name
 			: 'N/a';
 
 		device.device_type = device.is_of__device_type[0].slug;
@@ -189,7 +171,7 @@ export default class DeviceCmd extends Command {
 				'ip_address',
 				'public_address',
 				'mac_address',
-				'fleet',
+				'application_name',
 				'last_seen',
 				'uuid',
 				'commit',

lib/commands/device/init.ts

@@ -23,61 +23,40 @@ import { applicationIdInfo } from '../../utils/messages';
 import { runCommand } from '../../utils/helpers';
 
 interface FlagsDef {
-	fleet?: string;
+	application?: string;
+	app?: string;
 	yes: boolean;
 	advanced: boolean;
 	'os-version'?: string;
 	drive?: string;
 	config?: string;
 	help: void;
-	'provisioning-key-name'?: string;
-	'provisioning-key-expiry-date'?: string;
 }
 
 export default class DeviceInitCmd extends Command {
 	public static description = stripIndent`
 		Initialize a device with balenaOS.
 
-		Register a new device in the selected fleet, download the OS image for the
-		fleet's default device type, configure the image and write it to an SD card.
-		This command effectively combines several other balena CLI commands in one,
-		namely:
+		Initialize a device by downloading the OS image of a certain application
+		and writing it to an SD Card.
 
-		'balena device register'  
-		'balena os download'  
-		'balena os build-config' or 'balena config generate'  
-		'balena os configure'  
-		'balena os local flash'
-
-		Possible arguments for the '--fleet', '--os-version' and '--drive' options can
-		be listed respectively with the commands:
-
-		'balena fleets'  
-		'balena os versions'  
-		'balena util available-drives'
-
-		If the '--fleet' or '--drive' options are omitted, interactive menus will be
-		presented with values to choose from. If the '--os-version' option is omitted,
-		the latest released OS version for the fleet's default device type will be used.
+		Note, if the application option is omitted it will be prompted
+		for interactively.
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
-
-		Image configuration questions will be asked interactively unless a pre-configured
-		'config.json' file is provided with the '--config' option.  The file can be
-		generated with the 'balena config generate' or 'balena os build-config' commands.
 	`;
 
 	public static examples = [
 		'$ balena device init',
-		'$ balena device init -f myorg/myfleet',
-		'$ balena device init --fleet myFleet --os-version 2.101.7 --drive /dev/disk5 --config config.json --yes',
-		'$ balena device init --fleet myFleet --os-version 2.83.21+rev1.prod --drive /dev/disk5 --config config.json --yes',
+		'$ balena device init --application MyApp',
+		'$ balena device init -a myorg/myapp',
 	];
 
 	public static usage = 'device init';
 
 	public static flags: flags.Input<FlagsDef> = {
-		fleet: cf.fleet,
+		application: cf.application,
+		app: cf.app,
 		yes: cf.yes,
 		advanced: flags.boolean({
 			char: 'v',
@@ -96,13 +75,6 @@ export default class DeviceInitCmd extends Command {
 		config: flags.string({
 			description: 'path to the config JSON file, see `balena os build-config`',
 		}),
-		'provisioning-key-name': flags.string({
-			description: 'custom key name assigned to generated provisioning api key',
-		}),
-		'provisioning-key-expiry-date': flags.string({
-			description:
-				'expiry date assigned to generated provisioning api key (format: YYYY-MM-DD)',
-		}),
 		help: cf.help,
 	};
 
@@ -123,21 +95,27 @@ export default class DeviceInitCmd extends Command {
 		const logger = await Command.getLogger();
 		const balena = getBalenaSdk();
 
+		// Consolidate application options
+		options.application = options.application || options.app;
+		delete options.app;
+
 		// Get application and
-		const application = options.fleet
-			? await getApplication(balena, options.fleet, {
-					$select: ['id', 'slug'],
-					$expand: {
-						is_for__device_type: {
-							$select: 'slug',
-						},
+		const application = (await getApplication(
+			balena,
+			options['application'] ||
+				(await (await import('../../utils/patterns')).selectApplication()).id,
+			{
+				$expand: {
+					is_for__device_type: {
+						$select: 'slug',
 					},
-			  })
-			: await (await import('../../utils/patterns')).selectApplication();
+				},
+			},
+		)) as ApplicationWithDeviceType;
 
 		// Register new device
 		const deviceUuid = balena.models.device.generateUniqueKey();
-		console.info(`Registering to ${application.slug}: ${deviceUuid}`);
+		console.info(`Registering to ${application.app_name}: ${deviceUuid}`);
 		await balena.models.device.register(application.id, deviceUuid);
 		const device = await balena.models.device.get(deviceUuid);
 
@@ -180,21 +158,6 @@ export default class DeviceInitCmd extends Command {
 		} else if (options.advanced) {
 			configureCommand.push('--advanced');
 		}
-
-		if (options['provisioning-key-name']) {
-			configureCommand.push(
-				'--provisioning-key-name',
-				options['provisioning-key-name'],
-			);
-		}
-
-		if (options['provisioning-key-expiry-date']) {
-			configureCommand.push(
-				'--provisioning-key-expiry-date',
-				options['provisioning-key-expiry-date'],
-			);
-		}
-
 		await runCommand(configureCommand);
 	}
 

lib/commands/device/local-mode.ts

@@ -20,6 +20,7 @@ import type { IArg } from '@oclif/parser/lib/args';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import { tryAsInteger } from '../../utils/validation';
 
 interface FlagsDef {
 	enable: boolean;
@@ -51,6 +52,7 @@ export default class DeviceLocalModeCmd extends Command {
 		{
 			name: 'uuid',
 			description: 'the uuid of the device to manage',
+			parse: (dev) => tryAsInteger(dev),
 			required: true,
 		},
 	];

lib/commands/device/move.ts

@@ -15,23 +15,22 @@
  * limitations under the License.
  */
 
-import type { flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import type { IArg } from '@oclif/parser/lib/args';
-import type {
-	BalenaSDK,
-	Device,
-	DeviceType,
-	PineOptions,
-	PineTypedResult,
-} from 'balena-sdk';
+import type { Application, BalenaSDK } from 'balena-sdk';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
-import { ExpectedError } from '../../errors';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 import { applicationIdInfo } from '../../utils/messages';
+import { ExpectedError } from '../../errors';
+
+interface ExtendedDevice extends DeviceWithDeviceType {
+	application_name?: string;
+}
 
 interface FlagsDef {
-	fleet?: string;
+	application?: string;
+	app?: string;
 	help: void;
 }
 
@@ -41,11 +40,12 @@ interface ArgsDef {
 
 export default class DeviceMoveCmd extends Command {
 	public static description = stripIndent`
-		Move one or more devices to another fleet.
+		Move one or more devices to another application.
 
-		Move one or more devices to another fleet.
+		Move one or more devices to another application.
 
-		If --fleet is omitted, the fleet will be prompted for interactively.
+		Note, if the application option is omitted it will be prompted
+		for interactively.
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 	`;
@@ -53,8 +53,8 @@ export default class DeviceMoveCmd extends Command {
 	public static examples = [
 		'$ balena device move 7cf02a6',
 		'$ balena device move 7cf02a6,dc39e52',
-		'$ balena device move 7cf02a6 --fleet MyNewFleet',
-		'$ balena device move 7cf02a6 -f myorg/mynewfleet',
+		'$ balena device move 7cf02a6 --application MyNewApp',
+		'$ balena device move 7cf02a6 -a myorg/mynewapp',
 	];
 
 	public static args: Array<IArg<any>> = [
@@ -69,39 +69,13 @@ export default class DeviceMoveCmd extends Command {
 	public static usage = 'device move <uuid(s)>';
 
 	public static flags: flags.Input<FlagsDef> = {
-		fleet: cf.fleet,
+		application: cf.application,
+		app: cf.app,
 		help: cf.help,
 	};
 
 	public static authenticated = true;
 
-	private async getDevices(balena: BalenaSDK, deviceUuids: string[]) {
-		const deviceOptions = {
-			$select: 'belongs_to__application',
-			$expand: {
-				is_of__device_type: {
-					$select: 'is_of__cpu_architecture',
-					$expand: {
-						is_of__cpu_architecture: {
-							$select: 'slug',
-						},
-					},
-				},
-			},
-		} satisfies PineOptions<Device>;
-
-		// TODO: Refacor once `device.get()` accepts an array of uuids`
-		const devices = await Promise.all(
-			deviceUuids.map(
-				(uuid) =>
-					balena.models.device.get(uuid, deviceOptions) as Promise<
-						PineTypedResult<Device, typeof deviceOptions>
-					>,
-			),
-		);
-		return devices;
-	}
-
 	public async run() {
 		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
 			DeviceMoveCmd,
@@ -109,24 +83,50 @@ export default class DeviceMoveCmd extends Command {
 
 		const balena = getBalenaSdk();
 
-		// Split uuids string into array of uuids
-		const deviceUuids = params.uuid.split(',');
+		const { tryAsInteger } = await import('../../utils/validation');
+		const { expandForAppName } = await import('../../utils/helpers');
 
-		const devices = await this.getDevices(balena, deviceUuids);
+		options.application = options.application || options.app;
+		delete options.app;
 
-		// Disambiguate application
+		// Parse ids string into array of correct types
+		const deviceIds: Array<string | number> = params.uuid
+			.split(',')
+			.map((id) => tryAsInteger(id));
+
+		// Get devices
+		const devices = await Promise.all(
+			deviceIds.map(
+				(uuid) =>
+					balena.models.device.get(uuid, expandForAppName) as Promise<
+						ExtendedDevice
+					>,
+			),
+		);
+
+		// Map application name for each device
+		for (const device of devices) {
+			const belongsToApplication = device.belongs_to__application as Application[];
+			device.application_name = belongsToApplication?.[0]
+				? belongsToApplication[0].app_name
+				: 'N/a';
+		}
+
+		// Disambiguate application (if is a number, it could either be an ID or a numerical name)
 		const { getApplication } = await import('../../utils/sdk');
 
 		// Get destination application
-		const application = options.fleet
-			? await getApplication(balena, options.fleet, { $select: ['id', 'slug'] })
+		const application = options.application
+			? await getApplication(balena, options.application)
 			: await this.interactivelySelectApplication(balena, devices);
 
 		// Move each device
-		for (const uuid of deviceUuids) {
+		for (const uuid of deviceIds) {
 			try {
 				await balena.models.device.move(uuid, application.id);
-				console.info(`Device ${uuid} was moved to fleet ${application.slug}`);
+				console.info(
+					`Device ${uuid} was moved to application ${application.slug}`,
+				);
 			} catch (err) {
 				console.info(`${err.message}, uuid: ${uuid}`);
 				process.exitCode = 1;
@@ -136,60 +136,45 @@ export default class DeviceMoveCmd extends Command {
 
 	async interactivelySelectApplication(
 		balena: BalenaSDK,
-		devices: Awaited<ReturnType<typeof this.getDevices>>,
+		devices: ExtendedDevice[],
 	) {
-		const { getExpandedProp } = await import('../../utils/pine');
-		// deduplicate the slugs
-		const deviceCpuArchs = Array.from(
-			new Set(
-				devices.map(
-					(d) => d.is_of__device_type[0].is_of__cpu_architecture[0].slug,
+		const [deviceDeviceTypes, deviceTypes] = await Promise.all([
+			Promise.all(
+				devices.map((device) =>
+					balena.models.device.getManifestBySlug(
+						device.is_of__device_type[0].slug,
+					),
 				),
 			),
-		);
+			balena.models.config.getDeviceTypes(),
+		]);
 
-		const deviceTypeOptions = {
-			$select: 'slug',
-			$expand: {
-				is_of__cpu_architecture: {
-					$select: 'slug',
-				},
-			},
-		} satisfies PineOptions<DeviceType>;
-		const deviceTypes = (await balena.models.deviceType.getAllSupported(
-			deviceTypeOptions,
-		)) as Array<PineTypedResult<DeviceType, typeof deviceTypeOptions>>;
-
-		const compatibleDeviceTypeSlugs = new Set(
-			deviceTypes
-				.filter((deviceType) => {
-					const deviceTypeArch = getExpandedProp(
-						deviceType.is_of__cpu_architecture,
-						'slug',
-					)!;
-					return deviceCpuArchs.every((deviceCpuArch) =>
-						balena.models.os.isArchitectureCompatibleWith(
-							deviceCpuArch,
-							deviceTypeArch,
-						),
-					);
-				})
-				.map((deviceType) => deviceType.slug),
+		const compatibleDeviceTypes = deviceTypes.filter((dt) =>
+			deviceDeviceTypes.every(
+				(deviceDeviceType) =>
+					balena.models.os.isArchitectureCompatibleWith(
+						deviceDeviceType.arch,
+						dt.arch,
+					) &&
+					!!dt.isDependent === !!deviceDeviceType.isDependent &&
+					dt.state !== 'DISCONTINUED',
+			),
 		);
 
 		const patterns = await import('../../utils/patterns');
 		try {
 			const application = await patterns.selectApplication(
 				(app) =>
-					compatibleDeviceTypeSlugs.has(app.is_for__device_type[0].slug) &&
-					devices.some(
-						(device) => device.belongs_to__application.__id !== app.id,
-					),
+					compatibleDeviceTypes.some(
+						(dt) => dt.slug === app.is_for__device_type[0].slug,
+					) &&
+					// @ts-ignore using the extended device object prop
+					devices.some((device) => device.application_name !== app.app_name),
 				true,
 			);
 			return application;
 		} catch (err) {
-			if (!compatibleDeviceTypeSlugs.size) {
+			if (deviceDeviceTypes.length) {
 				throw new ExpectedError(
 					`${err.message}\nDo all devices have a compatible architecture?`,
 				);

lib/commands/device/os-update.ts

@@ -20,6 +20,7 @@ import type { IArg } from '@oclif/parser/lib/args';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent, getCliForm } from '../../utils/lazy';
+import { tryAsInteger } from '../../utils/validation';
 import type { Device } from 'balena-sdk';
 import { ExpectedError } from '../../errors';
 
@@ -46,7 +47,6 @@ export default class DeviceOsUpdateCmd extends Command {
 		`;
 	public static examples = [
 		'$ balena device os-update 23c73a1',
-		'$ balena device os-update 23c73a1 --version 2.101.7',
 		'$ balena device os-update 23c73a1 --version 2.31.0+rev1.prod',
 	];
 
@@ -54,6 +54,7 @@ export default class DeviceOsUpdateCmd extends Command {
 		{
 			name: 'uuid',
 			description: 'the uuid of the device to update',
+			parse: (dev) => tryAsInteger(dev),
 			required: true,
 		},
 	];
@@ -78,15 +79,19 @@ export default class DeviceOsUpdateCmd extends Command {
 		const sdk = getBalenaSdk();
 
 		// Get device info
-		const { uuid, is_of__device_type, os_version, os_variant } =
-			(await sdk.models.device.get(params.uuid, {
-				$select: ['uuid', 'os_version', 'os_variant'],
-				$expand: {
-					is_of__device_type: {
-						$select: 'slug',
-					},
+		const {
+			uuid,
+			is_of__device_type,
+			os_version,
+			os_variant,
+		} = (await sdk.models.device.get(params.uuid, {
+			$select: ['uuid', 'os_version', 'os_variant'],
+			$expand: {
+				is_of__device_type: {
+					$select: 'slug',
 				},
-			})) as DeviceWithDeviceType;
+			},
+		})) as DeviceWithDeviceType;
 
 		// Get current device OS version
 		const currentOsVersion = sdk.models.device.getOsVersion({

lib/commands/device/pin.ts

@@ -1,103 +0,0 @@
-/**
- * @license
- * Copyright 2016-2020 Balena Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { flags } from '@oclif/command';
-import type { IArg } from '@oclif/parser/lib/args';
-import Command from '../../command';
-import * as cf from '../../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../../utils/lazy';
-import { getExpandedProp } from '../../utils/pine';
-
-interface FlagsDef {
-	help: void;
-}
-
-interface ArgsDef {
-	uuid: string;
-	releaseToPinTo?: string;
-}
-
-export default class DevicePinCmd extends Command {
-	public static description = stripIndent`
-		Pin a device to a release.
-
-		Pin a device to a release.
-
-		Note, if the commit is omitted, the currently pinned release will be printed, with instructions for how to see a list of releases
-		`;
-	public static examples = [
-		'$ balena device pin 7cf02a6',
-		'$ balena device pin 7cf02a6 91165e5',
-	];
-
-	public static args: Array<IArg<any>> = [
-		{
-			name: 'uuid',
-			description: 'the uuid of the device to pin to a release',
-			required: true,
-		},
-		{
-			name: 'releaseToPinTo',
-			description: 'the commit of the release for the device to get pinned to',
-		},
-	];
-
-	public static usage = 'device pin <uuid> [releaseToPinTo]';
-
-	public static flags: flags.Input<FlagsDef> = {
-		help: cf.help,
-	};
-
-	public static authenticated = true;
-
-	public async run() {
-		const { args: params } = this.parse<FlagsDef, ArgsDef>(DevicePinCmd);
-
-		const balena = getBalenaSdk();
-
-		const device = await balena.models.device.get(params.uuid, {
-			$expand: {
-				should_be_running__release: {
-					$select: 'commit',
-				},
-				belongs_to__application: {
-					$select: 'slug',
-				},
-			},
-		});
-
-		const pinnedRelease = getExpandedProp(
-			device.should_be_running__release,
-			'commit',
-		);
-		const appSlug = getExpandedProp(device.belongs_to__application, 'slug');
-
-		const releaseToPinTo = params.releaseToPinTo;
-
-		if (!releaseToPinTo) {
-			console.log(
-				`${
-					pinnedRelease
-						? `This device is currently pinned to ${pinnedRelease}.`
-						: 'This device is not currently pinned to any release.'
-				} \n\nTo see a list of all releases this device can be pinned to, run \`balena releases ${appSlug}\`.`,
-			);
-		} else {
-			await balena.models.device.pinToRelease(params.uuid, releaseToPinTo);
-		}
-	}
-}

lib/commands/device/public-url.ts

@@ -21,6 +21,7 @@ import Command from '../../command';
 import { ExpectedError } from '../../errors';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import { tryAsInteger } from '../../utils/validation';
 
 interface FlagsDef {
 	enable: boolean;
@@ -31,6 +32,8 @@ interface FlagsDef {
 
 interface ArgsDef {
 	uuid: string;
+	// Optional hidden arg to support old command format
+	legacyUuid?: string;
 }
 
 export default class DevicePublicUrlCmd extends Command {
@@ -40,6 +43,9 @@ export default class DevicePublicUrlCmd extends Command {
 		This command will output the current public URL for the
 		specified device.  It can also enable or disable the URL,
 		or output the enabled status, using the respective options.
+
+		The old command style 'balena device public-url enable <uuid>'
+		is deprecated, but still supported.
 	`;
 
 	public static examples = [
@@ -53,8 +59,15 @@ export default class DevicePublicUrlCmd extends Command {
 		{
 			name: 'uuid',
 			description: 'the uuid of the device to manage',
+			parse: (dev) => tryAsInteger(dev),
 			required: true,
 		},
+		{
+			// Optional hidden arg to support old command format
+			name: 'legacyUuid',
+			parse: (dev) => tryAsInteger(dev),
+			hidden: true,
+		},
 	];
 
 	public static usage = 'device public-url <uuid>';
@@ -82,6 +95,25 @@ export default class DevicePublicUrlCmd extends Command {
 			DevicePublicUrlCmd,
 		);
 
+		// Legacy command format support.
+		// Previously this command used the following format
+		// (changed due to oclif technicalities):
+		//   `balena device public-url enable|disable|status <uuid>`
+		if (params.legacyUuid) {
+			const action = params.uuid;
+			if (!['enable', 'disable', 'status'].includes(action)) {
+				throw new ExpectedError(
+					`Unexpected arguments: ${params.uuid} ${params.legacyUuid}`,
+				);
+			}
+
+			options.enable = action === 'enable';
+			options.disable = action === 'disable';
+			options.status = action === 'status';
+			params.uuid = params.legacyUuid;
+			delete params.legacyUuid;
+		}
+
 		const balena = getBalenaSdk();
 
 		if (options.enable) {

lib/commands/device/purge.ts

@@ -31,10 +31,10 @@ interface ArgsDef {
 
 export default class DevicePurgeCmd extends Command {
 	public static description = stripIndent`
-		Purge data from a device.
+		Purge application data from a device.
 
-		Purge data from a device.
-		This will clear the device's "/data" directory.
+		Purge application data from a device.
+		This will clear the application's /data directory.
 
 		Multiple devices may be specified with a comma-separated list
 		of values (no spaces).
@@ -63,14 +63,17 @@ export default class DevicePurgeCmd extends Command {
 	public async run() {
 		const { args: params } = this.parse<FlagsDef, ArgsDef>(DevicePurgeCmd);
 
+		const { tryAsInteger } = await import('../../utils/validation');
 		const balena = getBalenaSdk();
 		const ux = getCliUx();
 
-		const deviceUuids = params.uuid.split(',');
+		const deviceIds = params.uuid.split(',').map((id) => {
+			return tryAsInteger(id);
+		});
 
-		for (const uuid of deviceUuids) {
-			ux.action.start(`Purging data from device ${uuid}`);
-			await balena.models.device.purge(uuid);
+		for (const deviceId of deviceIds) {
+			ux.action.start(`Purging data from device ${deviceId}`);
+			await balena.models.device.purge(deviceId);
 			ux.action.stop();
 		}
 	}

lib/commands/device/reboot.ts

@@ -20,6 +20,7 @@ import type { IArg } from '@oclif/parser/lib/args';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import { tryAsInteger } from '../../utils/validation';
 
 interface FlagsDef {
 	force: boolean;
@@ -42,6 +43,7 @@ export default class DeviceRebootCmd extends Command {
 		{
 			name: 'uuid',
 			description: 'the uuid of the device to reboot',
+			parse: (dev) => tryAsInteger(dev),
 			required: true,
 		},
 	];

lib/commands/device/register.ts

@@ -25,45 +25,37 @@ import { applicationIdInfo } from '../../utils/messages';
 
 interface FlagsDef {
 	uuid?: string;
-	deviceType?: string;
 	help: void;
 }
 
 interface ArgsDef {
-	fleet: string;
+	application: string;
 }
 
 export default class DeviceRegisterCmd extends Command {
 	public static description = stripIndent`
-		Register a new device.
+		Register a device.
 
-		Register a new device with a balena fleet.
-
-		If --uuid is not provided, a new UUID will be automatically assigned.
+		Register a device to an application.
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 	`;
 
 	public static examples = [
-		'$ balena device register MyFleet',
-		'$ balena device register MyFleet --uuid <uuid>',
-		'$ balena device register myorg/myfleet --uuid <uuid>',
-		'$ balena device register myorg/myfleet --uuid <uuid> --deviceType <deviceTypeSlug>',
+		'$ balena device register MyApp',
+		'$ balena device register MyApp --uuid <uuid>',
+		'$ balena device register myorg/myapp --uuid <uuid>',
 	];
 
-	public static args: Array<IArg<any>> = [ca.fleetRequired];
+	public static args: Array<IArg<any>> = [ca.applicationRequired];
 
-	public static usage = 'device register <fleet>';
+	public static usage = 'device register <application>';
 
 	public static flags: flags.Input<FlagsDef> = {
 		uuid: flags.string({
 			description: 'custom uuid',
 			char: 'u',
 		}),
-		deviceType: flags.string({
-			description:
-				"device type slug (run 'balena devices supported' for possible values)",
-		}),
 		help: cf.help,
 	};
 
@@ -78,18 +70,12 @@ export default class DeviceRegisterCmd extends Command {
 
 		const balena = getBalenaSdk();
 
-		const application = await getApplication(balena, params.fleet, {
-			$select: ['id', 'slug'],
-		});
+		const application = await getApplication(balena, params.application);
 		const uuid = options.uuid ?? balena.models.device.generateUniqueKey();
 
-		console.info(`Registering to ${application.slug}: ${uuid}`);
+		console.info(`Registering to ${application.app_name}: ${uuid}`);
 
-		const result = await balena.models.device.register(
-			application.id,
-			uuid,
-			options.deviceType,
-		);
+		const result = await balena.models.device.register(application.id, uuid);
 
 		return result && result.uuid;
 	}

lib/commands/device/rename.ts

@@ -20,6 +20,7 @@ import type { IArg } from '@oclif/parser/lib/args';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent, getCliForm } from '../../utils/lazy';
+import { tryAsInteger } from '../../utils/validation';
 
 interface FlagsDef {
 	help: void;
@@ -47,6 +48,7 @@ export default class DeviceRenameCmd extends Command {
 		{
 			name: 'uuid',
 			description: 'the uuid of the device to rename',
+			parse: (dev) => tryAsInteger(dev),
 			required: true,
 		},
 		{

lib/commands/device/restart.ts

@@ -82,21 +82,24 @@ export default class DeviceRestartCmd extends Command {
 			DeviceRestartCmd,
 		);
 
+		const { tryAsInteger } = await import('../../utils/validation');
 		const balena = getBalenaSdk();
 		const ux = getCliUx();
 
-		const deviceUuids = params.uuid.split(',');
+		const deviceIds = params.uuid.split(',').map((id) => {
+			return tryAsInteger(id);
+		});
 		const serviceNames = options.service?.split(',');
 
-		// Iterate sequentially through deviceUuids.
+		// Iterate sequentially through deviceIds.
 		// We may later want to add a batching feature,
 		// so that n devices are processed in parallel
-		for (const uuid of deviceUuids) {
-			ux.action.start(`Restarting services on device ${uuid}`);
+		for (const deviceId of deviceIds) {
+			ux.action.start(`Restarting services on device ${deviceId}`);
 			if (serviceNames) {
-				await this.restartServices(balena, uuid, serviceNames);
+				await this.restartServices(balena, deviceId, serviceNames);
 			} else {
-				await this.restartAllServices(balena, uuid);
+				await this.restartAllServices(balena, deviceId);
 			}
 			ux.action.stop();
 		}
@@ -104,7 +107,7 @@ export default class DeviceRestartCmd extends Command {
 
 	async restartServices(
 		balena: BalenaSDK,
-		deviceUuid: string,
+		deviceId: number | string,
 		serviceNames: string[],
 	) {
 		const { ExpectedError, instanceOf } = await import('../../errors');
@@ -113,7 +116,7 @@ export default class DeviceRestartCmd extends Command {
 		// Get device
 		let device: DeviceWithServiceDetails<CurrentServiceWithCommit>;
 		try {
-			device = await balena.models.device.getWithServiceDetails(deviceUuid, {
+			device = await balena.models.device.getWithServiceDetails(deviceId, {
 				$expand: {
 					is_running__release: { $select: 'commit' },
 				},
@@ -121,7 +124,7 @@ export default class DeviceRestartCmd extends Command {
 		} catch (e) {
 			const { BalenaDeviceNotFound } = await import('balena-errors');
 			if (instanceOf(e, BalenaDeviceNotFound)) {
-				throw new ExpectedError(`Device ${deviceUuid} not found.`);
+				throw new ExpectedError(`Device ${deviceId} not found.`);
 			} else {
 				throw e;
 			}
@@ -133,7 +136,7 @@ export default class DeviceRestartCmd extends Command {
 		serviceNames.forEach((service) => {
 			if (!device.current_services[service]) {
 				throw new ExpectedError(
-					`Service ${service} not found on device ${deviceUuid}.`,
+					`Service ${service} not found on device ${deviceId}.`,
 				);
 			}
 		});
@@ -152,7 +155,7 @@ export default class DeviceRestartCmd extends Command {
 			if (serviceContainer) {
 				restartPromises.push(
 					balena.models.device.restartService(
-						deviceUuid,
+						deviceId,
 						serviceContainer.image_id,
 					),
 				);
@@ -163,32 +166,32 @@ export default class DeviceRestartCmd extends Command {
 			await Promise.all(restartPromises);
 		} catch (e) {
 			if (e.message.toLowerCase().includes('no online device')) {
-				throw new ExpectedError(`Device ${deviceUuid} is not online.`);
+				throw new ExpectedError(`Device ${deviceId} is not online.`);
 			} else {
 				throw e;
 			}
 		}
 	}
 
-	async restartAllServices(balena: BalenaSDK, deviceUuid: string) {
+	async restartAllServices(balena: BalenaSDK, deviceId: number | string) {
 		// Note: device.restartApplication throws `BalenaDeviceNotFound: Device not found` if device not online.
 		// Need to use device.get first to distinguish between non-existant and offline devices.
 		// Remove this workaround when SDK issue resolved: https://github.com/balena-io/balena-sdk/issues/649
 		const { instanceOf, ExpectedError } = await import('../../errors');
 		try {
-			const device = await balena.models.device.get(deviceUuid);
+			const device = await balena.models.device.get(deviceId);
 			if (!device.is_online) {
-				throw new ExpectedError(`Device ${deviceUuid} is not online.`);
+				throw new ExpectedError(`Device ${deviceId} is not online.`);
 			}
 		} catch (e) {
 			const { BalenaDeviceNotFound } = await import('balena-errors');
 			if (instanceOf(e, BalenaDeviceNotFound)) {
-				throw new ExpectedError(`Device ${deviceUuid} not found.`);
+				throw new ExpectedError(`Device ${deviceId} not found.`);
 			} else {
 				throw e;
 			}
 		}
 
-		await balena.models.device.restartApplication(deviceUuid);
+		await balena.models.device.restartApplication(deviceId);
 	}
 }

lib/commands/device/rm.ts

@@ -20,6 +20,7 @@ import type { IArg } from '@oclif/parser/lib/args';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import { tryAsInteger } from '../../utils/validation';
 
 interface FlagsDef {
 	yes: boolean;
@@ -83,7 +84,7 @@ export default class DeviceRmCmd extends Command {
 		// Remove
 		for (const uuid of uuids) {
 			try {
-				await balena.models.device.remove(uuid);
+				await balena.models.device.remove(tryAsInteger(uuid));
 			} catch (err) {
 				console.info(`${err.message}, uuid: ${uuid}`);
 				process.exitCode = 1;

lib/commands/device/shutdown.ts

@@ -20,6 +20,7 @@ import type { IArg } from '@oclif/parser/lib/args';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import { tryAsInteger } from '../../utils/validation';
 import { ExpectedError } from '../../errors';
 
 interface FlagsDef {
@@ -43,6 +44,7 @@ export default class DeviceShutdownCmd extends Command {
 		{
 			name: 'uuid',
 			description: 'the uuid of the device to shutdown',
+			parse: (dev) => tryAsInteger(dev),
 			required: true,
 		},
 	];

lib/commands/device/track-fleet.ts

@@ -1,63 +0,0 @@
-/**
- * @license
- * Copyright 2016-2020 Balena Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { flags } from '@oclif/command';
-import type { IArg } from '@oclif/parser/lib/args';
-import Command from '../../command';
-import * as cf from '../../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../../utils/lazy';
-
-interface FlagsDef {
-	help: void;
-}
-
-interface ArgsDef {
-	uuid: string;
-}
-
-export default class DeviceTrackFleetCmd extends Command {
-	public static description = stripIndent`
-		Make a device track the fleet's pinned release.
-
-		Make a device track the fleet's pinned release.
-		`;
-	public static examples = ['$ balena device track-fleet 7cf02a6'];
-
-	public static args: Array<IArg<any>> = [
-		{
-			name: 'uuid',
-			description: "the uuid of the device to make track the fleet's release",
-			required: true,
-		},
-	];
-
-	public static usage = 'device track-fleet <uuid>';
-
-	public static flags: flags.Input<FlagsDef> = {
-		help: cf.help,
-	};
-
-	public static authenticated = true;
-
-	public async run() {
-		const { args: params } = this.parse<FlagsDef, ArgsDef>(DeviceTrackFleetCmd);
-
-		const balena = getBalenaSdk();
-
-		await balena.models.device.trackApplicationRelease(params.uuid);
-	}
-}

lib/commands/devices/index.ts

@@ -21,34 +21,28 @@ import * as cf from '../../utils/common-flags';
 import { expandForAppName } from '../../utils/helpers';
 import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 import { applicationIdInfo, jsonInfo } from '../../utils/messages';
+import type { Application } from 'balena-sdk';
 
-import type { Device, PineOptions } from 'balena-sdk';
+interface ExtendedDevice extends DeviceWithDeviceType {
+	dashboard_url?: string;
+	application_name?: string | null;
+	device_type?: string | null;
+}
 
 interface FlagsDef {
-	fleet?: string;
+	application?: string;
+	app?: string;
 	help: void;
 	json: boolean;
 }
 
-const devicesSelectFields = {
-	$select: [
-		'id',
-		'uuid',
-		'device_name',
-		'status',
-		'is_online',
-		'supervisor_version',
-		'os_version',
-	],
-} satisfies PineOptions<Device>;
-
 export default class DevicesCmd extends Command {
 	public static description = stripIndent`
 		List all devices.
 
-		List all of your devices.
+		list all devices that belong to you.
 
-		Devices can be filtered by fleet with the \`--fleet\` option.
+		You can filter the devices by application by using the \`--application\` option.
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 
@@ -56,14 +50,17 @@ export default class DevicesCmd extends Command {
 	`;
 	public static examples = [
 		'$ balena devices',
-		'$ balena devices --fleet MyFleet',
-		'$ balena devices -f myorg/myfleet',
+		'$ balena devices --application MyApp',
+		'$ balena devices --app MyApp',
+		'$ balena devices -a MyApp',
+		'$ balena devices -a myorg/myapp',
 	];
 
 	public static usage = 'devices';
 
 	public static flags: flags.Input<FlagsDef> = {
-		fleet: cf.fleet,
+		application: cf.application,
+		app: cf.app,
 		json: cf.json,
 		help: cf.help,
 	};
@@ -76,57 +73,60 @@ export default class DevicesCmd extends Command {
 		const { flags: options } = this.parse<FlagsDef, {}>(DevicesCmd);
 
 		const balena = getBalenaSdk();
-		const devicesOptions = {
-			...devicesSelectFields,
-			...expandForAppName,
-			$orderby: { device_name: 'asc' },
-		} satisfies PineOptions<Device>;
 
-		const devices = (
-			await (async () => {
-				if (options.fleet != null) {
-					const { getApplication } = await import('../../utils/sdk');
-					const application = await getApplication(balena, options.fleet, {
-						$select: 'slug',
-						$expand: {
-							owns__device: devicesOptions,
-						},
-					});
-					return application.owns__device;
-				}
+		// Consolidate application options
+		options.application = options.application || options.app;
+		delete options.app;
 
-				return await balena.pine.get({
-					resource: 'device',
-					options: devicesOptions,
-				});
-			})()
-		).map((device) => ({
-			...device,
-			dashboard_url: balena.models.device.getDashboardUrl(device.uuid),
-			fleet: device.belongs_to__application?.[0]?.slug || null,
-			uuid: options.json ? device.uuid : device.uuid.slice(0, 7),
-			device_type: device.is_of__device_type?.[0]?.slug || null,
-		}));
+		let devices;
 
-		const fields: Array<keyof (typeof devices)[number]> = [
+		if (options.application != null) {
+			const { getApplication } = await import('../../utils/sdk');
+			const application = await getApplication(balena, options.application);
+			devices = (await balena.models.device.getAllByApplication(
+				application.id,
+				expandForAppName,
+			)) as ExtendedDevice[];
+		} else {
+			devices = (await balena.models.device.getAll(
+				expandForAppName,
+			)) as ExtendedDevice[];
+		}
+
+		devices = devices.map(function (device) {
+			device.dashboard_url = balena.models.device.getDashboardUrl(device.uuid);
+
+			const belongsToApplication = device.belongs_to__application as Application[];
+			device.application_name = belongsToApplication?.[0]?.app_name || null;
+
+			device.uuid = options.json ? device.uuid : device.uuid.slice(0, 7);
+
+			device.device_type = device.is_of__device_type?.[0]?.slug || null;
+			return device;
+		});
+
+		const fields = [
 			'id',
 			'uuid',
 			'device_name',
 			'device_type',
-			'fleet',
+			'application_name',
 			'status',
 			'is_online',
 			'supervisor_version',
 			'os_version',
 			'dashboard_url',
 		];
-
+		const _ = await import('lodash');
 		if (options.json) {
-			const { pickAndRename } = await import('../../utils/helpers');
-			const mapped = devices.map((device) => pickAndRename(device, fields));
-			console.log(JSON.stringify(mapped, null, 4));
+			console.log(
+				JSON.stringify(
+					devices.map((device) => _.pick(device, fields)),
+					null,
+					4,
+				),
+			);
 		} else {
-			const _ = await import('lodash');
 			console.log(
 				getVisuals().table.horizontal(
 					devices.map((dev) => _.mapValues(dev, (val) => val ?? 'N/a')),

lib/commands/devices/supported.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2016-2021 Balena Ltd.
+ * Copyright 2016-2019 Balena Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import { flags } from '@oclif/command';
-import type * as BalenaSdk from 'balena-sdk';
+import type * as SDK from 'balena-sdk';
 import * as _ from 'lodash';
 import Command from '../../command';
 
@@ -24,8 +24,10 @@ import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 import { CommandHelp } from '../../utils/oclif-utils';
 
 interface FlagsDef {
+	discontinued: boolean;
 	help: void;
 	json?: boolean;
+	verbose?: boolean;
 }
 
 export default class DevicesSupportedCmd extends Command {
@@ -34,6 +36,11 @@ export default class DevicesSupportedCmd extends Command {
 
 		List the supported device types (like 'raspberrypi3' or 'intel-nuc').
 
+		The --verbose option adds extra columns/fields to the output, including the
+		"STATE" column whose values are one of 'new', 'released' or 'discontinued'.
+		However, 'discontinued' device types are only listed if the '--discontinued'
+		option is used.
+
 		The --json option is recommended when scripting the output of this command,
 		because the JSON format is less likely to change and it better represents data
 		types like lists and empty strings (for example, the ALIASES column contains a
@@ -42,7 +49,8 @@ export default class DevicesSupportedCmd extends Command {
 `;
 	public static examples = [
 		'$ balena devices supported',
-		'$ balena devices supported --json',
+		'$ balena devices supported --verbose',
+		'$ balena devices supported -vj',
 	];
 
 	public static usage = (
@@ -51,49 +59,55 @@ export default class DevicesSupportedCmd extends Command {
 	).trim();
 
 	public static flags: flags.Input<FlagsDef> = {
+		discontinued: flags.boolean({
+			description: 'include "discontinued" device types',
+		}),
 		help: cf.help,
 		json: flags.boolean({
 			char: 'j',
 			description: 'produce JSON output instead of tabular output',
 		}),
+		verbose: flags.boolean({
+			char: 'v',
+			description:
+				'add extra columns in the tabular output (ALIASES, ARCH, STATE)',
+		}),
 	};
 
 	public async run() {
 		const { flags: options } = this.parse<FlagsDef, {}>(DevicesSupportedCmd);
-		const pineOptions = {
-			$select: ['slug', 'name'],
-			$expand: {
-				is_of__cpu_architecture: { $select: 'slug' },
-				device_type_alias: {
-					$select: 'is_referenced_by__alias',
-					$orderby: { is_referenced_by__alias: 'asc' },
-				},
+		const dts = await getBalenaSdk().models.config.getDeviceTypes();
+		let deviceTypes: Array<Partial<SDK.DeviceTypeJson.DeviceType>> = dts.map(
+			(d) => {
+				if (d.aliases && d.aliases.length) {
+					// remove aliases that are equal to the slug
+					d.aliases = d.aliases.filter((alias: string) => alias !== d.slug);
+					if (!options.json) {
+						// stringify the aliases array with commas and spaces
+						d.aliases = [d.aliases.join(', ')];
+					}
+				} else {
+					// ensure it is always an array (for the benefit of JSON output)
+					d.aliases = [];
+				}
+				return d;
 			},
-		} satisfies BalenaSdk.PineOptions<BalenaSdk.DeviceType>;
-		const dts = (await getBalenaSdk().models.deviceType.getAllSupported(
-			pineOptions,
-		)) as Array<
-			BalenaSdk.PineTypedResult<BalenaSdk.DeviceType, typeof pineOptions>
-		>;
-		interface DT {
-			slug: string;
-			aliases: string[];
-			arch: string;
-			name: string;
+		);
+		if (!options.discontinued) {
+			deviceTypes = deviceTypes.filter((dt) => dt.state !== 'DISCONTINUED');
 		}
-		let deviceTypes = dts.map((dt): DT => {
-			const aliases = dt.device_type_alias
-				.map((dta) => dta.is_referenced_by__alias)
-				.filter((alias) => alias !== dt.slug);
-			return {
-				slug: dt.slug,
-				aliases: options.json ? aliases : [aliases.join(', ')],
-				arch: dt.is_of__cpu_architecture[0]?.slug || 'n/a',
-				name: dt.name || 'N/A',
-			};
-		});
-		const fields = ['slug', 'aliases', 'arch', 'name'];
-		deviceTypes = _.sortBy(deviceTypes, fields);
+		const fields = options.verbose
+			? ['slug', 'aliases', 'arch', 'state', 'name']
+			: ['slug', 'aliases', 'arch', 'name'];
+		deviceTypes = _.sortBy(
+			deviceTypes.map((d) => {
+				const picked = _.pick(d, fields);
+				// 'BETA' renamed to 'NEW'
+				picked.state = picked.state === 'BETA' ? 'NEW' : picked.state;
+				return picked;
+			}),
+			fields,
+		);
 		if (options.json) {
 			console.log(JSON.stringify(deviceTypes, null, 4));
 		} else {

lib/commands/env/add.ts

@@ -24,7 +24,7 @@ import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 import { applicationIdInfo } from '../../utils/messages';
 
 interface FlagsDef {
-	fleet?: string;
+	application?: string;
 	device?: string; // device UUID
 	help: void;
 	quiet: boolean;
@@ -38,17 +38,18 @@ interface ArgsDef {
 
 export default class EnvAddCmd extends Command {
 	public static description = stripIndent`
-		Add env or config variable to fleets, devices or services.
+		Add env or config variable to application(s), device(s) or service(s).
 
-		Add an environment or config variable to one or more fleets, devices or
-		services, as selected by the respective command-line options. Either the
-		--fleet or the --device option must be provided,  and either may be be
+		Add an environment or config variable to one or more applications, devices
+		or services, as selected by the respective command-line options. Either the
+		--application or the --device option must be provided, and either may be be
 		used alongside the --service option to define a service-specific variable.
-		(A service corresponds to a Docker image/container in a microservices fleet.)
+		(A service is an application container in a "microservices" application.)
 		When the --service option is used in conjunction with the --device option,
-		the service variable applies to the selected device only.  Otherwise, it
-		applies to all devices of the selected fleet. If the --service option is
-		omitted, the variable applies to all services.
+		the service variable applies to the selected device only. Otherwise, it
+		applies to all devices of the selected application (i.e., the application's
+		fleet). If the --service option is omitted, the variable applies to all
+		services.
 
 		If VALUE is omitted, the CLI will attempt to use the value of the environment
 		variable of same name in the CLI process' environment. In this case, a warning
@@ -60,18 +61,19 @@ export default class EnvAddCmd extends Command {
 		running on devices. They are also stored differently in the balenaCloud API
 		database. Configuration variables cannot be set for specific services,
 		therefore the --service option cannot be used when the variable name starts
-		with a reserved prefix. When defining custom fleet variables, please avoid
-		these reserved prefixes.
+		with a reserved prefix. When defining custom application variables, please
+		avoid the reserved prefixes.
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 	`;
 
 	public static examples = [
-		'$ balena env add TERM --fleet MyFleet',
-		'$ balena env add EDITOR vim -f myorg/myfleet',
-		'$ balena env add EDITOR vim --fleet MyFleet,MyFleet2',
-		'$ balena env add EDITOR vim --fleet MyFleet --service MyService',
-		'$ balena env add EDITOR vim --fleet MyFleet,MyFleet2 --service MyService,MyService2',
+		'$ balena env add TERM --application MyApp',
+		'$ balena env add EDITOR vim --application MyApp',
+		'$ balena env add EDITOR vim -a myorg/myapp',
+		'$ balena env add EDITOR vim --application MyApp,MyApp2',
+		'$ balena env add EDITOR vim --application MyApp --service MyService',
+		'$ balena env add EDITOR vim --application MyApp,MyApp2 --service MyService,MyService2',
 		'$ balena env add EDITOR vim --device 7cf02a6',
 		'$ balena env add EDITOR vim --device 7cf02a6,d6f1433',
 		'$ balena env add EDITOR vim --device 7cf02a6 --service MyService',
@@ -95,8 +97,8 @@ export default class EnvAddCmd extends Command {
 	public static usage = 'env add <name> [value]';
 
 	public static flags: flags.Input<FlagsDef> = {
-		fleet: { ...cf.fleet, exclusive: ['device'] },
-		device: { ...cf.device, exclusive: ['fleet'] },
+		application: { ...cf.application, exclusive: ['device'] },
+		device: { ...cf.device, exclusive: ['application'] },
 		help: cf.help,
 		quiet: cf.quiet,
 		service: cf.service,
@@ -108,9 +110,9 @@ export default class EnvAddCmd extends Command {
 		);
 		const cmd = this;
 
-		if (!options.fleet && !options.device) {
+		if (!options.application && !options.device) {
 			throw new ExpectedError(
-				'Either the --fleet or the --device option must be specified',
+				'Either the --application or the --device option must be specified',
 			);
 		}
 
@@ -150,16 +152,16 @@ export default class EnvAddCmd extends Command {
 		}
 
 		const varType = isConfigVar ? 'configVar' : 'envVar';
-		if (options.fleet) {
-			for (const appSlug of await resolveFleetSlugs(balena, options.fleet)) {
+		if (options.application) {
+			for (const app of options.application.split(',')) {
 				try {
 					await balena.models.application[varType].set(
-						appSlug,
+						app,
 						params.name,
 						params.value,
 					);
 				} catch (err) {
-					console.error(`${err.message}, fleet: ${appSlug}`);
+					console.error(`${err.message}, app: ${app}`);
 					process.exitCode = 1;
 				}
 			}
@@ -180,45 +182,26 @@ export default class EnvAddCmd extends Command {
 	}
 }
 
-// TODO: Stop accepting application names in the next major
-// and just drop this in favor of doing the .split(',') directly.
-async function resolveFleetSlugs(
-	balena: BalenaSdk.BalenaSDK,
-	fleetOption: string,
-) {
-	const fleetSlugs: string[] = [];
-	const { getFleetSlug } = await import('../../utils/sdk');
-	for (const appNameOrSlug of fleetOption.split(',')) {
-		try {
-			fleetSlugs.push(await getFleetSlug(balena, appNameOrSlug));
-		} catch (err) {
-			console.error(`${err.message}, fleet: ${appNameOrSlug}`);
-			process.exitCode = 1;
-		}
-	}
-	return fleetSlugs;
-}
-
 /**
- * Add service variables for a device or fleet.
+ * Add service variables for a device or application.
  */
 async function setServiceVars(
 	sdk: BalenaSdk.BalenaSDK,
 	params: ArgsDef,
 	options: FlagsDef,
 ) {
-	if (options.fleet) {
-		for (const appSlug of await resolveFleetSlugs(sdk, options.fleet)) {
+	if (options.application) {
+		for (const app of options.application.split(',')) {
 			for (const service of options.service!.split(',')) {
 				try {
-					const serviceId = await getServiceIdForApp(sdk, appSlug, service);
+					const serviceId = await getServiceIdForApp(sdk, app, service);
 					await sdk.models.service.var.set(
 						serviceId,
 						params.name,
 						params.value!,
 					);
 				} catch (err) {
-					console.error(`${err.message}, fleet: ${appSlug}`);
+					console.error(`${err.message}, application: ${app}`);
 					process.exitCode = 1;
 				}
 			}
@@ -233,7 +216,7 @@ async function setServiceVars(
 					sdk,
 					uuid,
 					['id'],
-					['slug'],
+					['app_name'],
 				);
 			} catch (err) {
 				console.error(`${err.message}, device: ${uuid}`);
@@ -242,7 +225,11 @@ async function setServiceVars(
 			}
 			for (const service of options.service!.split(',')) {
 				try {
-					const serviceId = await getServiceIdForApp(sdk, app.slug, service);
+					const serviceId = await getServiceIdForApp(
+						sdk,
+						app.app_name,
+						service,
+					);
 					await sdk.models.device.serviceVar.set(
 						device.id,
 						serviceId,
@@ -263,11 +250,11 @@ async function setServiceVars(
  */
 async function getServiceIdForApp(
 	sdk: BalenaSdk.BalenaSDK,
-	appSlug: string,
+	appName: string,
 	serviceName: string,
 ): Promise<number> {
 	let serviceId: number | undefined;
-	const services = await sdk.models.service.getAllByApplication(appSlug, {
+	const services = await sdk.models.service.getAllByApplication(appName, {
 		$filter: { service_name: serviceName },
 	});
 	if (services.length > 0) {
@@ -275,7 +262,7 @@ async function getServiceIdForApp(
 	}
 	if (serviceId === undefined) {
 		throw new ExpectedError(
-			`Cannot find service ${serviceName} for fleet ${appSlug}`,
+			`Cannot find service ${serviceName} for application ${appName}`,
 		);
 	}
 	return serviceId;

lib/commands/env/rename.ts

@@ -38,9 +38,9 @@ interface ArgsDef {
 
 export default class EnvRenameCmd extends Command {
 	public static description = stripIndent`
-		Change the value of a config or env var for a fleet, device or service.
+		Change the value of a config or env var for an app, device or service.
 
-		Change the value of a configuration or environment variable for a fleet,
+		Change the value of a configuration or environment variable for an application,
 		device or service, as selected by command-line options.
 
 		${ec.rmRenameHelp.split('\n').join('\n\t\t')}

lib/commands/env/rm.ts

@@ -37,9 +37,9 @@ interface ArgsDef {
 
 export default class EnvRmCmd extends Command {
 	public static description = stripIndent`
-		Remove a config or env var from a fleet, device or service.
+		Remove a config or env var from an application, device or service.
 
-		Remove a configuration or environment variable from a fleet, device
+		Remove a configuration or environment variable from an application, device
 		or service, as selected by command-line options.
 
 		${ec.rmRenameHelp.split('\n').join('\n\t\t')}
@@ -91,6 +91,8 @@ export default class EnvRmCmd extends Command {
 		await confirm(
 			opt.yes || false,
 			'Are you sure you want to delete the environment variable?',
+			undefined,
+			true,
 		);
 
 		const balena = getBalenaSdk();

lib/commands/envs.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2016-2021 Balena Ltd.
+ * Copyright 2016-2019 Balena Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,52 +22,54 @@ import { ExpectedError } from '../errors';
 import * as cf from '../utils/common-flags';
 import { getBalenaSdk, getVisuals, stripIndent } from '../utils/lazy';
 import { applicationIdInfo } from '../utils/messages';
+import { isV13 } from '../utils/version';
 
 interface FlagsDef {
-	fleet?: string;
+	application?: string;
 	config: boolean;
 	device?: string; // device UUID
 	json: boolean;
 	help: void;
 	service?: string; // service name
+	verbose: boolean;
 }
 
 interface EnvironmentVariableInfo extends SDK.EnvironmentVariableBase {
-	fleet?: string | null; // fleet slug
+	appName?: string | null; // application name
 	deviceUUID?: string; // device UUID
 	serviceName?: string; // service name
 }
 
 interface DeviceServiceEnvironmentVariableInfo
 	extends SDK.DeviceServiceEnvironmentVariable {
-	fleet?: string; // fleet slug
+	appName?: string; // application name
 	deviceUUID?: string; // device UUID
 	serviceName?: string; // service name
 }
 
 interface ServiceEnvironmentVariableInfo
 	extends SDK.ServiceEnvironmentVariable {
-	fleet?: string; // fleet slug
+	appName?: string; // application name
 	deviceUUID?: string; // device UUID
 	serviceName?: string; // service name
 }
 
 export default class EnvsCmd extends Command {
 	public static description = stripIndent`
-		List the environment or config variables of a fleet, device or service.
+		List the environment or config variables of an application, device or service.
 
-		List the environment or configuration variables of a fleet, device or
-		service, as selected by the respective command-line options. (A service
-		corresponds to a Docker image/container in a microservices fleet.)
+		List the environment or configuration variables of an application, device or
+		service, as selected by the respective command-line options. (A service is
+		an application container in a "microservices" application.)
 
-		The results include fleet-wide (multiple devices), device-specific (multiple
-		services on a specific device) and service-specific variables that apply to the
-		selected fleet, device or service. It can be thought of as including inherited
-		variables; for example, a service inherits device-wide variables, and a device
-		inherits fleet-wide variables.
+		The results include application-wide (fleet), device-wide (multiple services on
+		a device) and service-specific variables that apply to the selected application,
+		device or service. It can be thought of as including "inherited" variables;
+		for example, a service inherits device-wide variables, and a device inherits
+		application-wide variables.
 
 		The printed output may include DEVICE and/or SERVICE columns to distinguish
-		between fleet-wide, device-specific and service-specific variables.
+		between application-wide, device-specific and service-specific variables.
 		An asterisk in these columns indicates that the variable applies to
 		"all devices" or "all services".
 
@@ -81,20 +83,22 @@ export default class EnvsCmd extends Command {
 		types like lists and empty strings. The 'jq' utility may be helpful in shell
 		scripts (https://stedolan.github.io/jq/manual/). When --json is used, an empty
 		JSON array ([]) is printed instead of an error message when no variables exist
-		for the given query. When querying variables for a device, note that the fleet
-		name may be null in JSON output (or 'N/A' in tabular output) if the fleet that
-		the device belonged to is no longer accessible by the current user (for example,
-		in case the current user was removed from the fleet by the fleet's owner).
+		for the given query. When querying variables for a device, note that the
+		application name may be null in JSON output (or 'N/A' in tabular output) if the
+		application linked to the device is no longer accessible by the current user
+		(for example, in case the current user has been removed from the application
+		by its owner).
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 	`;
 
 	public static examples = [
-		'$ balena envs --fleet myorg/myfleet',
-		'$ balena envs --fleet MyFleet --json',
-		'$ balena envs --fleet MyFleet --service MyService',
-		'$ balena envs --fleet MyFleet --service MyService',
-		'$ balena envs --fleet MyFleet --config',
+		'$ balena envs --application MyApp',
+		'$ balena envs --application myorg/myapp',
+		'$ balena envs --application MyApp --json',
+		'$ balena envs --application MyApp --service MyService',
+		'$ balena envs --application MyApp --service MyService',
+		'$ balena envs --application MyApp --config',
 		'$ balena envs --device 7cf02a6',
 		'$ balena envs --device 7cf02a6 --json',
 		'$ balena envs --device 7cf02a6 --config --json',
@@ -104,35 +108,44 @@ export default class EnvsCmd extends Command {
 	public static usage = 'envs';
 
 	public static flags: flags.Input<FlagsDef> = {
-		fleet: { ...cf.fleet, exclusive: ['device'] },
+		...(isV13()
+			? {}
+			: {
+					all: flags.boolean({
+						default: false,
+						description: stripIndent`
+				No-op since balena CLI v12.0.0.`,
+						hidden: true,
+					}),
+			  }),
+
+		application: { exclusive: ['device'], ...cf.application },
 		config: flags.boolean({
 			default: false,
 			char: 'c',
 			description: 'show configuration variables only',
 			exclusive: ['service'],
 		}),
-		device: { ...cf.device, exclusive: ['fleet'] },
+		device: { exclusive: ['application'], ...cf.device },
 		help: cf.help,
 		json: cf.json,
-		service: { ...cf.service, exclusive: ['config'] },
+		verbose: cf.verbose,
+		service: { exclusive: ['config'], ...cf.service },
 	};
 
 	public async run() {
 		const { flags: options } = this.parse<FlagsDef, {}>(EnvsCmd);
-
 		const variables: EnvironmentVariableInfo[] = [];
 
 		await Command.checkLoggedIn();
 
-		if (!options.fleet && !options.device) {
-			throw new ExpectedError('Missing --fleet or --device option');
+		if (!options.application && !options.device) {
+			throw new ExpectedError('You must specify an application or device');
 		}
 
 		const balena = getBalenaSdk();
 
-		let fleetSlug: string | undefined = options.fleet
-			? await (await import('../utils/sdk')).getFleetSlug(balena, options.fleet)
-			: undefined;
+		let appNameOrSlug = options.application;
 		let fullUUID: string | undefined; // as oppposed to the short, 7-char UUID
 
 		if (options.device) {
@@ -141,27 +154,27 @@ export default class EnvsCmd extends Command {
 				balena,
 				options.device,
 				['uuid'],
-				['slug'],
+				['app_name'],
 			);
 			fullUUID = device.uuid;
 			if (app) {
-				fleetSlug = app.slug;
+				appNameOrSlug = app.app_name;
 			}
 		}
-		if (fleetSlug && options.service) {
-			await validateServiceName(balena, options.service, fleetSlug);
+		if (appNameOrSlug && options.service) {
+			await validateServiceName(balena, options.service, appNameOrSlug);
 		}
-		variables.push(...(await getAppVars(balena, fleetSlug, options)));
+		variables.push(...(await getAppVars(balena, appNameOrSlug, options)));
 		if (fullUUID) {
 			variables.push(
-				...(await getDeviceVars(balena, fullUUID, fleetSlug, options)),
+				...(await getDeviceVars(balena, fullUUID, appNameOrSlug, options)),
 			);
 		}
 		if (!options.json && variables.length === 0) {
 			const target =
 				(options.service ? `service "${options.service}" of ` : '') +
-				(options.fleet
-					? `fleet "${options.fleet}"`
+				(options.application
+					? `application "${options.application}"`
 					: `device "${options.device}"`);
 			throw new ExpectedError(`No environment variables found for ${target}`);
 		}
@@ -173,14 +186,15 @@ export default class EnvsCmd extends Command {
 		varArray: EnvironmentVariableInfo[],
 		options: FlagsDef,
 	) {
-		const fields = ['id', 'name', 'value', 'fleet'];
+		const fields = ['id', 'name', 'value'];
 
 		// Replace undefined app names with 'N/A' or null
 		varArray = varArray.map((i: EnvironmentVariableInfo) => {
-			i.fleet ||= options.json ? null : 'N/A';
+			i.appName = i.appName || (options.json ? null : 'N/A');
 			return i;
 		});
 
+		fields.push(options.json ? 'appName' : 'appName => APPLICATION');
 		if (options.device) {
 			fields.push(options.json ? 'deviceUUID' : 'deviceUUID => DEVICE');
 		}
@@ -189,9 +203,9 @@ export default class EnvsCmd extends Command {
 		}
 
 		if (options.json) {
-			const { pickAndRename } = await import('../utils/helpers');
-			const mapped = varArray.map((o) => pickAndRename(o, fields));
-			this.log(JSON.stringify(mapped, null, 4));
+			this.log(
+				stringifyVarArray<SDK.EnvironmentVariableBase>(varArray, fields),
+			);
 		} else {
 			this.log(
 				getVisuals().table.horizontal(
@@ -206,14 +220,14 @@ export default class EnvsCmd extends Command {
 async function validateServiceName(
 	sdk: SDK.BalenaSDK,
 	serviceName: string,
-	fleetSlug: string,
+	appName: string,
 ) {
-	const services = await sdk.models.service.getAllByApplication(fleetSlug, {
+	const services = await sdk.models.service.getAllByApplication(appName, {
 		$filter: { service_name: serviceName },
 	});
 	if (services.length === 0) {
 		throw new ExpectedError(
-			`Service "${serviceName}" not found for fleet "${fleetSlug}"`,
+			`Service "${serviceName}" not found for application "${appName}"`,
 		);
 	}
 }
@@ -227,17 +241,17 @@ async function validateServiceName(
  */
 async function getAppVars(
 	sdk: SDK.BalenaSDK,
-	fleetSlug: string | undefined,
+	appNameOrSlug: string | undefined,
 	options: FlagsDef,
 ): Promise<EnvironmentVariableInfo[]> {
 	const appVars: EnvironmentVariableInfo[] = [];
-	if (!fleetSlug) {
+	if (!appNameOrSlug) {
 		return appVars;
 	}
 	const vars = await sdk.models.application[
 		options.config ? 'configVar' : 'envVar'
-	].getAllByApplication(fleetSlug);
-	fillInInfoFields(vars, fleetSlug);
+	].getAllByApplication(appNameOrSlug);
+	fillInInfoFields(vars, appNameOrSlug);
 	appVars.push(...vars);
 	if (!options.config) {
 		const pineOpts: SDK.PineOptions<SDK.ServiceEnvironmentVariable> = {
@@ -253,10 +267,10 @@ async function getAppVars(
 			};
 		}
 		const serviceVars = await sdk.models.service.var.getAllByApplication(
-			fleetSlug,
+			appNameOrSlug,
 			pineOpts,
 		);
-		fillInInfoFields(serviceVars, fleetSlug);
+		fillInInfoFields(serviceVars, appNameOrSlug);
 		appVars.push(...serviceVars);
 	}
 	return appVars;
@@ -269,7 +283,7 @@ async function getAppVars(
 async function getDeviceVars(
 	sdk: SDK.BalenaSDK,
 	fullUUID: string,
-	fleetSlug: string | undefined,
+	appNameOrSlug: string | undefined,
 	options: FlagsDef,
 ): Promise<EnvironmentVariableInfo[]> {
 	const printedUUID = options.json ? fullUUID : options.device!;
@@ -278,7 +292,7 @@ async function getDeviceVars(
 		const deviceConfigVars = await sdk.models.device.configVar.getAllByDevice(
 			fullUUID,
 		);
-		fillInInfoFields(deviceConfigVars, fleetSlug, printedUUID);
+		fillInInfoFields(deviceConfigVars, appNameOrSlug, printedUUID);
 		deviceVars.push(...deviceConfigVars);
 	} else {
 		const pineOpts: SDK.PineOptions<SDK.DeviceServiceEnvironmentVariable> = {
@@ -299,13 +313,13 @@ async function getDeviceVars(
 			fullUUID,
 			pineOpts,
 		);
-		fillInInfoFields(deviceServiceVars, fleetSlug, printedUUID);
+		fillInInfoFields(deviceServiceVars, appNameOrSlug, printedUUID);
 		deviceVars.push(...deviceServiceVars);
 
 		const deviceEnvVars = await sdk.models.device.envVar.getAllByDevice(
 			fullUUID,
 		);
-		fillInInfoFields(deviceEnvVars, fleetSlug, printedUUID);
+		fillInInfoFields(deviceEnvVars, appNameOrSlug, printedUUID);
 		deviceVars.push(...deviceEnvVars);
 	}
 	return deviceVars;
@@ -321,7 +335,7 @@ function fillInInfoFields(
 		| EnvironmentVariableInfo[]
 		| DeviceServiceEnvironmentVariableInfo[]
 		| ServiceEnvironmentVariableInfo[],
-	fleetSlug?: string,
+	appNameOrSlug?: string,
 	deviceUUID?: string,
 ) {
 	for (const envVar of varArray) {
@@ -330,13 +344,33 @@ function fillInInfoFields(
 			envVar.serviceName = (envVar.service as SDK.Service[])[0]?.service_name;
 		} else if ('service_install' in envVar) {
 			// envVar is of type DeviceServiceEnvironmentVariableInfo
-			envVar.serviceName = (
-				(envVar.service_install as SDK.ServiceInstall[])[0]
-					?.installs__service as SDK.Service[]
-			)[0]?.service_name;
+			envVar.serviceName = ((envVar.service_install as SDK.ServiceInstall[])[0]
+				?.installs__service as SDK.Service[])[0]?.service_name;
 		}
-		envVar.fleet = fleetSlug;
+		envVar.appName = appNameOrSlug;
 		envVar.serviceName = envVar.serviceName || '*';
 		envVar.deviceUUID = deviceUUID || '*';
 	}
 }
+
+/**
+ * Transform each object (item) of varArray to preserve only the
+ * fields (keys) listed in the fields argument.
+ */
+function stringifyVarArray<T = Dictionary<any>>(
+	varArray: T[],
+	fields: string[],
+): string {
+	const transformed = varArray.map((o: Dictionary<any>) =>
+		_.transform(
+			o,
+			(result, value, key) => {
+				if (fields.includes(key)) {
+					result[key] = value;
+				}
+			},
+			{} as Dictionary<any>,
+		),
+	);
+	return JSON.stringify(transformed, null, 4);
+}

lib/commands/fleet/create.ts

@@ -1,149 +0,0 @@
-/**
- * @license
- * Copyright 2016-2021 Balena Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { flags } from '@oclif/command';
-
-import Command from '../../command';
-import { ExpectedError } from '../../errors';
-import * as cf from '../../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../../utils/lazy';
-
-interface FlagsDef {
-	organization?: string;
-	type?: string; // application device type
-	help: void;
-}
-
-interface ArgsDef {
-	name: string;
-}
-
-export default class FleetCreateCmd extends Command {
-	public static description = stripIndent`
-		Create a fleet.
-
-		Create a new balena fleet.
-
-		You can specify the organization the fleet should belong to using
-		the \`--organization\` option. The organization's handle, not its name,
-		should be provided. Organization handles can be listed with the
-		\`balena orgs\` command.
-
-		The fleet's default device type is specified with the \`--type\` option.
-		The \`balena devices supported\` command can be used to list the available
-		device types.
-
-		Interactive dropdowns will be shown for selection if no device type or
-		organization is specified and there are multiple options to choose from.
-		If there is a single option to choose from, it will be chosen automatically.
-		This interactive behavior can be disabled by explicitly specifying a device
-		type and organization.
-	`;
-
-	public static examples = [
-		'$ balena fleet create MyFleet',
-		'$ balena fleet create MyFleet --organization mmyorg',
-		'$ balena fleet create MyFleet -o myorg --type raspberry-pi',
-	];
-
-	public static args = [
-		{
-			name: 'name',
-			description: 'fleet name',
-			required: true,
-		},
-	];
-
-	public static usage = 'fleet create <name>';
-
-	public static flags: flags.Input<FlagsDef> = {
-		organization: flags.string({
-			char: 'o',
-			description: 'handle of the organization the fleet should belong to',
-		}),
-		type: flags.string({
-			char: 't',
-			description:
-				'fleet device type (Check available types with `balena devices supported`)',
-		}),
-		help: cf.help,
-	};
-
-	public static authenticated = true;
-
-	public async run() {
-		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
-			FleetCreateCmd,
-		);
-
-		// Ascertain device type
-		const deviceType =
-			options.type ||
-			(await (await import('../../utils/patterns')).selectDeviceType());
-
-		// Ascertain organization
-		const organization =
-			options.organization?.toLowerCase() || (await this.getOrganization());
-
-		// Create application
-		try {
-			const application = await getBalenaSdk().models.application.create({
-				name: params.name,
-				deviceType,
-				organization,
-			});
-
-			// Output
-			console.log(
-				`Fleet created: slug "${application.slug}", device type "${deviceType}"`,
-			);
-		} catch (err) {
-			if ((err.message || '').toLowerCase().includes('unique')) {
-				// BalenaRequestError: Request error: "organization" and "app_name" must be unique.
-				throw new ExpectedError(
-					`Error: An app or block or fleet with the name "${params.name}" already exists in organization "${organization}".`,
-				);
-			} else if ((err.message || '').toLowerCase().includes('unauthorized')) {
-				// BalenaRequestError: Request error: Unauthorized
-				throw new ExpectedError(
-					`Error: You are not authorized to create fleets in organization "${organization}".`,
-				);
-			}
-
-			throw err;
-		}
-	}
-
-	async getOrganization() {
-		const { getOwnOrganizations } = await import('../../utils/sdk');
-		const organizations = await getOwnOrganizations(getBalenaSdk(), {
-			$select: ['name', 'handle'],
-		});
-
-		if (organizations.length === 0) {
-			// User is not a member of any organizations (should not happen).
-			throw new Error('This account is not a member of any organizations');
-		} else if (organizations.length === 1) {
-			// User is a member of only one organization - use this.
-			return organizations[0].handle;
-		} else {
-			// User is a member of multiple organizations -
-			const { selectOrganization } = await import('../../utils/patterns');
-			return selectOrganization(organizations);
-		}
-	}
-}

lib/commands/fleet/index.ts

@@ -1,104 +0,0 @@
-/**
- * @license
- * Copyright 2016-2021 Balena Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import type { flags as flagsType } from '@oclif/command';
-import { flags } from '@oclif/command';
-
-import Command from '../../command';
-import * as cf from '../../utils/common-flags';
-import * as ca from '../../utils/common-args';
-import { getBalenaSdk, stripIndent } from '../../utils/lazy';
-import { applicationIdInfo } from '../../utils/messages';
-import type { DataOutputOptions } from '../../framework';
-
-interface FlagsDef extends DataOutputOptions {
-	help: void;
-	view: boolean;
-}
-
-interface ArgsDef {
-	fleet: string;
-}
-
-export default class FleetCmd extends Command {
-	public static description = stripIndent`
-		Display information about a single fleet.
-
-		Display detailed information about a single fleet.
-
-		${applicationIdInfo.split('\n').join('\n\t\t')}
-`;
-	public static examples = [
-		'$ balena fleet MyFleet',
-		'$ balena fleet myorg/myfleet',
-		'$ balena fleet myorg/myfleet --view',
-	];
-
-	public static args = [ca.fleetRequired];
-
-	public static usage = 'fleet <fleet>';
-
-	public static flags: flagsType.Input<FlagsDef> = {
-		help: cf.help,
-		view: flags.boolean({
-			default: false,
-			description: 'open fleet dashboard page',
-		}),
-		...cf.dataOutputFlags,
-	};
-
-	public static authenticated = true;
-	public static primary = true;
-
-	public async run() {
-		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
-			FleetCmd,
-		);
-
-		const { getApplication } = await import('../../utils/sdk');
-
-		const balena = getBalenaSdk();
-
-		const application = await getApplication(balena, params.fleet, {
-			$expand: {
-				is_for__device_type: { $select: 'slug' },
-				should_be_running__release: { $select: 'commit' },
-			},
-		});
-
-		if (options.view) {
-			const open = await import('open');
-			const dashboardUrl = balena.models.application.getDashboardUrl(
-				application.id,
-			);
-			await open(dashboardUrl, { wait: false });
-			return;
-		}
-
-		const outputApplication = {
-			...application,
-			device_type: application.is_for__device_type[0].slug,
-			commit: application.should_be_running__release[0]?.commit,
-		};
-
-		await this.outputData(
-			outputApplication,
-			['app_name', 'id', 'device_type', 'slug', 'commit'],
-			options,
-		);
-	}
-}

lib/commands/fleet/pin.ts

@@ -1,100 +0,0 @@
-/**
- * @license
- * Copyright 2016-2020 Balena Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { flags } from '@oclif/command';
-import type { IArg } from '@oclif/parser/lib/args';
-import Command from '../../command';
-import * as cf from '../../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../../utils/lazy';
-import { getExpandedProp } from '../../utils/pine';
-
-interface FlagsDef {
-	help: void;
-}
-
-interface ArgsDef {
-	slug: string;
-	releaseToPinTo?: string;
-}
-
-export default class FleetPinCmd extends Command {
-	public static description = stripIndent`
-		Pin a fleet to a release.
-
-		Pin a fleet to a release.
-
-		Note, if the commit is omitted, the currently pinned release will be printed, with instructions for how to see a list of releases
-		`;
-	public static examples = [
-		'$ balena fleet pin myfleet',
-		'$ balena fleet pin myorg/myfleet 91165e5',
-	];
-
-	public static args: Array<IArg<any>> = [
-		{
-			name: 'slug',
-			description: 'the slug of the fleet to pin to a release',
-			required: true,
-		},
-		{
-			name: 'releaseToPinTo',
-			description: 'the commit of the release for the fleet to get pinned to',
-		},
-	];
-
-	public static usage = 'fleet pin <slug> [releaseToPinTo]';
-
-	public static flags: flags.Input<FlagsDef> = {
-		help: cf.help,
-	};
-
-	public static authenticated = true;
-
-	public async run() {
-		const { args: params } = this.parse<FlagsDef, ArgsDef>(FleetPinCmd);
-
-		const balena = getBalenaSdk();
-
-		const fleet = await balena.models.application.get(params.slug, {
-			$expand: {
-				should_be_running__release: {
-					$select: 'commit',
-				},
-			},
-		});
-
-		const pinnedRelease = getExpandedProp(
-			fleet.should_be_running__release,
-			'commit',
-		);
-
-		const releaseToPinTo = params.releaseToPinTo;
-		const slug = params.slug;
-
-		if (!releaseToPinTo) {
-			console.log(
-				`${
-					pinnedRelease
-						? `This fleet is currently pinned to ${pinnedRelease}.`
-						: 'This fleet is not currently pinned to any release.'
-				} \n\nTo see a list of all releases this fleet can be pinned to, run \`balena releases ${slug}\`.`,
-			);
-		} else {
-			await balena.models.application.pinToRelease(slug, releaseToPinTo);
-		}
-	}
-}

lib/commands/fleet/track-latest.ts

@@ -1,66 +0,0 @@
-/**
- * @license
- * Copyright 2016-2020 Balena Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { flags } from '@oclif/command';
-import type { IArg } from '@oclif/parser/lib/args';
-import Command from '../../command';
-import * as cf from '../../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../../utils/lazy';
-
-interface FlagsDef {
-	help: void;
-}
-
-interface ArgsDef {
-	slug: string;
-}
-
-export default class FleetTrackLatestCmd extends Command {
-	public static description = stripIndent`
-		Make this fleet track the latest release.
-
-		Make this fleet track the latest release.
-		`;
-	public static examples = [
-		'$ balena fleet track-latest myorg/myfleet',
-		'$ balena fleet track-latest myfleet',
-	];
-
-	public static args: Array<IArg<any>> = [
-		{
-			name: 'slug',
-			description: 'the slug of the fleet to make track the latest release',
-			required: true,
-		},
-	];
-
-	public static usage = 'fleet track-latest <slug>';
-
-	public static flags: flags.Input<FlagsDef> = {
-		help: cf.help,
-	};
-
-	public static authenticated = true;
-
-	public async run() {
-		const { args: params } = this.parse<FlagsDef, ArgsDef>(FleetTrackLatestCmd);
-
-		const balena = getBalenaSdk();
-
-		await balena.models.application.trackLatestRelease(params.slug);
-	}
-}

lib/commands/internal/osinit.ts

@@ -63,7 +63,6 @@ export default class OsinitCmd extends Command {
 
 	public static hidden = true;
 	public static root = true;
-	public static offlineCompatible = true;
 
 	public async run() {
 		const { args: params } = this.parse<{}, ArgsDef>(OsinitCmd);

lib/commands/join.ts

@@ -23,7 +23,7 @@ import { applicationIdInfo } from '../utils/messages';
 import { parseAsLocalHostnameOrIp } from '../utils/validation';
 
 interface FlagsDef {
-	fleet?: string;
+	application?: string;
 	pollInterval?: number;
 	help?: void;
 }
@@ -34,22 +34,22 @@ interface ArgsDef {
 
 export default class JoinCmd extends Command {
 	public static description = stripIndent`
-		Move a local device to a fleet on another balena server.
+		Move a local device to an application on another balena server.
 
-		Move a local device to a fleet on another balena server, causing
+		Move a local device to an application on another balena server, causing
 		the device to "join" the new server. The device must be running balenaOS.
 
 		For example, you could provision a device against an openBalena installation
 		where you perform end-to-end tests and then move it to balenaCloud when it's
 		ready for production.
 
-		To move a device between fleets on the same server, use the
+		To move a device between applications on the same server, use the
 		\`balena device move\` command instead of \`balena join\`.
 
 		If you don't specify a device hostname or IP, this command will automatically
 		scan the local network for balenaOS devices and prompt you to select one
 		from an interactive picker. This may require administrator/root privileges.
-		Likewise, if the fleet option is not provided then a picker will be shown.
+		Likewise, if the application flag is not provided then a picker will be shown.
 
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 	`;
@@ -57,10 +57,10 @@ export default class JoinCmd extends Command {
 	public static examples = [
 		'$ balena join',
 		'$ balena join balena.local',
-		'$ balena join balena.local --fleet MyFleet',
-		'$ balena join balena.local -f myorg/myfleet',
+		'$ balena join balena.local --application MyApp',
+		'$ balena join balena.local -a myorg/myapp',
 		'$ balena join 192.168.1.25',
-		'$ balena join 192.168.1.25 --fleet MyFleet',
+		'$ balena join 192.168.1.25 --application MyApp',
 	];
 
 	public static args = [
@@ -75,7 +75,7 @@ export default class JoinCmd extends Command {
 	public static usage = 'join [deviceIpOrHostname]';
 
 	public static flags: flags.Input<FlagsDef> = {
-		fleet: cf.fleet,
+		application: cf.application,
 		pollInterval: flags.integer({
 			description: 'the interval in minutes to check for updates',
 			char: 'i',
@@ -98,7 +98,7 @@ export default class JoinCmd extends Command {
 			logger,
 			sdk,
 			params.deviceIpOrHostname,
-			options.fleet,
+			options.application,
 			options.pollInterval,
 		);
 	}

lib/commands/leave.ts

@@ -31,9 +31,9 @@ interface ArgsDef {
 
 export default class LeaveCmd extends Command {
 	public static description = stripIndent`
-		Remove a local device from its balena fleet.
+		Remove a local device from its balena application.
 
-		Remove a local device from its balena fleet, causing the device to
+		Remove a local device from its balena application, causing the device to
 		"leave" the server it is provisioned on. This effectively makes the device
 		"unmanaged". The device must be running balenaOS.
 

lib/commands/local/configure.ts

@@ -56,48 +56,62 @@ export default class LocalConfigureCmd extends Command {
 	};
 
 	public static root = true;
-	public static offlineCompatible = true;
 
 	public async run() {
 		const { args: params } = this.parse<FlagsDef, ArgsDef>(LocalConfigureCmd);
 
+		const path = await import('path');
 		const reconfix = await import('reconfix');
-		const { denyMount, safeUmount } = await import('../../utils/umount');
+		const denymount = promisify(await import('denymount'));
+		const { safeUmount } = await import('../../utils/helpers');
 		const Logger = await import('../../utils/logger');
 
 		const logger = Logger.getLogger();
 
 		const configurationSchema = await this.prepareConnectionFile(params.target);
 
-		await denyMount(params.target, async () => {
-			// TODO: safeUmount umounts drives like '/dev/sdc', but does not
-			// umount image files like 'balena.img'
-			await safeUmount(params.target);
-			const config = await reconfix.readConfiguration(
-				configurationSchema,
-				params.target,
+		await safeUmount(params.target);
+
+		const dmOpts: any = {};
+		if (process.pkg) {
+			// when running in a standalone pkg install, the 'denymount'
+			// executable is placed on the same folder as process.execPath
+			dmOpts.executablePath = path.join(
+				path.dirname(process.execPath),
+				'denymount',
 			);
-			logger.logDebug('Current config:');
-			logger.logDebug(JSON.stringify(config));
-			const answers = await this.getConfiguration(config);
-			logger.logDebug('New config:');
-			logger.logDebug(JSON.stringify(answers));
-			if (!answers.hostname) {
-				await this.removeHostname(configurationSchema);
-			}
-			await reconfix.writeConfiguration(
-				configurationSchema,
-				answers,
-				params.target,
-			);
-		});
+		}
+
+		const dmHandler = (cb: () => void) =>
+			reconfix
+				.readConfiguration(configurationSchema, params.target)
+				.then(async (config: any) => {
+					logger.logDebug('Current config:');
+					logger.logDebug(JSON.stringify(config));
+					const answers = await this.getConfiguration(config);
+					logger.logDebug('New config:');
+					logger.logDebug(JSON.stringify(answers));
+
+					if (!answers.hostname) {
+						await this.removeHostname(configurationSchema);
+					}
+					return await reconfix.writeConfiguration(
+						configurationSchema,
+						answers,
+						params.target,
+					);
+				})
+				.asCallback(cb);
+
+		await denymount(params.target, dmHandler, dmOpts);
 
 		console.log('Done!');
 	}
 
+	readonly BOOT_PARTITION = 1;
 	readonly CONNECTIONS_FOLDER = '/system-connections';
 
-	getConfigurationSchema(bootPartition?: number, connectionFileName?: string) {
+	getConfigurationSchema(connectionFileName?: string) {
 		connectionFileName ??= 'resin-wifi';
 		return {
 			mapper: [
@@ -113,12 +127,6 @@ export default class LocalConfigureCmd extends Command {
 					},
 					domain: [['config_json', 'hostname']],
 				},
-				{
-					template: {
-						developmentMode: '{{developmentMode}}',
-					},
-					domain: [['config_json', 'developmentMode']],
-				},
 				{
 					template: {
 						wifi: {
@@ -142,14 +150,14 @@ export default class LocalConfigureCmd extends Command {
 						path: this.CONNECTIONS_FOLDER.slice(1),
 						// Reconfix still uses the older resin-image-fs, so still needs an
 						// object-based partition definition.
-						partition: bootPartition,
+						partition: this.BOOT_PARTITION,
 					},
 				},
 				config_json: {
 					type: 'json',
 					location: {
 						path: 'config.json',
-						partition: bootPartition,
+						partition: this.BOOT_PARTITION,
 					},
 				},
 			},
@@ -169,13 +177,6 @@ export default class LocalConfigureCmd extends Command {
 			name: 'networkKey',
 			default: data.networkKey,
 		},
-		{
-			message:
-				'Enable development mode? (Open ports and root access - Not for production!)',
-			type: 'confirm',
-			name: 'developmentMode',
-			default: false,
-		},
 		{
 			message: 'Do you want to set advanced settings?',
 			type: 'confirm',
@@ -249,20 +250,21 @@ export default class LocalConfigureCmd extends Command {
 	async prepareConnectionFile(target: string) {
 		const _ = await import('lodash');
 		const imagefs = await import('balena-image-fs');
-		const { getBootPartition } = await import('balena-config-json');
 
-		const bootPartition = await getBootPartition(target);
-
-		const files = await imagefs.interact(target, bootPartition, async (_fs) => {
-			return await promisify(_fs.readdir)(this.CONNECTIONS_FOLDER);
-		});
+		const files = await imagefs.interact(
+			target,
+			this.BOOT_PARTITION,
+			async (_fs) => {
+				return await promisify(_fs.readdir)(this.CONNECTIONS_FOLDER);
+			},
+		);
 
 		let connectionFileName;
 		if (_.includes(files, 'resin-wifi')) {
 			// The required file already exists, nothing to do
 		} 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) => {
+			await imagefs.interact(target, this.BOOT_PARTITION, async (_fs) => {
 				const readFileAsync = promisify(_fs.readFile);
 				const writeFileAsync = promisify(_fs.writeFile);
 				const contents = await readFileAsync(
@@ -285,14 +287,14 @@ export default class LocalConfigureCmd extends Command {
 			connectionFileName = 'resin-sample';
 		} 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 imagefs.interact(target, this.BOOT_PARTITION, async (_fs) => {
 				return await promisify(_fs.writeFile)(
 					`${this.CONNECTIONS_FOLDER}/resin-wifi`,
 					this.CONNECTION_FILE,
 				);
 			});
 		}
-		return await this.getConfigurationSchema(bootPartition, connectionFileName);
+		return await this.getConfigurationSchema(connectionFileName);
 	}
 
 	async removeHostname(schema: any) {

lib/commands/local/flash.ts

@@ -20,7 +20,12 @@ import type { BlockDevice } from 'etcher-sdk/build/source-destination';
 import Command from '../../command';
 import { ExpectedError } from '../../errors';
 import * as cf from '../../utils/common-flags';
-import { getChalk, getVisuals, stripIndent } from '../../utils/lazy';
+import {
+	getChalk,
+	getCliForm,
+	getVisuals,
+	stripIndent,
+} from '../../utils/lazy';
 
 interface FlagsDef {
 	yes: boolean;
@@ -65,8 +70,6 @@ export default class LocalFlashCmd extends Command {
 		help: cf.help,
 	};
 
-	public static offlineCompatible = true;
-
 	public async run() {
 		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
 			LocalFlashCmd,
@@ -80,9 +83,8 @@ export default class LocalFlashCmd extends Command {
 			try {
 				const info = await execAsync('cat /proc/version');
 				distroVersion = info.stdout.toLowerCase();
-			} catch {
-				// pass
-			}
+				// tslint:disable-next-line: no-empty
+			} catch {}
 			if (distroVersion.includes('microsoft')) {
 				throw new ExpectedError(stripIndent`
 				This command is known not to work on WSL. Please use a CLI release
@@ -90,15 +92,24 @@ export default class LocalFlashCmd extends Command {
 			}
 		}
 
+		const { sourceDestination, multiWrite } = await import('etcher-sdk');
+
 		const drive = await this.getDrive(options);
 
-		const { confirm } = await import('../../utils/patterns');
-		await confirm(
-			options.yes,
-			'This will erase the selected drive. Are you sure?',
-		);
+		const yes =
+			options.yes ||
+			(await getCliForm().ask({
+				message: 'This will erase the selected drive. Are you sure?',
+				type: 'confirm',
+				name: 'yes',
+				default: false,
+			}));
+
+		if (!yes) {
+			console.log(getChalk().red.bold('Aborted image flash'));
+			process.exit(0);
+		}
 
-		const { sourceDestination, multiWrite } = await import('etcher-sdk');
 		const file = new sourceDestination.File({
 			path: params.image,
 		});

lib/commands/login.ts

@@ -187,7 +187,7 @@ ${messages.reachingOut}`);
 			if (loginType === 'register') {
 				const open = await import('open');
 				const signupUrl = `https://dashboard.${balenaUrl}/signup`;
-				await open(signupUrl, { wait: false });
+				open(signupUrl, { wait: false });
 				throw new ExpectedError(`Please sign up at ${signupUrl}`);
 			}
 

lib/commands/note.ts

@@ -88,6 +88,6 @@ export default class NoteCmd extends Command {
 
 		const balena = getBalenaSdk();
 
-		return balena.models.device.setNote(options.device, params.note);
+		return balena.models.device.note(options.device!, params.note);
 	}
 }

lib/commands/orgs.ts

@@ -46,9 +46,7 @@ export default class OrgsCmd extends Command {
 		const { getOwnOrganizations } = await import('../utils/sdk');
 
 		// Get organizations
-		const organizations = await getOwnOrganizations(getBalenaSdk(), {
-			$select: ['name', 'handle'],
-		});
+		const organizations = await getOwnOrganizations(getBalenaSdk());
 
 		// Display
 		console.log(

lib/commands/os/build-config.ts

@@ -35,10 +35,10 @@ interface ArgsDef {
 
 export default class OsBuildConfigCmd extends Command {
 	public static description = stripIndent`
-		Prepare a configuration file for use by the 'os configure' command.
+		Build an OS config and save it to a JSON file.
 
-		Interactively generate a configuration file that can then be used as
-		non-interactive input by the 'balena os configure' command.
+		Interactively generate an OS config once, so that the generated config
+		file can be used in \`balena os configure\`, skipping the interactive part.
 	`;
 
 	public static examples = [

lib/commands/os/configure.ts

@@ -23,32 +23,27 @@ import Command from '../../command';
 import { ExpectedError } from '../../errors';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent, getCliForm } from '../../utils/lazy';
-import {
-	applicationIdInfo,
-	devModeInfo,
-	secureBootInfo,
-} from '../../utils/messages';
+import { applicationIdInfo } from '../../utils/messages';
 
+const BOOT_PARTITION = 1;
 const CONNECTIONS_FOLDER = '/system-connections';
 
 interface FlagsDef {
 	advanced?: boolean;
-	fleet?: string;
+	application?: string;
+	app?: string;
 	config?: string;
 	'config-app-update-poll-interval'?: number;
 	'config-network'?: string;
 	'config-wifi-key'?: string;
 	'config-wifi-ssid'?: string;
-	dev?: boolean; // balenaOS development variant
-	secureBoot?: boolean;
 	device?: string; // device UUID
+	'device-api-key'?: string;
 	'device-type'?: string;
 	help?: void;
 	version?: string;
 	'system-connection': string[];
 	'initial-device-name'?: string;
-	'provisioning-key-name'?: string;
-	'provisioning-key-expiry-date'?: string;
 }
 
 interface ArgsDef {
@@ -57,23 +52,23 @@ interface ArgsDef {
 
 interface Answers {
 	appUpdatePollInterval: number; // in minutes
-	developmentMode?: boolean; // balenaOS development variant
-	secureBoot?: boolean;
 	deviceType: string; // e.g. "raspberrypi3"
 	network: 'ethernet' | 'wifi';
 	version: string; // e.g. "2.32.0+rev1"
 	wifiSsid?: string;
 	wifiKey?: string;
-	provisioningKeyName?: string;
-	provisioningKeyExpiryDate?: string;
 }
 
+const deviceApiKeyDeprecationMsg = stripIndent`
+	The --device-api-key option is deprecated and will be removed in a future release.
+	A suitable key is automatically generated or fetched if this option is omitted.`;
+
 export default class OsConfigureCmd extends Command {
 	public static description = stripIndent`
 		Configure a previously downloaded balenaOS image.
 
-		Configure a previously downloaded balenaOS image for a specific device type
-		or fleet.
+		Configure a previously downloaded balenaOS image for a specific device type or
+		balena application.
 
 		Configuration settings such as WiFi authentication will be taken from the
 		following sources, in precedence order:
@@ -81,20 +76,18 @@ export default class OsConfigureCmd extends Command {
 		2. A given \`config.json\` file specified with the \`--config\` option.
 		3. User input through interactive prompts (text menus).
 
-		The --device-type option is used to override the fleet's default device type,
-		in case of a fleet with mixed device types.
+		The --device-type option may be used to override the application's default
+		device type, in case of an application with mixed device types.
 
-		${devModeInfo.split('\n').join('\n\t\t')}
-
-		${secureBootInfo.split('\n').join('\n\t\t')}
-
-		The --system-connection (-c) option is used to inject NetworkManager connection
+		The --system-connection (-c) option can be used to inject NetworkManager connection
 		profiles for additional network interfaces, such as cellular/GSM or additional
 		WiFi or ethernet connections. This option may be passed multiple times in case there
 		are multiple files to inject. See connection profile examples and reference at:
 		https://www.balena.io/docs/reference/OS/network/2.x/
 		https://developer.gnome.org/NetworkManager/stable/ref-settings.html
 
+		${deviceApiKeyDeprecationMsg.split('\n').join('\n\t\t')}
+
 		${applicationIdInfo.split('\n').join('\n\t\t')}
 
 		Note: This command is currently not supported on Windows natively. Windows users
@@ -105,10 +98,12 @@ export default class OsConfigureCmd extends Command {
 
 	public static examples = [
 		'$ balena os configure ../path/rpi3.img --device 7cf02a6',
-		'$ balena os configure ../path/rpi3.img --fleet myorg/myfleet',
-		'$ balena os configure ../path/rpi3.img --fleet MyFleet --version 2.12.7',
-		'$ balena os configure ../path/rpi3.img -f MyFinFleet --device-type raspberrypi3',
-		'$ balena os configure ../path/rpi3.img -f MyFinFleet --device-type raspberrypi3 --config myWifiConfig.json',
+		'$ balena os configure ../path/rpi3.img --device 7cf02a6 --device-api-key <existingDeviceKey>',
+		'$ balena os configure ../path/rpi3.img --app MyApp',
+		'$ balena os configure ../path/rpi3.img -a myorg/myapp',
+		'$ balena os configure ../path/rpi3.img --app MyApp --version 2.12.7',
+		'$ balena os configure ../path/rpi3.img --app MyFinApp --device-type raspberrypi3',
+		'$ balena os configure ../path/rpi3.img --app MyFinApp --device-type raspberrypi3 --config myWifiConfig.json',
 	];
 
 	public static args = [
@@ -127,15 +122,15 @@ export default class OsConfigureCmd extends Command {
 			description:
 				'ask advanced configuration questions (when in interactive mode)',
 		}),
-		fleet: { ...cf.fleet, exclusive: ['device'] },
+		application: { ...cf.application, exclusive: ['app', 'device'] },
+		app: { ...cf.app, exclusive: ['application', 'device'] },
 		config: flags.string({
 			description:
 				'path to a pre-generated config.json file to be injected in the OS image',
-			exclusive: ['provisioning-key-name', 'provisioning-key-expiry-date'],
 		}),
 		'config-app-update-poll-interval': flags.integer({
 			description:
-				'supervisor cloud polling interval in minutes (e.g. for variable updates)',
+				'interval (in minutes) for the on-device balena supervisor periodic app update check',
 		}),
 		'config-network': flags.string({
 			description: 'device network type (non-interactive configuration)',
@@ -147,19 +142,15 @@ export default class OsConfigureCmd extends Command {
 		'config-wifi-ssid': flags.string({
 			description: 'WiFi SSID (network name) (non-interactive configuration)',
 		}),
-		dev: cf.dev,
-		secureBoot: cf.secureBoot,
-		device: {
-			...cf.device,
-			exclusive: [
-				'fleet',
-				'provisioning-key-name',
-				'provisioning-key-expiry-date',
-			],
-		},
+		device: { exclusive: ['app', 'application'], ...cf.device },
+		'device-api-key': flags.string({
+			char: 'k',
+			description:
+				'custom device API key (DEPRECATED and only supported with balenaOS 2.0.3+)',
+		}),
 		'device-type': flags.string({
 			description:
-				'device type slug (e.g. "raspberrypi3") to override the fleet device type',
+				'device type slug (e.g. "raspberrypi3") to override the application device type',
 		}),
 		'initial-device-name': flags.string({
 			description:
@@ -175,24 +166,16 @@ export default class OsConfigureCmd extends Command {
 			description:
 				"paths to local files to place into the 'system-connections' directory",
 		}),
-		'provisioning-key-name': flags.string({
-			description: 'custom key name assigned to generated provisioning api key',
-			exclusive: ['config', 'device'],
-		}),
-		'provisioning-key-expiry-date': flags.string({
-			description:
-				'expiry date assigned to generated provisioning api key (format: YYYY-MM-DD)',
-			exclusive: ['config', 'device'],
-		}),
 		help: cf.help,
 	};
 
-	public static authenticated = true;
-
 	public async run() {
 		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
 			OsConfigureCmd,
 		);
+		// Prefer options.application over options.app
+		options.application = options.application || options.app;
+		delete options.app;
 
 		await validateOptions(options);
 
@@ -219,12 +202,12 @@ export default class OsConfigureCmd extends Command {
 			};
 			deviceTypeSlug = device.is_of__device_type[0].slug;
 		} else {
-			app = (await getApplication(balena, options.fleet!, {
+			app = (await getApplication(balena, options.application!, {
 				$expand: {
 					is_for__device_type: { $select: 'slug' },
 				},
 			})) as ApplicationWithDeviceType;
-			await checkDeviceTypeCompatibility(options, app);
+			await checkDeviceTypeCompatibility(balena, options, app);
 			deviceTypeSlug =
 				options['device-type'] || app.is_for__device_type[0].slug;
 		}
@@ -240,39 +223,25 @@ export default class OsConfigureCmd extends Command {
 			configJson = JSON.parse(rawConfig);
 		}
 
-		const osVersion =
-			options.version ||
-			(await getOsVersionFromImage(params.image, deviceTypeManifest, devInit));
-
-		const { validateDevOptionAndWarn } = await import('../../utils/config');
-		await validateDevOptionAndWarn(options.dev, osVersion);
-
-		const { validateSecureBootOptionAndWarn } = await import(
-			'../../utils/config'
-		);
-		await validateSecureBootOptionAndWarn(
-			options.secureBoot,
-			deviceTypeSlug,
-			osVersion,
-		);
-
 		const answers: Answers = await askQuestionsForDeviceType(
 			deviceTypeManifest,
 			options,
 			configJson,
 		);
-		if (options.fleet) {
+		if (options.application) {
 			answers.deviceType = deviceTypeSlug;
 		}
-		answers.version = osVersion;
-		answers.developmentMode = options.dev;
-		answers.secureBoot = options.secureBoot;
-		answers.provisioningKeyName = options['provisioning-key-name'];
-		answers.provisioningKeyExpiryDate = options['provisioning-key-expiry-date'];
+		answers.version =
+			options.version ||
+			(await getOsVersionFromImage(params.image, deviceTypeManifest, devInit));
 
 		if (_.isEmpty(configJson)) {
 			if (device) {
-				configJson = await generateDeviceConfig(device, undefined, answers);
+				configJson = await generateDeviceConfig(
+					device,
+					options['device-api-key'],
+					answers,
+				);
 			} else {
 				configJson = await generateApplicationConfig(app!, answers);
 			}
@@ -312,13 +281,10 @@ export default class OsConfigureCmd extends Command {
 				}),
 			);
 
-			const { getBootPartition } = await import('balena-config-json');
-			const bootPartition = await getBootPartition(params.image);
-
 			const imagefs = await import('balena-image-fs');
 
 			for (const { name, content } of files) {
-				await imagefs.interact(image, bootPartition, async (_fs) => {
+				await imagefs.interact(image, BOOT_PARTITION, async (_fs) => {
 					return await promisify(_fs.writeFile)(
 						path.join(CONNECTIONS_FOLDER, name),
 						content,
@@ -333,16 +299,23 @@ export default class OsConfigureCmd extends Command {
 async function validateOptions(options: FlagsDef) {
 	// The 'device' and 'application' options are declared "exclusive" in the oclif
 	// flag definitions above, so oclif will enforce that they are not both used together.
-	if (!options.device && !options.fleet) {
+	if (!options.device && !options.application) {
 		throw new ExpectedError(
-			"Either the '--device' or the '--fleet' option must be provided",
+			"Either the '--device' or the '--application' option must be provided",
 		);
 	}
-	if (!options.fleet && options['device-type']) {
+	if (!options.application && options['device-type']) {
 		throw new ExpectedError(
-			"The '--device-type' option can only be used in conjunction with the '--fleet' option",
+			"The '--device-type' option can only be used in conjunction with the '--application' option",
 		);
 	}
+	if (options['device-api-key']) {
+		console.error(stripIndent`
+			-------------------------------------------------------------------------------------------
+			Warning: ${deviceApiKeyDeprecationMsg.split('\n').join('\n\t\t\t')}
+			-------------------------------------------------------------------------------------------
+		`);
+	}
 
 	await Command.checkLoggedIn();
 }
@@ -380,21 +353,19 @@ async function getOsVersionFromImage(
  * @param app Balena SDK Application model object
  */
 async function checkDeviceTypeCompatibility(
+	sdk: BalenaSdk.BalenaSDK,
 	options: FlagsDef,
-	app: {
-		is_for__device_type: [Pick<BalenaSdk.DeviceType, 'slug'>];
-	},
+	app: ApplicationWithDeviceType,
 ) {
 	if (options['device-type']) {
+		const [appDeviceType, optionDeviceType] = await Promise.all([
+			sdk.models.device.getManifestBySlug(app.is_for__device_type[0].slug),
+			sdk.models.device.getManifestBySlug(options['device-type']),
+		]);
 		const helpers = await import('../../utils/helpers');
-		if (
-			!(await helpers.areDeviceTypesCompatible(
-				app.is_for__device_type[0].slug,
-				options['device-type'],
-			))
-		) {
+		if (!helpers.areDeviceTypesCompatible(appDeviceType, optionDeviceType)) {
 			throw new ExpectedError(
-				`Device type ${options['device-type']} is incompatible with fleet ${options.fleet}`,
+				`Device type ${options['device-type']} is incompatible with application ${options.application}`,
 			);
 		}
 	}
@@ -419,13 +390,7 @@ async function askQuestionsForDeviceType(
 	options: FlagsDef,
 	configJson?: import('../../utils/config').ImgConfig,
 ): Promise<Answers> {
-	const answerSources: any[] = [
-		{
-			...camelifyConfigOptions(options),
-			app: options.fleet,
-			application: options.fleet,
-		},
-	];
+	const answerSources: any[] = [camelifyConfigOptions(options)];
 	const defaultAnswers: Partial<Answers> = {};
 	const questions: any = deviceType.options;
 	let extraOpts: { override: object } | undefined;

lib/commands/os/download.ts

@@ -34,35 +34,30 @@ export default class OsDownloadCmd extends Command {
 	public static description = stripIndent`
 		Download an unconfigured OS image.
 
-		Download an unconfigured OS image for the specified device type.
-		Check available device types with 'balena devices supported'.
+		Download an unconfigured OS image for a certain device type.
+		Check available types with \`balena devices supported\`
 
 		Note: Currently this command only works with balenaCloud, not openBalena.
 		If using openBalena, please download the OS from: https://www.balena.io/os/
 
-		The '--version' option is used to select the balenaOS version. If omitted,
-		the latest released version is downloaded (and if only pre-release versions
-		exist, the latest pre-release version is downloaded).
+		If version is not specified the newest stable (non-pre-release) version of OS
+		is downloaded (if available), otherwise the newest version (if all existing
+		versions for the given device type are pre-release).
 
-		Use '--version menu' or '--version menu-esr' to interactively select the
-		OS version. The latter lists ESR versions which are only available for
-		download on Production and Enterprise plans. See also:
-		https://www.balena.io/docs/reference/OS/extended-support-release/
+		You can pass \`--version menu\` to pick the OS version from the interactive menu
+		of all available versions.
 
-		Development images can be selected by appending \`.dev\` to the version.
+		To download a development image append \`.dev\` to the version or select from
+		the interactive menu.
 `;
 	public static examples = [
 		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img',
-		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version 2.101.7',
-		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version 2022.7.0',
-		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version ^2.90.0',
 		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version 2.60.1+rev1',
 		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version 2.60.1+rev1.dev',
-		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version 2021.10.2.prod',
+		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version ^2.60.0',
 		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version latest',
 		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version default',
 		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version menu',
-		'$ balena os download raspberrypi3 -o ../foo/bar/raspberry-pi.img --version menu-esr',
 	];
 
 	public static args = [
@@ -83,13 +78,11 @@ export default class OsDownloadCmd extends Command {
 		}),
 		version: flags.string({
 			description: stripIndent`
-				version number (ESR or non-ESR versions),
-				or semver range (non-ESR versions only),
+				exact version number, or a valid semver range,
 				or 'latest' (includes pre-releases),
-				or 'default' (excludes pre-releases if at least one released version is available),
+				or 'default' (excludes pre-releases if at least one stable version is available),
 				or 'recommended' (excludes pre-releases, will fail if only pre-release versions are available),
-				or 'menu' (interactive menu, non-ESR versions),
-				or 'menu-esr' (interactive menu, ESR versions)
+				or 'menu' (will show the interactive menu)
 				`,
 		}),
 		help: cf.help,
@@ -100,49 +93,8 @@ export default class OsDownloadCmd extends Command {
 			OsDownloadCmd,
 		);
 
-		// balenaOS ESR versions require user authentication
-		if (options.version) {
-			const { isESR } = await import('balena-image-manager');
-			if (options.version === 'menu-esr' || isESR(options.version)) {
-				try {
-					await OsDownloadCmd.checkLoggedIn();
-				} catch (e) {
-					const { ExpectedError, NotLoggedInError } = await import(
-						'../../errors'
-					);
-					if (e instanceof NotLoggedInError) {
-						throw new ExpectedError(stripIndent`
-							${e.message}
-							User authentication is required to download balenaOS ESR versions.`);
-					}
-					throw e;
-				}
-			}
-		}
-
 		const { downloadOSImage } = await import('../../utils/cloud');
 
-		try {
-			await downloadOSImage(params.type, options.output, options.version);
-		} catch (e) {
-			e.deviceTypeSlug = params.type;
-			e.message ||= '';
-			if (
-				e.code === 'BalenaRequestError' ||
-				e.message.toLowerCase().includes('no such version')
-			) {
-				const version = options.version || '';
-				if (
-					!version.endsWith('.dev') &&
-					!version.endsWith('.prod') &&
-					/^v?\d+\.\d+\.\d+/.test(version)
-				) {
-					e.message += `
-** Hint: some OS releases require specifying the full OS version including
-** the '.prod' or '.dev' suffix, e.g. '--version 2021.10.2.prod'`;
-				}
-			}
-			throw e;
-		}
+		await downloadOSImage(params.type, options.output, options.version);
 	}
 }

lib/commands/os/initialize.ts

@@ -42,9 +42,7 @@ export default class OsInitializeCmd extends Command {
 		Initialize an os image for a device.
 
 		Initialize an os image for a device with a previously
-		configured operating system image and flash the
-		an external storage drive or the device's storage
-		medium depending on the device type.
+		configured operating system image.
 		${INIT_WARNING_MESSAGE}
 	`;
 
@@ -76,7 +74,9 @@ export default class OsInitializeCmd extends Command {
 			OsInitializeCmd,
 		);
 
-		const { getManifest, sudo } = await import('../../utils/helpers');
+		const { getManifest, safeUmount, sudo } = await import(
+			'../../utils/helpers'
+		);
 
 		console.info(`Initializing device ${INIT_WARNING_MESSAGE}`);
 
@@ -94,8 +94,8 @@ export default class OsInitializeCmd extends Command {
 				options.yes,
 				`This will erase ${answers.drive}. Are you sure?`,
 				`Going to erase ${answers.drive}.`,
+				true,
 			);
-			const { safeUmount } = await import('../../utils/umount');
 			await safeUmount(answers.drive);
 		}
 
@@ -108,7 +108,6 @@ export default class OsInitializeCmd extends Command {
 		]);
 
 		if (answers.drive != null) {
-			const { safeUmount } = await import('../../utils/umount');
 			await safeUmount(answers.drive);
 			console.info(`You can safely remove ${answers.drive} now`);
 		}

lib/commands/os/versions.ts

@@ -18,10 +18,9 @@
 import { flags } from '@oclif/command';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
-import { stripIndent } from '../../utils/lazy';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 
 interface FlagsDef {
-	esr?: boolean;
 	help: void;
 }
 
@@ -35,9 +34,6 @@ export default class OsVersionsCmd extends Command {
 
 		Show the available balenaOS versions for the given device type.
 		Check available types with \`balena devices supported\`.
-
-		balenaOS ESR versions can be listed with the '--esr' option. See also:
-		https://www.balena.io/docs/reference/OS/extended-support-release/
 	`;
 
 	public static examples = ['$ balena os versions raspberrypi3'];
@@ -54,22 +50,18 @@ export default class OsVersionsCmd extends Command {
 
 	public static flags: flags.Input<FlagsDef> = {
 		help: cf.help,
-		esr: flags.boolean({
-			description: 'select balenaOS ESR versions',
-			default: false,
-		}),
 	};
 
 	public async run() {
-		const { args: params, flags: options } = this.parse<FlagsDef, ArgsDef>(
-			OsVersionsCmd,
-		);
+		const { args: params } = this.parse<FlagsDef, ArgsDef>(OsVersionsCmd);
 
-		const { formatOsVersion, getOsVersions } = await import(
-			'../../utils/cloud'
-		);
-		const vs = await getOsVersions(params.type, !!options.esr);
+		const {
+			versions: vs,
+			recommended,
+		} = await getBalenaSdk().models.os.getSupportedVersions(params.type);
 
-		console.log(vs.map((v) => formatOsVersion(v)).join('\n'));
+		vs.forEach((v) => {
+			console.log(`v${v}` + (v === recommended ? ' (recommended)' : ''));
+		});
 	}
 }

lib/commands/preload.ts

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
+import { flags } from '@oclif/command';
 import Command from '../command';
-import { ExpectedError } from '../errors';
 import * as cf from '../utils/common-flags';
 import {
 	getBalenaSdk,
@@ -27,22 +27,20 @@ import {
 import { applicationIdInfo } from '../utils/messages';
 import type { DockerConnectionCliFlags } from '../utils/docker';
 import { dockerConnectionCliFlags } from '../utils/docker';
-import { parseAsInteger } from '../utils/validation';
-
-import { flags } from '@oclif/command';
 import * as _ from 'lodash';
 import type {
 	Application,
 	BalenaSDK,
+	DeviceTypeJson,
 	PineExpand,
-	PineOptions,
-	PineTypedResult,
 	Release,
 } from 'balena-sdk';
 import type { Preloader } from 'balena-preload';
+import { parseAsInteger } from '../utils/validation';
+import { ExpectedError } from '../errors';
 
 interface FlagsDef extends DockerConnectionCliFlags {
-	fleet?: string;
+	app?: string;
 	commit?: string;
 	'splash-image'?: string;
 	'dont-check-arch': boolean;
@@ -58,16 +56,16 @@ interface ArgsDef {
 
 export default class PreloadCmd extends Command {
 	public static description = stripIndent`
-		Preload a release on a disk image (or Edison zip archive).
+		Preload an app on a disk image (or Edison zip archive).
 
-		Preload a release (service images/containers) from a balena fleet, and optionally
+		Preload a balena application release (app images/containers), and optionally
 		a balenaOS splash screen, in a previously downloaded '.img' balenaOS image file
 		in the local disk (a zip file is only accepted for the Intel Edison device type).
 		After preloading, the balenaOS image file can be flashed to a device's SD card.
-		When the device boots, it will not need to download the release, as it was
+		When the device boots, it will not need to download the application, as it was
 		preloaded. This is usually combined with release pinning
 		(https://www.balena.io/docs/learn/deploy/release-strategy/release-policy/)
-		to avoid the device downloading a newer release straight away, if available.
+		to avoid the device dowloading a newer release straight away, if one is available.
 		Check also the Preloading and Preregistering section of the balena CLI's advanced
 		masterclass document:
 		https://www.balena.io/docs/learn/more/masterclasses/advanced-cli/#5-preloading-and-preregistering
@@ -84,8 +82,8 @@ export default class PreloadCmd extends Command {
 	`;
 
 	public static examples = [
-		'$ balena preload balena.img --fleet MyFleet --commit e1f2592fc6ee949e68756d4f4a48e49bff8d72a0',
-		'$ balena preload balena.img --fleet myorg/myfleet --splash-image image.png',
+		'$ balena preload balena.img --app MyApp --commit e1f2592fc6ee949e68756d4f4a48e49bff8d72a0',
+		'$ balena preload balena.img --app myorg/myapp --commit e1f2592fc6ee949e68756d4f4a48e49bff8d72a0 --splash-image image.png',
 		'$ balena preload balena.img',
 	];
 
@@ -100,15 +98,13 @@ export default class PreloadCmd extends Command {
 	public static usage = 'preload <image>';
 
 	public static flags: flags.Input<FlagsDef> = {
-		fleet: cf.fleet,
+		// TODO: Replace with application/a in #v13?
+		app: cf.application,
 		commit: flags.string({
 			description: `\
-The commit hash of the release to preload. Use "current" to specify the current
-release (ignored if no appId is given). The current release is usually also the
-latest, but can be pinned to a specific release. See:  
-https://www.balena.io/docs/learn/deploy/release-strategy/release-policy/  
-https://www.balena.io/docs/learn/more/masterclasses/fleet-management/#63-pin-using-the-api  
-https://github.com/balena-io-examples/staged-releases\
+The commit hash for a specific application release to preload, use "current" to specify the current
+release (ignored if no appId is given). The current release is usually also the latest, but can be
+manually pinned using https://github.com/balena-io-projects/staged-releases .\
 `,
 			char: 'c',
 		}),
@@ -119,7 +115,7 @@ https://github.com/balena-io-examples/staged-releases\
 		'dont-check-arch': flags.boolean({
 			default: false,
 			description:
-				'disable architecture compatibility check between image and fleet',
+				'disables check for matching architecture in image and application',
 		}),
 		'pin-device-to-release': flags.boolean({
 			default: false,
@@ -173,14 +169,6 @@ Can be repeated to add multiple certificates.\
 		try {
 			const fs = await import('fs');
 			await fs.promises.access(params.image);
-			const path = await import('path');
-			if (path.extname(params.image) === '.zip') {
-				console.warn(stripIndent`
-					------------------------------------------------------------------------------
-					Warning: A zip file is only accepted for the Intel Edison device type.
-					------------------------------------------------------------------------------
-					`);
-			}
 		} catch (error) {
 			throw new ExpectedError(
 				`The provided image path does not exist: ${params.image}`,
@@ -189,12 +177,18 @@ Can be repeated to add multiple certificates.\
 
 		// balena-preload currently does not work with numerical app IDs
 		// Load app here, and use app slug from hereon
-		const fleetSlug: string | undefined = options.fleet
-			? await (await import('../utils/sdk')).getFleetSlug(balena, options.fleet)
-			: undefined;
+		if (options.app && !options.app.includes('/')) {
+			// Disambiguate application (if is a number, it could either be an ID or a numerical name)
+			const { getApplication } = await import('../utils/sdk');
+			const application = await getApplication(balena, options.app);
+			if (!application) {
+				throw new ExpectedError(`Application not found: ${options.app}`);
+			}
+			options.app = application.slug;
+		}
 
 		const progressBars: {
-			[key: string]: InstanceType<ReturnType<typeof getVisuals>['Progress']>;
+			[key: string]: ReturnType<typeof getVisuals>['Progress'];
 		} = {};
 
 		const progressHandler = function (event: {
@@ -208,7 +202,7 @@ Can be repeated to add multiple certificates.\
 		};
 
 		const spinners: {
-			[key: string]: InstanceType<ReturnType<typeof getVisuals>['Spinner']>;
+			[key: string]: ReturnType<typeof getVisuals>['Spinner'];
 		} = {};
 
 		const spinnerHandler = function (event: { name: string; action: string }) {
@@ -227,14 +221,17 @@ Can be repeated to add multiple certificates.\
 			? 'latest'
 			: options.commit;
 		const image = params.image;
+		const appId = options.app;
+
 		const splashImage = options['splash-image'];
 		const additionalSpace = options['additional-space'];
+
 		const dontCheckArch = options['dont-check-arch'] || false;
 		const pinDevice = options['pin-device-to-release'] || false;
 
-		if (dontCheckArch && !fleetSlug) {
+		if (dontCheckArch && !appId) {
 			throw new ExpectedError(
-				'You need to specify a fleet if you disable the architecture check.',
+				'You need to specify an application if you disable the architecture check.',
 			);
 		}
 
@@ -249,9 +246,9 @@ Can be repeated to add multiple certificates.\
 		const dockerUtils = await import('../utils/docker');
 		const docker = await dockerUtils.getDocker(options);
 		const preloader = new balenaPreload.Preloader(
-			undefined,
+			null,
 			docker,
-			fleetSlug,
+			appId,
 			commit,
 			image,
 			splashImage,
@@ -268,17 +265,10 @@ Can be repeated to add multiple certificates.\
 			if (signal) {
 				gotSignal = true;
 				nodeCleanup.uninstall(); // don't call cleanup handler again
-				preloader
-					.cleanup()
-					.then(() => {
-						// calling process.exit() won't inform parent process of signal
-						process.kill(process.pid, signal);
-					})
-					.catch((e) => {
-						if (process.env.DEBUG) {
-							console.error(e);
-						}
-					});
+				preloader.cleanup().then(() => {
+					// calling process.exit() won't inform parent process of signal
+					process.kill(process.pid, signal);
+				});
 				return false;
 			}
 		});
@@ -295,7 +285,7 @@ Can be repeated to add multiple certificates.\
 				preloader.on('error', reject);
 				resolve(
 					this.prepareAndPreload(preloader, balena, {
-						slug: fleetSlug,
+						appId,
 						commit,
 						pinDevice,
 					}),
@@ -315,9 +305,10 @@ Can be repeated to add multiple certificates.\
 		}
 	}
 
-	readonly applicationExpandOptions = {
+	readonly applicationExpandOptions: PineExpand<Application> = {
 		owns__release: {
 			$select: ['id', 'commit', 'end_timestamp', 'composition'],
+			$orderby: [{ end_timestamp: 'desc' }, { id: 'desc' }],
 			$expand: {
 				contains__image: {
 					$select: ['image'],
@@ -331,74 +322,77 @@ Can be repeated to add multiple certificates.\
 			$filter: {
 				status: 'success',
 			},
-			$orderby: [{ end_timestamp: 'desc' }, { id: 'desc' }],
 		},
 		should_be_running__release: {
 			$select: 'commit',
 		},
-	} satisfies PineExpand<Application>;
+	};
+
+	allDeviceTypes: DeviceTypeJson.DeviceType[];
+	async getDeviceTypes() {
+		if (this.allDeviceTypes === undefined) {
+			const balena = getBalenaSdk();
+			const deviceTypes = await balena.models.config.getDeviceTypes();
+			this.allDeviceTypes = _.sortBy(deviceTypes, 'name');
+		}
+		return this.allDeviceTypes;
+	}
 
 	isCurrentCommit(commit: string) {
 		return commit === 'latest' || commit === 'current';
 	}
 
+	async getDeviceTypesWithSameArch(deviceTypeSlug: string) {
+		const deviceTypes = await this.getDeviceTypes();
+		const deviceType = _.find(deviceTypes, { slug: deviceTypeSlug });
+		if (!deviceType) {
+			throw new Error(`Device type "${deviceTypeSlug}" not found in API query`);
+		}
+		return _(deviceTypes).filter({ arch: deviceType.arch }).map('slug').value();
+	}
+
 	async getApplicationsWithSuccessfulBuilds(deviceTypeSlug: string) {
 		const balena = getBalenaSdk();
 
-		try {
-			await balena.models.deviceType.get(deviceTypeSlug);
-		} catch {
-			throw new Error(`Device type "${deviceTypeSlug}" not found in API query`);
-		}
-		const options = {
-			$select: ['id', 'slug', 'should_track_latest_release'],
-			$expand: this.applicationExpandOptions,
-			$filter: {
-				// get the apps that are of the same arch as the device type of the image
-				is_for__device_type: {
-					$any: {
-						$alias: 'dt',
-						$expr: {
-							dt: {
-								is_of__cpu_architecture: {
-									$any: {
-										$alias: 'ioca',
-										$expr: {
-											ioca: {
-												is_supported_by__device_type: {
-													$any: {
-														$alias: 'isbdt',
-														$expr: {
-															isbdt: {
-																slug: deviceTypeSlug,
-															},
-														},
-													},
-												},
-											},
-										},
-									},
+		const deviceTypes = await this.getDeviceTypesWithSameArch(deviceTypeSlug);
+		// TODO: remove the explicit types once https://github.com/balena-io/balena-sdk/pull/889 gets merged
+		return balena.pine.get<
+			Application,
+			Array<
+				ApplicationWithDeviceType & {
+					should_be_running__release: [Release?];
+				}
+			>
+		>({
+			resource: 'my_application',
+			options: {
+				$filter: {
+					is_for__device_type: {
+						$any: {
+							$alias: 'dt',
+							$expr: {
+								dt: {
+									slug: { $in: deviceTypes },
+								},
+							},
+						},
+					},
+					owns__release: {
+						$any: {
+							$alias: 'r',
+							$expr: {
+								r: {
+									status: 'success',
 								},
 							},
 						},
 					},
 				},
-				owns__release: {
-					$any: {
-						$alias: 'r',
-						$expr: {
-							r: {
-								status: 'success',
-							},
-						},
-					},
-				},
+				$expand: this.applicationExpandOptions,
+				$select: ['id', 'app_name', 'should_track_latest_release'],
+				$orderby: 'app_name asc',
 			},
-			$orderby: 'slug asc',
-		} satisfies PineOptions<Application>;
-		return (await balena.models.application.getAllDirectlyAccessible(
-			options,
-		)) as Array<PineTypedResult<Application, typeof options>>;
+		});
 	}
 
 	async selectApplication(deviceTypeSlug: string) {
@@ -415,14 +409,14 @@ Can be repeated to add multiple certificates.\
 		applicationInfoSpinner.stop();
 		if (applications.length === 0) {
 			throw new ExpectedError(
-				`No fleets found with successful releases for device type '${deviceTypeSlug}'`,
+				`You have no apps with successful releases for a '${deviceTypeSlug}' device type.`,
 			);
 		}
 		return getCliForm().ask({
-			message: 'Select a fleet',
+			message: 'Select an application',
 			type: 'list',
 			choices: applications.map((app) => ({
-				name: app.slug,
+				name: app.app_name,
 				value: app,
 			})),
 		});
@@ -430,7 +424,7 @@ Can be repeated to add multiple certificates.\
 
 	selectApplicationCommit(releases: Release[]) {
 		if (releases.length === 0) {
-			throw new ExpectedError('This fleet has no successful releases.');
+			throw new ExpectedError('This application has no successful releases.');
 		}
 		const DEFAULT_CHOICE = { name: 'current', value: 'current' };
 		const choices = [DEFAULT_CHOICE].concat(
@@ -448,7 +442,7 @@ Can be repeated to add multiple certificates.\
 	}
 
 	async offerToDisableAutomaticUpdates(
-		application: Pick<Application, 'id' | 'should_track_latest_release'>,
+		application: Application,
 		commit: string,
 		pinDevice: boolean,
 	) {
@@ -463,23 +457,23 @@ Can be repeated to add multiple certificates.\
 		}
 		const message = `\
 
-This fleet is set to track the latest release, and non-pinned devices
+This application is set to track the latest release, and non-pinned devices
 are automatically updated when a new release is available. This may lead to
 unexpected behavior: The preloaded device will download and install the latest
 release once it is online.
 
-This prompt gives you the opportunity to disable automatic updates for
-this fleet now. Note that this would result in the fleet being pinned to
-the current latest release, rather than some other release that may have
+This prompt gives you the opportunity to disable automatic updates for this
+application now. Note that this would result in the application being pinned
+to the current latest release, rather than some other release that may have
 been selected for preloading. The pinned released may be further managed
 through the web dashboard or programatically through the balena API / SDK.
-Documentation about release policies and pinning can be found at:
+Documentation about release policies and app/device pinning can be found at:
 https://www.balena.io/docs/learn/deploy/release-strategy/release-policy/
 
 Alternatively, the --pin-device-to-release flag may be used to pin only the
 preloaded device to the selected release.
 
-Would you like to disable automatic updates for this fleet now?\
+Would you like to disable automatic updates for this application now?\
 `;
 		const update = await getCliForm().ask({
 			message,
@@ -497,28 +491,28 @@ Would you like to disable automatic updates for this fleet now?\
 		});
 	}
 
-	async getAppWithReleases(balenaSdk: BalenaSDK, slug: string) {
+	async getAppWithReleases(balenaSdk: BalenaSDK, appId: string | number) {
 		const { getApplication } = await import('../utils/sdk');
 
-		return await getApplication(balenaSdk, slug, {
+		return (await getApplication(balenaSdk, appId, {
 			$expand: this.applicationExpandOptions,
-		});
+		})) as Application & { should_be_running__release: [Release?] };
 	}
 
 	async prepareAndPreload(
 		preloader: Preloader,
 		balenaSdk: BalenaSDK,
 		options: {
-			slug?: string;
+			appId?: string;
 			commit?: string;
 			pinDevice: boolean;
 		},
 	) {
 		await preloader.prepare();
 
-		const application = options.slug
-			? await this.getAppWithReleases(balenaSdk, options.slug)
-			: await this.selectApplication(preloader.config!.deviceType);
+		const application = options.appId
+			? await this.getAppWithReleases(balenaSdk, options.appId)
+			: await this.selectApplication(preloader.config.deviceType);
 
 		let commit: string; // commit hash or the strings 'latest' or 'current'
 
@@ -529,7 +523,7 @@ Would you like to disable automatic updates for this fleet now?\
 			if (this.isCurrentCommit(options.commit)) {
 				if (!appCommit) {
 					throw new Error(
-						`Unexpected empty commit hash for fleet slug "${application.slug}"`,
+						`Unexpected empty commit hash for app ID "${application.id}"`,
 					);
 				}
 				// handle `--commit current` (and its `--commit latest` synonym)