Merge pull request #4335 from dokku/4313-plugin-update

Add error checking to plugin:install and plugin:update

plugins/plugin/internal-functions

@@ -33,3 +33,33 @@ plugin_prime_bash_completion() {
   dokku_log_info1_quiet "Priming bash-completion cache"
   dokku --quiet help --all | awk '/^    /{ print $1 }' | sort >"/var/cache/dokku-completion"
 }
+
+fn-is-core-plugin() {
+  declare PLUGIN_NAME="$1"
+
+  if [[ -L "$PLUGIN_CORE_ENABLED_PATH/$PLUGIN_NAME" ]]; then
+    return 0
+  fi
+
+  return 1
+}
+
+fn-is-valid-plugin() {
+  declare PLUGIN_NAME="$1"
+
+  if [[ "$PLUGIN_NAME" =~ ^[0-9a-zA-Z_-]+$ ]]; then
+    return 0
+  fi
+
+  return 1
+}
+
+fn-plugin-enabled() {
+  declare PLUGIN_NAME="$1"
+
+  if [[ -L "$PLUGIN_ENABLED_PATH/$PLUGIN_NAME" ]]; then
+    return 0
+  fi
+
+  return 1
+}

plugins/plugin/subcommands/install

@@ -21,6 +21,12 @@ cmd-plugin-install() {
       plugn trigger install
       ;;
     *)
+      if [[ -n "$FLAG" ]]; then
+        dokku_log_warn "First argument must be --core or url to plugin"
+        dokku_log_warn "Valid prefixes: https:, git:, ssh:, file:"
+        dokku_log_warn "Valid suffixes: .tar.gz, .tgz"
+        dokku_log_fail "Please retry with valid arguments"
+      fi
       plugn trigger install
       ;;
   esac

plugins/plugin/subcommands/update

@@ -10,8 +10,21 @@ cmd-plugin-update() {
   declare PLUGIN="$1" PLUGIN_COMMITTISH="$2"
 
   if [[ -n "$PLUGIN" ]]; then
+    if ! fn-is-valid-plugin "$PLUGIN"; then
+      dokku_log_fail "Invalid plugin name specified"
+    fi
+
+    if ! fn-plugin-enabled "$PLUGIN"; then
+      dokku_log_fail "Specified plugin not enabled or installed"
+    fi
+
+    if fn-is-core-plugin "$PLUGIN"; then
+      dokku_log_fail "Cannot trigger plugin:update against core plugin, please update Dokku instead"
+    fi
+
     plugn update "$PLUGIN" "$PLUGIN_COMMITTISH"
   fi
+
   plugn trigger update
   plugin_prime_bash_completion
 }