refactor: unify command declaration across codebase

plugins/certs/internal-functions

@@ -6,9 +6,10 @@ set -eo pipefail
 
 cmd-certs-report() {
   declare desc="displays an ssl report for one or more apps"
-  local cmd="certs:report"
+  declare cmd="certs:report"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" INFO_FLAG="$2"
   local INSTALLED_APPS=$(dokku_apps)
-  local APP="$2" INFO_FLAG="$3"
 
   if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
     INFO_FLAG="$APP"
@@ -74,10 +75,12 @@ cmd-certs-report-single() {
 cmd-certs-info() {
   # This is here because it's used in both the info and the default
   declare desc="prints SSL certificate info for app"
-  local cmd="certs:info"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2"
-  local APP="$2"
+  declare cmd="certs:info"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
   local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
 
   if is_ssl_enabled "$APP"; then

plugins/certs/subcommands/add

@@ -30,12 +30,12 @@ is_file_import() {
 
 cmd-certs-set() {
   declare desc="imports an SSL cert/key combo either on STDIN via a tarball or from specified cert/key filenames"
-  local cmd="$1"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2"
-  local APP="$2"
-  local CRT_FILE="$3"
-  local KEY_FILE="$4"
+  declare cmd="$1"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" CRT_FILE="$2" KEY_FILE="$3"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
   local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
 
   if is_file_import "$CRT_FILE" "$KEY_FILE"; then

plugins/certs/subcommands/generate

@@ -6,8 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/domains/functions"
 
 cmd-certs-generate() {
   declare desc="generates a self-signed SSL certificate/key combo"
-  declare APP="$2" DOMAIN="$3"
-  local cmd="certs:generate"
+  declare cmd="certs:generate"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1" DOMAIN="$2"
+
   [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
   verify_app_name "$APP"
   local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"

plugins/certs/subcommands/remove

@@ -5,10 +5,12 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 
 cmd-certs-remove() {
   declare desc="removes SSL cert/key from specified app"
-  local cmd="certs:remove"
-  [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on"
-  verify_app_name "$2"
-  local APP="$2"
+  declare cmd="certs:remove"
+  [[ "$1" == "$cmd" ]] && shift 1
+  declare APP="$1"
+
+  [[ -z "$APP" ]] && dokku_log_fail "Please specify an app to run the command on"
+  verify_app_name "$APP"
   local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
 
   if [[ -d "$APP_SSL_PATH" ]]; then