From f6128860ab9bd0e2ac250a3c6c3ed05091b4cd28 Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Tue, 14 May 2019 22:15:22 +0800
Subject: [PATCH] chore: Add short variable

---
 main.go        | 25 ++++++++++++-------------
 plugin.go      |  1 -
 plugin_test.go |  2 --
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/main.go b/main.go
index 452d999..a7e2f77 100644
--- a/main.go
+++ b/main.go
@@ -36,60 +36,60 @@ func main() {
 		cli.StringFlag{
 			Name:   "ssh-key",
 			Usage:  "private ssh key",
-			EnvVar: "PLUGIN_SSH_KEY,PLUGIN_KEY,SSH_KEY",
+			EnvVar: "PLUGIN_SSH_KEY,PLUGIN_KEY,SSH_KEY,KEY",
 		},
 		cli.StringFlag{
 			Name:   "key-path,i",
 			Usage:  "ssh private key path",
-			EnvVar: "PLUGIN_KEY_PATH,SSH_KEY_PATH",
+			EnvVar: "PLUGIN_KEY_PATH,SSH_KEY_PATH,PATH",
 		},
 		cli.StringFlag{
 			Name:   "username,user,u",
 			Usage:  "connect as user",
-			EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SSH_USERNAME",
+			EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SSH_USERNAME,USERNAME",
 			Value:  "root",
 		},
 		cli.StringFlag{
 			Name:   "password,P",
 			Usage:  "user password",
-			EnvVar: "PLUGIN_PASSWORD,SSH_PASSWORD",
+			EnvVar: "PLUGIN_PASSWORD,SSH_PASSWORD,PASSWORD",
 		},
 		cli.StringSliceFlag{
 			Name:   "host,H",
 			Usage:  "connect to host",
-			EnvVar: "PLUGIN_HOST,SSH_HOST",
+			EnvVar: "PLUGIN_HOST,SSH_HOST,HOST",
 		},
 		cli.IntFlag{
 			Name:   "port,p",
 			Usage:  "connect to port",
-			EnvVar: "PLUGIN_PORT,SSH_PORT",
+			EnvVar: "PLUGIN_PORT,SSH_PORT,PORT",
 			Value:  22,
 		},
 		cli.BoolFlag{
 			Name:   "sync",
 			Usage:  "sync mode",
-			EnvVar: "PLUGIN_SYNC",
+			EnvVar: "PLUGIN_SYNC,SYNC",
 		},
 		cli.DurationFlag{
 			Name:   "timeout,t",
 			Usage:  "connection timeout",
-			EnvVar: "PLUGIN_TIMEOUT,SSH_TIMEOUT",
+			EnvVar: "PLUGIN_TIMEOUT,SSH_TIMEOUT,TIMEOUT",
 		},
 		cli.DurationFlag{
 			Name:   "command.timeout,T",
 			Usage:  "command timeout",
-			EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT",
+			EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT,COMMAND_TIMEOUT",
 			Value:  60 * time.Second,
 		},
 		cli.StringSliceFlag{
 			Name:   "script,s",
 			Usage:  "execute commands",
-			EnvVar: "PLUGIN_SCRIPT,SSH_SCRIPT",
+			EnvVar: "PLUGIN_SCRIPT,SSH_SCRIPT,SCRIPT",
 		},
 		cli.BoolFlag{
 			Name:   "script.stop",
 			Usage:  "stop script after first failure",
-			EnvVar: "PLUGIN_SCRIPT_STOP",
+			EnvVar: "PLUGIN_SCRIPT_STOP,STOP",
 		},
 		cli.StringFlag{
 			Name:   "proxy.ssh-key",
@@ -141,7 +141,7 @@ func main() {
 		cli.BoolFlag{
 			Name:   "debug",
 			Usage:  "debug mode",
-			EnvVar: "PLUGIN_DEBUG",
+			EnvVar: "PLUGIN_DEBUG,DEBUG",
 		},
 	}
 
@@ -196,7 +196,6 @@ func run(c *cli.Context) error {
 			CommandTimeout: c.Duration("command.timeout"),
 			Script:         c.StringSlice("script"),
 			ScriptStop:     c.Bool("script.stop"),
-			Secrets:        c.StringSlice("secrets"),
 			Envs:           c.StringSlice("envs"),
 			Debug:          c.Bool("debug"),
 			Sync:           c.Bool("sync"),
diff --git a/plugin.go b/plugin.go
index 6b20164..be6a607 100644
--- a/plugin.go
+++ b/plugin.go
@@ -33,7 +33,6 @@ type (
 		CommandTimeout time.Duration
 		Script         []string
 		ScriptStop     bool
-		Secrets        []string
 		Envs           []string
 		Proxy          easyssh.DefaultConfig
 		Debug          bool
diff --git a/plugin_test.go b/plugin_test.go
index faf6e7e..2ffc89a 100644
--- a/plugin_test.go
+++ b/plugin_test.go
@@ -244,7 +244,6 @@ func TestSetENV(t *testing.T) {
 			Username:       "drone-scp",
 			Port:           22,
 			KeyPath:        "./tests/.ssh/id_rsa",
-			Secrets:        []string{"FOO"},
 			Envs:           []string{"foo"},
 			Debug:          true,
 			Script:         []string{"whoami; echo $FOO"},
@@ -271,7 +270,6 @@ func TestSetExistingENV(t *testing.T) {
 			Username:       "drone-scp",
 			Port:           22,
 			KeyPath:        "./tests/.ssh/id_rsa",
-			Secrets:        []string{"FOO"},
 			Envs:           []string{"foo", "bar", "baz"},
 			Debug:          true,
 			Script:         []string{"export FOO", "export BAR", "export BAZ", "env | grep -q '^FOO=Value for foo$'", "env | grep -q '^BAR=$'", "if env | grep -q BAZ; then false; else true; fi"},