From aaaa55424ad7c440506024fac86927fc9916348f Mon Sep 17 00:00:00 2001
From: sed-i <82407168+sed-i@users.noreply.github.com>
Date: Mon, 7 Feb 2022 01:34:20 -0500
Subject: [PATCH] refactor(juju)!: use the jsh prefix for `juju show-*`
 commands (#10426)

BREAKING CHANGE: some aliases have been renamed to be consistent with the rest.
Mainly, aliases for `juju show-` commands are renamed to `jsh*`. This also means
that `jsh` and `jshc` have been renamed to `jssh` and `jsshc`. Have a look at the
README for the complete alias changes.
---
 plugins/juju/README.md       | 10 ++++++----
 plugins/juju/juju.plugin.zsh | 11 +++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/plugins/juju/README.md b/plugins/juju/README.md
index 918c08de5..f0c65309c 100644
--- a/plugins/juju/README.md
+++ b/plugins/juju/README.md
@@ -15,6 +15,7 @@ Naming convention:
 
 - `!` suffix: `--force --no-wait -y`.
 - `ds` suffix: `--destroy-storage`.
+- `jsh` prefix means `juju show-*`.
 
 ### General
 
@@ -26,7 +27,7 @@ Naming convention:
 | `jdl`   | `juju debug-log --ms`                       | Display log, with millisecond resolution               |
 | `jdlr`  | `juju debug-log --ms --replay`              | Replay entire log                                      |
 | `jh`    | `juju help`                                 | Show help on a command or other topic                  |
-| `jssl`  | `juju show-status-log`                      | Output past statuses for the specified entity          |
+| `jshsl` | `juju show-status-log`                      | Output past statuses for the specified entity          |
 | `jstj`  | `juju status --format=json`                 | Show status in json format (more detailed)             |
 | `jst`   | `juju status --relations --color`           | Show status, including relations, in color             |
 | `jsts`  | `juju status --relations --storage --color` | Show status, including relations and storage, in color |
@@ -53,6 +54,7 @@ Naming convention:
 | `jdcds`  | `juju destroy-controller --destroy-all-models --destroy-storage`                      | Destroy a controller and associated storage                       |
 | `jdcds!` | `juju destroy-controller --destroy-all-models --destroy-storage --force --no-wait -y` | Destroy a controller and associated storage                       |
 | `jkc`    | `juju kill-controller -y -t 0`                                                        | Forcibly terminate all associated resources for a Juju controller |
+| `jshc`   | `juju show-controller`                                                                | Shows detailed information of a controller                    |
 | `jsw`    | `juju switch`                                                                         | Select or identify the current controller and model               |
 
 ### Model
@@ -84,9 +86,9 @@ Naming convention:
 | `jrmds!` | `juju remove-application --destroy-storage --force --no-wait` | Remove application forcefully, destroying attached storage                |
 | `jrp`    | `juju refresh --path`                                         | Upgrade charm from local charm file                                       |
 | `jsa`    | `juju scale-application`                                      | Set the desired number of application units                               |
-| `jsh`    | `juju ssh`                                                    | Initiate an SSH session or execute a command on a Juju target             |
-| `jshc`   | `juju ssh --container`                                        | Initiate an SSH session or execute a command on a given container         |
-| `jsu`    | `juju show-unit`                                              | Displays information about a unit                                         |
+| `jssh`   | `juju ssh`                                                    | Initiate an SSH session or execute a command on a Juju target             |
+| `jsshc`  | `juju ssh --container`                                        | Initiate an SSH session or execute a command on a given container         |
+| `jshu`   | `juju show-unit`                                              | Displays information about a unit                                         |
 
 ### Storage
 
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index 408692dc7..be8a2c7ae 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -16,6 +16,7 @@ unset completion_file
 # Generally,                                                 #
 #   - `!` means --force --no-wait -y                         #
 #   - `ds` suffix means --destroy-storage                    #
+#   - `jsh` prefix means juju show-*                         #
 # ---------------------------------------------------------- #
 alias j="juju"
 alias jam="juju add-model --config logging-config=\"<root>=WARNING; unit=DEBUG\"\
@@ -65,14 +66,16 @@ alias jrp='juju refresh --path'
 alias jrs='juju remove-storage'
 alias 'jrs!'='juju remove-storage --force'
 alias jsa='juju scale-application'
-alias jsh='juju ssh'
-alias jshc='juju ssh --container'
+alias jsha='juju show-application'
+alias jshc='juju show-controller'
 alias jshm='juju show-model'
-alias jssl='juju show-status-log'
+alias jshsl='juju show-status-log'
+alias jshu='juju show-unit'
+alias jssh='juju ssh'
+alias jsshc='juju ssh --container'
 alias jstj='juju status --format=json'
 alias jst='juju status --relations --color'
 alias jsts='juju status --relations --storage --color'
-alias jsu='juju show-unit'
 alias jsw='juju switch'
 
 # ---------------------------------------------------------- #