v19.9.0

Orgs to organization list

.versionbot/CHANGELOG.yml

@@ -1,3 +1,51 @@
+- commits:
+    - subject: Add alias `organization list` for `orgs` command
+      hash: 082cce332a497c15b34467f9ed22514ebaafaec9
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: myarmolinsky
+      nested: []
+  version: 19.9.0
+  title: ""
+  date: 2024-10-18T14:25:39.691Z
+- commits:
+    - subject: Add alias `tag list` for `tags` command
+      hash: 5eba175bf1a0e016b98757848e0c345489f686c1
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: myarmolinsky
+      nested: []
+  version: 19.8.0
+  title: ""
+  date: 2024-10-18T13:25:50.462Z
+- commits:
+    - subject: Add alias `env list` for command `envs`
+      hash: 417c75484b1ac6c216323248b50ba00fc3fe5a7f
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: myarmolinsky
+      nested: []
+  version: 19.7.0
+  title: ""
+  date: 2024-10-18T12:35:31.416Z
+- commits:
+    - subject: Add `ssh-key` as aliases for all `key` commands
+      hash: e853b15f12af429265b1e9e20ce60db19438df4b
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: myarmolinsky
+      nested: []
+  version: 19.6.0
+  title: ""
+  date: 2024-10-18T11:04:26.745Z
 - commits:
     - subject: Add `key list` alias for `keys` command
       hash: 6b5c6e072b426a1e9517376ee756afa31ed96cfa

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 19.9.0 - 2024-10-18
+
+* Add alias `organization list` for `orgs` command [myarmolinsky]
+
+## 19.8.0 - 2024-10-18
+
+* Add alias `tag list` for `tags` command [myarmolinsky]
+
+## 19.7.0 - 2024-10-18
+
+* Add alias `env list` for command `envs` [myarmolinsky]
+
+## 19.6.0 - 2024-10-18
+
+* Add `ssh-key` as aliases for all `key` commands [myarmolinsky]
+
 ## 19.5.0 - 2024-10-17
 
 * Add `key list` alias for `keys` command [myarmolinsky]

automation/capitanodoc/capitanodoc.ts

@@ -56,10 +56,9 @@ const commandHeadings: { [key: string]: string } = {
 	whoami: 'Authentication',
 	logout: 'Authentication',
 	env: 'Environment Variables',
-	envs: 'Environment Variables',
 	help: 'Help and Version',
-	key: 'SSH Keys',
-	orgs: 'Organizations',
+	'ssh-key': 'SSH Keys',
+	organization: 'Organizations',
 	os: 'OS',
 	util: 'Utilities',
 	ssh: 'Network',

completion/_balena

@@ -8,7 +8,7 @@ _balena() {
   local context state line curcontext="$curcontext"
 
   # Valid top-level completions
-  main_commands=( api-key app block build config deploy device devices env envs fleet internal join key leave local login logout logs notes orgs os preload push release scan settings ssh support tag tags tunnel util version whoami )
+  main_commands=( api-key app block build config deploy device devices env fleet internal join leave local login logout logs notes organization os preload push release scan settings ssh ssh-key support tag tunnel util version whoami )
   # Sub-completions
   api_key_cmds=( generate list revoke )
   app_cmds=( create )
@@ -16,14 +16,15 @@ _balena() {
   config_cmds=( generate inject read reconfigure write )
   device_cmds=( deactivate identify init list local-mode move os-update pin public-url purge reboot register rename restart rm shutdown start-service stop-service track-fleet )
   devices_cmds=( supported )
-  env_cmds=( add rename rm )
+  env_cmds=( add list rename rm )
   fleet_cmds=( create list pin purge rename restart rm track-latest )
   internal_cmds=( osinit )
-  key_cmds=( add list rm )
   local_cmds=( configure flash )
+  organization_cmds=( list )
   os_cmds=( build-config configure download initialize versions )
   release_cmds=( finalize invalidate list validate )
-  tag_cmds=( rm set )
+  ssh_key_cmds=( add list rm )
+  tag_cmds=( list rm set )
 
 
   _arguments -C \
@@ -69,18 +70,21 @@ _balena_sec_cmds() {
       "internal")
         _describe -t internal_cmds 'internal_cmd' internal_cmds "$@" && ret=0
       ;;
-      "key")
-        _describe -t key_cmds 'key_cmd' key_cmds "$@" && ret=0
-      ;;
       "local")
         _describe -t local_cmds 'local_cmd' local_cmds "$@" && ret=0
       ;;
+      "organization")
+        _describe -t organization_cmds 'organization_cmd' organization_cmds "$@" && ret=0
+      ;;
       "os")
         _describe -t os_cmds 'os_cmd' os_cmds "$@" && ret=0
       ;;
       "release")
         _describe -t release_cmds 'release_cmd' release_cmds "$@" && ret=0
       ;;
+      "ssh-key")
+        _describe -t ssh_key_cmds 'ssh-key_cmd' ssh_key_cmds "$@" && ret=0
+      ;;
       "tag")
         _describe -t tag_cmds 'tag_cmd' tag_cmds "$@" && ret=0
       ;;

completion/balena-completion.bash

@@ -7,7 +7,7 @@ _balena_complete()
   local cur prev
 
   # Valid top-level completions
-  main_commands="api-key app block build config deploy device devices env envs fleet internal join key leave local login logout logs notes orgs os preload push release scan settings ssh support tag tags tunnel util version whoami"
+  main_commands="api-key app block build config deploy device devices env fleet internal join leave local login logout logs notes organization os preload push release scan settings ssh ssh-key support tag tunnel util version whoami"
   # Sub-completions
   api_key_cmds="generate list revoke"
   app_cmds="create"
@@ -15,14 +15,15 @@ _balena_complete()
   config_cmds="generate inject read reconfigure write"
   device_cmds="deactivate identify init list local-mode move os-update pin public-url purge reboot register rename restart rm shutdown start-service stop-service track-fleet"
   devices_cmds="supported"
-  env_cmds="add rename rm"
+  env_cmds="add list rename rm"
   fleet_cmds="create list pin purge rename restart rm track-latest"
   internal_cmds="osinit"
-  key_cmds="add list rm"
   local_cmds="configure flash"
+  organization_cmds="list"
   os_cmds="build-config configure download initialize versions"
   release_cmds="finalize invalidate list validate"
-  tag_cmds="rm set"
+  ssh_key_cmds="add list rm"
+  tag_cmds="list rm set"
 
 
 
@@ -63,18 +64,21 @@ _balena_complete()
       internal)
         COMPREPLY=( $(compgen -W "$internal_cmds" -- $cur) )
         ;;
-      key)
-        COMPREPLY=( $(compgen -W "$key_cmds" -- $cur) )
-        ;;
       local)
         COMPREPLY=( $(compgen -W "$local_cmds" -- $cur) )
         ;;
+      organization)
+        COMPREPLY=( $(compgen -W "$organization_cmds" -- $cur) )
+        ;;
       os)
         COMPREPLY=( $(compgen -W "$os_cmds" -- $cur) )
         ;;
       release)
         COMPREPLY=( $(compgen -W "$release_cmds" -- $cur) )
         ;;
+      ssh-key)
+        COMPREPLY=( $(compgen -W "$ssh_key_cmds" -- $cur) )
+        ;;
       tag)
         COMPREPLY=( $(compgen -W "$tag_cmds" -- $cur) )
         ;;

docs/balena-cli.md

@@ -220,9 +220,9 @@ are encouraged to regularly update the balena CLI to the latest version.
 - Environment Variables
 
 	- [env add](#env-add)
+	- [env list](#env-list)
 	- [env rename](#env-rename)
 	- [env rm](#env-rm)
-	- [envs](#envs)
 
 - Fleets
 
@@ -257,7 +257,7 @@ are encouraged to regularly update the balena CLI to the latest version.
 
 - Organizations
 
-	- [orgs](#orgs)
+	- [organization list](#organization-list)
 
 - OS
 
@@ -294,10 +294,10 @@ are encouraged to regularly update the balena CLI to the latest version.
 
 - SSH Keys
 
-	- [key add](#key-add)
-	- [key](#key)
-	- [key list](#key-list)
-	- [key rm](#key-rm)
+	- [ssh-key add](#ssh-key-add)
+	- [ssh-key](#ssh-key)
+	- [ssh-key list](#ssh-key-list)
+	- [ssh-key rm](#ssh-key-rm)
 
 - Support
 
@@ -305,9 +305,9 @@ are encouraged to regularly update the balena CLI to the latest version.
 
 - Tags
 
+	- [tag list](#tag-list)
 	- [tag rm](#tag-rm)
 	- [tag set](#tag-set)
-	- [tags](#tags)
 
 - Utilities
 
@@ -403,7 +403,7 @@ Create a new balena app.
 You can specify the organization the app 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.
+`balena organization list` command.
 
 The app's default device type is specified with the `--type` option.
 The `balena devices supported` command can be used to list the available
@@ -533,7 +533,7 @@ 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.
+`balena organization list` 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
@@ -1976,6 +1976,90 @@ suppress warning messages
 
 service name
 
+## env list
+
+### Aliases
+
+- `envs`
+
+
+To use one of the aliases, replace `env list` with the alias.
+
+### Description
+
+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.)
+
+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 printed output may include DEVICE and/or SERVICE columns to distinguish
+between fleet-wide, device-specific and service-specific variables.
+An asterisk in these columns indicates that the variable applies to
+"all devices" or "all services".
+
+The --config option is used to list "configuration variables" that control
+balena platform features, as opposed to custom environment variables defined
+by the user. The --config and the --service options are mutually exclusive
+because configuration variables cannot be set for specific services.
+
+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. 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).
+
+Fleets may be specified by fleet name or slug. Fleet slugs are
+the recommended option, as they are unique and unambiguous. Slugs can be
+listed with the `balena fleet list` command. Note that slugs may change if the
+fleet is renamed. Fleet names are not unique and may result in  "Fleet is
+ambiguous" errors at any time (even if it "used to work in the past"), for
+example if the name clashes with a newly created public fleet, or with fleets
+from other balena accounts that you may be invited to join under any role.
+For this reason, fleet names are especially discouraged in scripts (e.g. CI
+environments).
+
+Examples:
+
+	$ balena env list --fleet myorg/myfleet
+	$ balena env list --fleet MyFleet --json
+	$ balena env list --fleet MyFleet --service MyService
+	$ balena env list --fleet MyFleet --config
+	$ balena env list --device 7cf02a6
+	$ balena env list --device 7cf02a6 --json
+	$ balena env list --device 7cf02a6 --config --json
+	$ balena env list --device 7cf02a6 --service MyService
+
+### Options
+
+#### -f, --fleet FLEET
+
+fleet name or slug (preferred)
+
+#### -c, --config
+
+show configuration variables only
+
+#### -d, --device DEVICE
+
+device UUID
+
+#### -j, --json
+
+produce JSON output instead of tabular output
+
+#### -s, --service SERVICE
+
+service name
+
 ## env rename
 
 ### Description
@@ -1983,7 +2067,7 @@ service name
 Change the value of a configuration or environment variable for a fleet,
 device or service, as selected by command-line options.
 
-Variables are selected by their database ID (as reported by the 'balena envs'
+Variables are selected by their database ID (as reported by the 'balena env list'
 command) and one of six database "resource types":
 
 - fleet environment variable
@@ -2048,7 +2132,7 @@ select a service variable (may be used together with the --device option)
 Remove a configuration or environment variable from a fleet, device
 or service, as selected by command-line options.
 
-Variables are selected by their database ID (as reported by the 'balena envs'
+Variables are selected by their database ID (as reported by the 'balena env list'
 command) and one of six database "resource types":
 
 - fleet environment variable
@@ -2110,83 +2194,6 @@ select a service variable (may be used together with the --device option)
 
 do not prompt for confirmation before deleting the variable
 
-## envs
-
-### Description
-
-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.)
-
-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 printed output may include DEVICE and/or SERVICE columns to distinguish
-between fleet-wide, device-specific and service-specific variables.
-An asterisk in these columns indicates that the variable applies to
-"all devices" or "all services".
-
-The --config option is used to list "configuration variables" that control
-balena platform features, as opposed to custom environment variables defined
-by the user. The --config and the --service options are mutually exclusive
-because configuration variables cannot be set for specific services.
-
-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. 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).
-
-Fleets may be specified by fleet name or slug. Fleet slugs are
-the recommended option, as they are unique and unambiguous. Slugs can be
-listed with the `balena fleet list` command. Note that slugs may change if the
-fleet is renamed. Fleet names are not unique and may result in  "Fleet is
-ambiguous" errors at any time (even if it "used to work in the past"), for
-example if the name clashes with a newly created public fleet, or with fleets
-from other balena accounts that you may be invited to join under any role.
-For this reason, fleet names are especially discouraged in scripts (e.g. CI
-environments).
-
-Examples:
-
-	$ balena envs --fleet myorg/myfleet
-	$ balena envs --fleet MyFleet --json
-	$ balena envs --fleet MyFleet --service MyService
-	$ balena envs --fleet MyFleet --config
-	$ balena envs --device 7cf02a6
-	$ balena envs --device 7cf02a6 --json
-	$ balena envs --device 7cf02a6 --config --json
-	$ balena envs --device 7cf02a6 --service MyService
-
-### Options
-
-#### -f, --fleet FLEET
-
-fleet name or slug (preferred)
-
-#### -c, --config
-
-show configuration variables only
-
-#### -d, --device DEVICE
-
-device UUID
-
-#### -j, --json
-
-produce JSON output instead of tabular output
-
-#### -s, --service SERVICE
-
-service name
-
 # Fleets
 
 ## fleet create
@@ -2198,7 +2205,7 @@ 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.
+`balena organization list` 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
@@ -2773,7 +2780,14 @@ device UUID
 
 # Organizations
 
-## orgs
+## organization list
+
+### Aliases
+
+- `orgs`
+
+
+To use one of the aliases, replace `organization list` with the alias.
 
 ### Description
 
@@ -2781,7 +2795,7 @@ list all the organizations that you are a member of.
 
 Examples:
 
-	$ balena orgs
+	$ balena organization list
 
 ### Options
 
@@ -3664,7 +3678,14 @@ Examples:
 
 # SSH Keys
 
-## key add
+## ssh-key add
+
+### Aliases
+
+- `key add`
+
+
+To use one of the aliases, replace `ssh-key add` with the alias.
 
 ### Description
 
@@ -3688,10 +3709,10 @@ your balena account.
 
 Examples:
 
-	$ balena key add Main ~/.ssh/id_rsa.pub
-	$ cat ~/.ssh/id_rsa.pub | balena key add Main
+	$ balena ssh-key add Main ~/.ssh/id_rsa.pub
+	$ cat ~/.ssh/id_rsa.pub | balena ssh-key add Main
 	# Windows 10 (cmd.exe prompt) example
-	$ balena key add Main %userprofile%.sshid_rsa.pub
+	$ balena ssh-key add Main %userprofile%.sshid_rsa.pub
 
 ### Arguments
 
@@ -3705,7 +3726,14 @@ the path to the public key file
 
 ### Options
 
-## key
+## ssh-key
+
+### Aliases
+
+- `key`
+
+
+To use one of the aliases, replace `ssh-key` with the alias.
 
 ### Description
 
@@ -3713,7 +3741,7 @@ Display a single SSH key registered in balenaCloud for the logged in user.
 
 Examples:
 
-	$ balena key 17
+	$ balena ssh-key 17
 
 ### Arguments
 
@@ -3723,14 +3751,15 @@ balenaCloud ID for the SSH key
 
 ### Options
 
-## key list
+## ssh-key list
 
 ### Aliases
 
 - `keys`
+- `key list`
 
 
-To use one of the aliases, replace `key list` with the alias.
+To use one of the aliases, replace `ssh-key list` with the alias.
 
 ### Description
 
@@ -3738,11 +3767,18 @@ List all SSH keys registered in balenaCloud for the logged in user.
 
 Examples:
 
-	$ balena key list
+	$ balena ssh-key list
 
 ### Options
 
-## key rm
+## ssh-key rm
+
+### Aliases
+
+- `key rm`
+
+
+To use one of the aliases, replace `ssh-key rm` with the alias.
 
 ### Description
 
@@ -3752,8 +3788,8 @@ The --yes option may be used to avoid interactive confirmation.
 
 Examples:
 
-	$ balena key rm 17
-	$ balena key rm 17 --yes
+	$ balena ssh-key rm 17
+	$ balena ssh-key rm 17 --yes
 
 ### Arguments
 
@@ -3821,6 +3857,51 @@ length of time to enable support for, in (h)ours or (d)ays, e.g. 12h, 2d
 
 # Tags
 
+## tag list
+
+### Aliases
+
+- `tags`
+
+
+To use one of the aliases, replace `tag list` with the alias.
+
+### Description
+
+List all tags and their values for the specified fleet, device or release.
+
+Fleets may be specified by fleet name or slug. Fleet slugs are
+the recommended option, as they are unique and unambiguous. Slugs can be
+listed with the `balena fleet list` command. Note that slugs may change if the
+fleet is renamed. Fleet names are not unique and may result in  "Fleet is
+ambiguous" errors at any time (even if it "used to work in the past"), for
+example if the name clashes with a newly created public fleet, or with fleets
+from other balena accounts that you may be invited to join under any role.
+For this reason, fleet names are especially discouraged in scripts (e.g. CI
+environments).
+
+Examples:
+
+	$ balena tag list --fleet MyFleet
+	$ balena tag list -f myorg/myfleet
+	$ balena tag list --device 7cf02a6
+	$ balena tag list --release 1234
+	$ balena tag list --release b376b0e544e9429483b656490e5b9443b4349bd6
+
+### Options
+
+#### -f, --fleet FLEET
+
+fleet name or slug (preferred)
+
+#### -d, --device DEVICE
+
+device UUID
+
+#### -r, --release RELEASE
+
+release id
+
 ## tag rm
 
 ### Description
@@ -3920,44 +4001,6 @@ device UUID
 
 release id
 
-## tags
-
-### Description
-
-List all tags and their values for the specified fleet, device or release.
-
-Fleets may be specified by fleet name or slug. Fleet slugs are
-the recommended option, as they are unique and unambiguous. Slugs can be
-listed with the `balena fleet list` command. Note that slugs may change if the
-fleet is renamed. Fleet names are not unique and may result in  "Fleet is
-ambiguous" errors at any time (even if it "used to work in the past"), for
-example if the name clashes with a newly created public fleet, or with fleets
-from other balena accounts that you may be invited to join under any role.
-For this reason, fleet names are especially discouraged in scripts (e.g. CI
-environments).
-
-Examples:
-
-	$ balena tags --fleet MyFleet
-	$ balena tags -f myorg/myfleet
-	$ balena tags --device 7cf02a6
-	$ balena tags --release 1234
-	$ balena tags --release b376b0e544e9429483b656490e5b9443b4349bd6
-
-### Options
-
-#### -f, --fleet FLEET
-
-fleet name or slug (preferred)
-
-#### -d, --device DEVICE
-
-device UUID
-
-#### -r, --release RELEASE
-
-release id
-
 # Utilities
 
 ## util available-drives

npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "balena-cli",
-  "version": "19.5.0",
+  "version": "19.9.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "balena-cli",
-      "version": "19.5.0",
+      "version": "19.9.0",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -3739,9 +3739,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.16.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.11.tgz",
-      "integrity": "sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw==",
+      "version": "20.16.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.12.tgz",
+      "integrity": "sha512-LfPFB0zOeCeCNQV3i+67rcoVvoN5n0NVuR2vLG0O5ySQMgchuZlC4lgz546ZOJyDtj5KIgOxy+lacOimfqZAIA==",
       "dependencies": {
         "undici-types": "~6.19.2"
       }
@@ -5475,9 +5475,9 @@
       }
     },
     "node_modules/balena-sdk/node_modules/@types/node": {
-      "version": "18.19.55",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.55.tgz",
-      "integrity": "sha512-zzw5Vw52205Zr/nmErSEkN5FLqXPuKX/k5d1D7RKHATGqU7y6YfX9QxZraUzUrFGqH6XzOzG196BC35ltJC4Cw==",
+      "version": "18.19.56",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.56.tgz",
+      "integrity": "sha512-4EMJlWwwGnVPflJAtM14p9eVSa6BOv5b92mCsh5zcM1UagNtEtrbbtaE6WE1tw2TabavatnwqXjlIpcAEuJJNg==",
       "dependencies": {
         "undici-types": "~5.26.4"
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "19.5.0",
+  "version": "19.9.0",
   "description": "The official balena Command Line Interface",
   "main": "./build/app.js",
   "homepage": "https://github.com/balena-io/balena-cli",
@@ -273,6 +273,6 @@
     }
   },
   "versionist": {
-    "publishedAt": "2024-10-17T14:56:39.279Z"
+    "publishedAt": "2024-10-18T14:25:40.555Z"
   }
 }

src/commands/app/create.ts

@@ -28,7 +28,7 @@ export default class AppCreateCmd extends Command {
 		You can specify the organization the app 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.
+		\`balena organization list\` command.
 
 		The app's default device type is specified with the \`--type\` option.
 		The \`balena devices supported\` command can be used to list the available

src/commands/block/create.ts

@@ -28,7 +28,7 @@ export default class BlockCreateCmd extends Command {
 		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.
+		\`balena organization list\` 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

src/commands/env/list.ts

@@ -23,7 +23,7 @@ import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 import { applicationIdInfo } from '../../utils/messages';
 
-type FlagsDef = Interfaces.InferredFlags<typeof EnvsCmd.flags>;
+type FlagsDef = Interfaces.InferredFlags<typeof EnvListCmd.flags>;
 
 interface EnvironmentVariableInfo extends SDK.EnvironmentVariableBase {
 	fleet?: string | null; // fleet slug
@@ -45,7 +45,9 @@ interface ServiceEnvironmentVariableInfo
 	serviceName?: string; // service name
 }
 
-export default class EnvsCmd extends Command {
+export default class EnvListCmd extends Command {
+	public static aliases = ['envs'];
+
 	public static description = stripIndent`
 		List the environment or config variables of a fleet, device or service.
 
@@ -83,14 +85,14 @@ export default class EnvsCmd extends Command {
 	`;
 
 	public static examples = [
-		'$ balena envs --fleet myorg/myfleet',
-		'$ balena envs --fleet MyFleet --json',
-		'$ balena envs --fleet MyFleet --service MyService',
-		'$ balena envs --fleet MyFleet --config',
-		'$ balena envs --device 7cf02a6',
-		'$ balena envs --device 7cf02a6 --json',
-		'$ balena envs --device 7cf02a6 --config --json',
-		'$ balena envs --device 7cf02a6 --service MyService',
+		'$ balena env list --fleet myorg/myfleet',
+		'$ balena env list --fleet MyFleet --json',
+		'$ balena env list --fleet MyFleet --service MyService',
+		'$ balena env list --fleet MyFleet --config',
+		'$ balena env list --device 7cf02a6',
+		'$ balena env list --device 7cf02a6 --json',
+		'$ balena env list --device 7cf02a6 --config --json',
+		'$ balena env list --device 7cf02a6 --service MyService',
 	];
 
 	public static flags = {
@@ -108,7 +110,7 @@ export default class EnvsCmd extends Command {
 	};
 
 	public async run() {
-		const { flags: options } = await this.parse(EnvsCmd);
+		const { flags: options } = await this.parse(EnvListCmd);
 
 		const variables: EnvironmentVariableInfo[] = [];
 

src/commands/fleet/create.ts

@@ -28,7 +28,7 @@ export default class FleetCreateCmd extends Command {
 		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.
+		\`balena organization list\` 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

src/commands/organization/list.ts

@@ -19,13 +19,15 @@ import { Command } from '@oclif/core';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 
-export default class OrgsCmd extends Command {
+export default class OrganizationListCmd extends Command {
+	public static aliases = ['orgs'];
+
 	public static description = stripIndent`
 		List all organizations.
 
 		list all the organizations that you are a member of.
 `;
-	public static examples = ['$ balena orgs'];
+	public static examples = ['$ balena organization list'];
 
 	public static flags = {
 		help: cf.help,
@@ -34,7 +36,7 @@ export default class OrgsCmd extends Command {
 	public static authenticated = true;
 
 	public async run() {
-		await this.parse(OrgsCmd);
+		await this.parse(OrganizationListCmd);
 
 		const { getOwnOrganizations } = await import('../../utils/sdk');
 

src/commands/ssh-key/add.ts

@@ -20,7 +20,9 @@ import { ExpectedError } from '../../errors';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 
-export default class KeyAddCmd extends Command {
+export default class SSHKeyAddCmd extends Command {
+	public static aliases = ['key add'];
+
 	public static description = stripIndent`
 		Add an SSH key to balenaCloud.
 
@@ -44,10 +46,10 @@ export default class KeyAddCmd extends Command {
 	`;
 
 	public static examples = [
-		'$ balena key add Main ~/.ssh/id_rsa.pub',
-		'$ cat ~/.ssh/id_rsa.pub | balena key add Main',
+		'$ balena ssh-key add Main ~/.ssh/id_rsa.pub',
+		'$ cat ~/.ssh/id_rsa.pub | balena ssh-key add Main',
 		'# Windows 10 (cmd.exe prompt) example',
-		'$ balena key add Main %userprofile%.sshid_rsa.pub',
+		'$ balena ssh-key add Main %userprofile%.sshid_rsa.pub',
 	];
 
 	public static args = {
@@ -67,7 +69,7 @@ export default class KeyAddCmd extends Command {
 	public static authenticated = true;
 
 	public async run() {
-		const { args: params } = await this.parse(KeyAddCmd);
+		const { args: params } = await this.parse(SSHKeyAddCmd);
 
 		let key: string;
 		if (params.path != null) {

src/commands/ssh-key/index.ts

@@ -20,14 +20,16 @@ import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 import { parseAsInteger } from '../../utils/validation';
 
-export default class KeyCmd extends Command {
+export default class SSHKeyCmd extends Command {
+	public static aliases = ['key'];
+
 	public static description = stripIndent`
 		Display an SSH key.
 
 		Display a single SSH key registered in balenaCloud for the logged in user.
 	`;
 
-	public static examples = ['$ balena key 17'];
+	public static examples = ['$ balena ssh-key 17'];
 
 	public static args = {
 		id: Args.integer({
@@ -44,7 +46,7 @@ export default class KeyCmd extends Command {
 	public static authenticated = true;
 
 	public async run() {
-		const { args: params } = await this.parse(KeyCmd);
+		const { args: params } = await this.parse(SSHKeyCmd);
 
 		const key = await getBalenaSdk().models.key.get(params.id);
 

src/commands/ssh-key/list.ts

@@ -19,15 +19,15 @@ import { Command } from '@oclif/core';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 
-export default class KeyListCmd extends Command {
-	public static aliases = ['keys'];
+export default class SSHKeyListCmd extends Command {
+	public static aliases = ['keys', 'key list'];
 
 	public static description = stripIndent`
 		List the SSH keys in balenaCloud.
 
 		List all SSH keys registered in balenaCloud for the logged in user.
 	`;
-	public static examples = ['$ balena key list'];
+	public static examples = ['$ balena ssh-key list'];
 
 	public static flags = {
 		help: cf.help,
@@ -36,7 +36,7 @@ export default class KeyListCmd extends Command {
 	public static authenticated = true;
 
 	public async run() {
-		await this.parse(KeyListCmd);
+		await this.parse(SSHKeyListCmd);
 
 		const keys = await getBalenaSdk().models.key.getAll();
 

src/commands/ssh-key/rm.ts

@@ -20,7 +20,9 @@ import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 import { parseAsInteger } from '../../utils/validation';
 
-export default class KeyRmCmd extends Command {
+export default class SSHKeyRmCmd extends Command {
+	public static aliases = ['key rm'];
+
 	public static description = stripIndent`
 		Remove an SSH key from balenaCloud.
 
@@ -29,7 +31,10 @@ export default class KeyRmCmd extends Command {
 		The --yes option may be used to avoid interactive confirmation.
 	`;
 
-	public static examples = ['$ balena key rm 17', '$ balena key rm 17 --yes'];
+	public static examples = [
+		'$ balena ssh-key rm 17',
+		'$ balena ssh-key rm 17 --yes',
+	];
 
 	public static args = {
 		id: Args.integer({
@@ -47,7 +52,7 @@ export default class KeyRmCmd extends Command {
 	public static authenticated = true;
 
 	public async run() {
-		const { args: params, flags: options } = await this.parse(KeyRmCmd);
+		const { args: params, flags: options } = await this.parse(SSHKeyRmCmd);
 
 		const patterns = await import('../../utils/patterns');
 

src/commands/tag/list.ts

@@ -21,7 +21,9 @@ import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 import { applicationIdInfo } from '../../utils/messages';
 
-export default class TagsCmd extends Command {
+export default class TagListCmd extends Command {
+	public static aliases = ['tags'];
+
 	public static description = stripIndent`
 		List all tags for a fleet, device or release.
 
@@ -31,11 +33,11 @@ export default class TagsCmd extends Command {
 	`;
 
 	public static examples = [
-		'$ balena tags --fleet MyFleet',
-		'$ balena tags -f myorg/myfleet',
-		'$ balena tags --device 7cf02a6',
-		'$ balena tags --release 1234',
-		'$ balena tags --release b376b0e544e9429483b656490e5b9443b4349bd6',
+		'$ balena tag list --fleet MyFleet',
+		'$ balena tag list -f myorg/myfleet',
+		'$ balena tag list --device 7cf02a6',
+		'$ balena tag list --release 1234',
+		'$ balena tag list --release b376b0e544e9429483b656490e5b9443b4349bd6',
 	];
 
 	public static flags = {
@@ -57,7 +59,7 @@ export default class TagsCmd extends Command {
 	public static authenticated = true;
 
 	public async run() {
-		const { flags: options } = await this.parse(TagsCmd);
+		const { flags: options } = await this.parse(TagListCmd);
 
 		const balena = getBalenaSdk();
 
@@ -105,6 +107,6 @@ export default class TagsCmd extends Command {
 
 					See the help page for examples:
 
-					  $ balena help tags
+					  $ balena help tag list
 	`;
 }

src/utils/env-common.ts

@@ -43,7 +43,7 @@ export const booleanService = Flags.boolean({
 });
 
 export const rmRenameHelp = stripIndent`
-	Variables are selected by their database ID (as reported by the 'balena envs'
+	Variables are selected by their database ID (as reported by the 'balena env list'
 	command) and one of six database "resource types":
 
 	- fleet environment variable

tests/commands/env/list.spec.ts

@@ -22,7 +22,7 @@ import { BalenaAPIMock } from '../../nock/balena-api-mock';
 import { runCommand } from '../../helpers';
 import { randomBytes } from 'node:crypto';
 
-describe('balena envs', function () {
+describe('balena env list', function () {
 	const appName = 'test';
 	let fullUUID: string;
 	let shortUUID: string;
@@ -46,7 +46,7 @@ describe('balena envs', function () {
 		api.expectGetAppEnvVars();
 		api.expectGetAppServiceVars();
 
-		const { out, err } = await runCommand(`envs -f ${appName}`);
+		const { out, err } = await runCommand(`env list -f ${appName}`);
 
 		expect(out.join('')).to.equal(
 			stripIndent`
@@ -60,11 +60,32 @@ describe('balena envs', function () {
 		expect(err.join('')).to.equal('');
 	});
 
+	it('should successfully list env vars for a test fleet via `envs` alias', async () => {
+		api.expectGetApplication();
+		api.expectGetAppEnvVars();
+		api.expectGetAppServiceVars();
+
+		const { out, err } = await runCommand(`envs -f ${appName}`);
+
+		expect(out.join('')).to.satisfy((msg: string) =>
+			msg.endsWith(
+				stripIndent`
+			ID     NAME  VALUE       FLEET           SERVICE
+			120110 svar1 svar1-value gh_user/testApp service1
+			120111 svar2 svar2-value gh_user/testApp service2
+			120101 var1  var1-val    gh_user/testApp *
+			120102 var2  22          gh_user/testApp *
+		` + '\n',
+			),
+		);
+		expect(err.join('')).to.equal('');
+	});
+
 	it('should successfully list config vars for a test fleet', async () => {
 		api.expectGetApplication();
 		api.expectGetAppConfigVars();
 
-		const { out, err } = await runCommand(`envs -f ${appName} --config`);
+		const { out, err } = await runCommand(`env list -f ${appName} --config`);
 
 		expect(out.join('')).to.equal(
 			stripIndent`
@@ -80,7 +101,7 @@ describe('balena envs', function () {
 		api.expectGetApplication();
 		api.expectGetAppConfigVars();
 
-		const { out, err } = await runCommand(`envs -cjf ${appName}`);
+		const { out, err } = await runCommand(`env list -cjf ${appName}`);
 
 		expect(JSON.parse(out.join(''))).to.deep.equal([
 			{
@@ -101,7 +122,7 @@ describe('balena envs', function () {
 		api.expectGetAppServiceVars();
 
 		const { out, err } = await runCommand(
-			`envs -f ${appName} -s ${serviceName}`,
+			`env list -f ${appName} -s ${serviceName}`,
 		);
 
 		expect(out.join('')).to.equal(
@@ -123,7 +144,7 @@ describe('balena envs', function () {
 		api.expectGetAppServiceVars();
 
 		const { out, err } = await runCommand(
-			`envs -f ${appName} -s ${serviceName}`,
+			`env list -f ${appName} -s ${serviceName}`,
 		);
 
 		expect(out.join('')).to.equal(
@@ -146,7 +167,7 @@ describe('balena envs', function () {
 		api.expectGetAppServiceVars();
 		api.expectGetDeviceServiceVars();
 
-		const result = await runCommand(`envs -d ${shortUUID}`);
+		const result = await runCommand(`env list -d ${shortUUID}`);
 		let { out } = result;
 		let expected =
 			stripIndent`
@@ -176,7 +197,7 @@ describe('balena envs', function () {
 		api.expectGetAppServiceVars();
 		api.expectGetDeviceServiceVars();
 
-		const { out, err } = await runCommand(`envs -jd ${shortUUID}`);
+		const { out, err } = await runCommand(`env list -jd ${shortUUID}`);
 		const expected = `[
 			{ "id": 120101, "fleet": "org/test", "deviceUUID": "*", "name": "var1", "value": "var1-val", "serviceName": "*" },
 			{ "id": 120102, "fleet": "org/test", "deviceUUID": "*", "name": "var2", "value": "22", "serviceName": "*" },
@@ -199,7 +220,7 @@ describe('balena envs', function () {
 		api.expectGetApplication();
 		api.expectGetAppConfigVars();
 
-		const result = await runCommand(`envs -d ${shortUUID} --config`);
+		const result = await runCommand(`env list -d ${shortUUID} --config`);
 		let { out } = result;
 		let expected =
 			stripIndent`
@@ -225,7 +246,9 @@ describe('balena envs', function () {
 		api.expectGetAppServiceVars();
 		api.expectGetDeviceEnvVars();
 
-		const result = await runCommand(`envs -d ${shortUUID} -s ${serviceName}`);
+		const result = await runCommand(
+			`env list -d ${shortUUID} -s ${serviceName}`,
+		);
 		let { out } = result;
 		let expected =
 			stripIndent`
@@ -250,7 +273,7 @@ describe('balena envs', function () {
 		api.expectGetDeviceEnvVars();
 		api.expectGetDeviceServiceVars();
 
-		const result = await runCommand(`envs -d ${shortUUID}`);
+		const result = await runCommand(`env list -d ${shortUUID}`);
 		let { out } = result;
 		let expected =
 			stripIndent`
@@ -278,7 +301,9 @@ describe('balena envs', function () {
 		api.expectGetDeviceEnvVars();
 		api.expectGetDeviceServiceVars();
 
-		const result = await runCommand(`envs -d ${shortUUID} -s ${serviceName}`);
+		const result = await runCommand(
+			`env list -d ${shortUUID} -s ${serviceName}`,
+		);
 		let { out } = result;
 		let expected =
 			stripIndent`
@@ -309,7 +334,7 @@ describe('balena envs', function () {
 		api.expectGetDeviceServiceVars();
 
 		const { out, err } = await runCommand(
-			`envs -d ${shortUUID} -js ${serviceName}`,
+			`env list -d ${shortUUID} -js ${serviceName}`,
 		);
 		const expected = `[
 			{ "id": 120101, "fleet": "org/test", "deviceUUID": "*", "name": "var1", "value": "var1-val", "serviceName": "*" },

tests/commands/help.spec.ts

@@ -67,13 +67,13 @@ ADDITIONAL COMMANDS
   device shutdown <uuid>                 shutdown a device
   devices supported                      list the supported device types (like 'raspberrypi3' or 'intel-nuc')
   env add <name> [value]                 add env or config variable to application(s), device(s) or service(s)
+  env list                               list the environment or config variables of an application, device or service
   env rename <name> <value>              change the value of a config or env var for an app, device or service
   env rm <id>                            remove a config or env var from an application, device or service
-  envs                                   list the environment or config variables of an application, device or service
-  key <id>                               display an SSH key
-  key add <name> [path]                  add an SSH key to balenaCloud
-  key list                               list the SSH keys in balenaCloud
-  key rm <id>                            remove an SSH key from balenaCloud
+  ssh-key <id>                           display an SSH key
+  ssh-key add <name> [path]              add an SSH key to balenaCloud
+  ssh-key list                           list the SSH keys in balenaCloud
+  ssh-key rm <id>                        remove an SSH key from balenaCloud
   local configure <target>               (Re)configure a balenaOS drive or image
   local flash <image>                    flash an image to a drive
   logout                                 logout from balena
@@ -84,9 +84,9 @@ ADDITIONAL COMMANDS
   os initialize <image>                  initialize an os image for a device
   os versions <type>                     show available balenaOS versions for the given device type
   settings                               print current settings
-  tag rm <tagKey>                        remove a tag from an application, device or release
-  tag set <tagKey> [value]               set a tag on an application, device or release
-  tags                                   list all tags for an application, device or release
+  tag list                               list all tags for a app, block, fleet, device or release
+  tag rm <tagKey>                        remove a tag from an app, block, fleet, device or release
+  tag set <tagKey> [value]               set a tag on an app, block, fleet, device or release
   util available-drives                  list available drives
   version                                display version information for the balena CLI and/or Node.js
   whoami                                 display account information for current user

tests/test-data/pkg/expected-warnings-darwin-arm64.txt

@@ -130,15 +130,15 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/env/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/rename.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/rm.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/envs/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/fleet/create.js
@@ -172,18 +172,6 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/join/index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/add.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/list.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/leave/index.js
@@ -207,7 +195,7 @@
   %2: build/commands/notes/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
-  %2: build/commands/orgs/index.js
+  %2: build/commands/organization/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/os/build-config.js
@@ -253,18 +241,30 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/ssh/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/list.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/support/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/tag/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tag/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tag/set.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/tags/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tunnel/index.js

tests/test-data/pkg/expected-warnings-darwin-x64.txt

@@ -130,15 +130,15 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/env/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/rename.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/rm.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/envs/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/fleet/create.js
@@ -172,18 +172,6 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/join/index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/add.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/list.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/leave/index.js
@@ -207,7 +195,7 @@
   %2: build/commands/notes/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
-  %2: build/commands/orgs/index.js
+  %2: build/commands/organization/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/os/build-config.js
@@ -253,18 +241,30 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/ssh/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/list.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/support/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/tag/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tag/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tag/set.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/tags/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tunnel/index.js

tests/test-data/pkg/expected-warnings-linux-arm64.txt

@@ -130,15 +130,15 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/env/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/rename.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/rm.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/envs/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/fleet/create.js
@@ -172,18 +172,6 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/join/index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/add.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/list.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/leave/index.js
@@ -207,7 +195,7 @@
   %2: build/commands/notes/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
-  %2: build/commands/orgs/index.js
+  %2: build/commands/organization/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/os/build-config.js
@@ -253,18 +241,30 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/ssh/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/list.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/support/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/tag/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tag/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tag/set.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/tags/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tunnel/index.js

tests/test-data/pkg/expected-warnings-linux-x64.txt

@@ -130,15 +130,15 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/env/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/rename.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/env/rm.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/envs/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/fleet/create.js
@@ -172,18 +172,6 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/join/index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/add.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/list.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/key/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/leave/index.js
@@ -207,7 +195,7 @@
   %2: build/commands/notes/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
-  %2: build/commands/orgs/index.js
+  %2: build/commands/organization/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/os/build-config.js
@@ -253,18 +241,30 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/ssh/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/list.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/ssh-key/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/support/index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules/@oclif/core/package.json
+  %2: build/commands/tag/list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tag/rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tag/set.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules/@oclif/core/package.json
-  %2: build/commands/tags/index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules/@oclif/core/package.json
   %2: build/commands/tunnel/index.js

tests/test-data/pkg/expected-warnings-win32-x64.txt

@@ -130,15 +130,15 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\env\add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules\@oclif\core\package.json
+  %2: build\commands\env\list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\env\rename.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\env\rm.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules\@oclif\core\package.json
-  %2: build\commands\envs\index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\fleet\create.js
@@ -172,18 +172,6 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\join\index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules\@oclif\core\package.json
-  %2: build\commands\key\add.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules\@oclif\core\package.json
-  %2: build\commands\key\index.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules\@oclif\core\package.json
-  %2: build\commands\key\list.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules\@oclif\core\package.json
-  %2: build\commands\key\rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\leave\index.js
@@ -207,7 +195,7 @@
   %2: build\commands\notes\index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
-  %2: build\commands\orgs\index.js
+  %2: build\commands\organization\list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\os\build-config.js
@@ -253,18 +241,30 @@
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\ssh\index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules\@oclif\core\package.json
+  %2: build\commands\ssh-key\add.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules\@oclif\core\package.json
+  %2: build\commands\ssh-key\index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules\@oclif\core\package.json
+  %2: build\commands\ssh-key\list.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules\@oclif\core\package.json
+  %2: build\commands\ssh-key\rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\support\index.js
+> Warning Entry 'main' not found in %1
+  %1: node_modules\@oclif\core\package.json
+  %2: build\commands\tag\list.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\tag\rm.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\tag\set.js
-> Warning Entry 'main' not found in %1
-  %1: node_modules\@oclif\core\package.json
-  %2: build\commands\tags\index.js
 > Warning Entry 'main' not found in %1
   %1: node_modules\@oclif\core\package.json
   %2: build\commands\tunnel\index.js