chore: Add short variable

This commit is contained in:
Bo-Yi Wu 2019-05-14 22:15:22 +08:00
parent 3505455bb7
commit f6128860ab
3 changed files with 12 additions and 16 deletions

25
main.go
View File

@ -36,60 +36,60 @@ func main() {
cli.StringFlag{ cli.StringFlag{
Name: "ssh-key", Name: "ssh-key",
Usage: "private 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{ cli.StringFlag{
Name: "key-path,i", Name: "key-path,i",
Usage: "ssh private key path", Usage: "ssh private key path",
EnvVar: "PLUGIN_KEY_PATH,SSH_KEY_PATH", EnvVar: "PLUGIN_KEY_PATH,SSH_KEY_PATH,PATH",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "username,user,u", Name: "username,user,u",
Usage: "connect as user", Usage: "connect as user",
EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SSH_USERNAME", EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SSH_USERNAME,USERNAME",
Value: "root", Value: "root",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "password,P", Name: "password,P",
Usage: "user password", Usage: "user password",
EnvVar: "PLUGIN_PASSWORD,SSH_PASSWORD", EnvVar: "PLUGIN_PASSWORD,SSH_PASSWORD,PASSWORD",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "host,H", Name: "host,H",
Usage: "connect to host", Usage: "connect to host",
EnvVar: "PLUGIN_HOST,SSH_HOST", EnvVar: "PLUGIN_HOST,SSH_HOST,HOST",
}, },
cli.IntFlag{ cli.IntFlag{
Name: "port,p", Name: "port,p",
Usage: "connect to port", Usage: "connect to port",
EnvVar: "PLUGIN_PORT,SSH_PORT", EnvVar: "PLUGIN_PORT,SSH_PORT,PORT",
Value: 22, Value: 22,
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "sync", Name: "sync",
Usage: "sync mode", Usage: "sync mode",
EnvVar: "PLUGIN_SYNC", EnvVar: "PLUGIN_SYNC,SYNC",
}, },
cli.DurationFlag{ cli.DurationFlag{
Name: "timeout,t", Name: "timeout,t",
Usage: "connection timeout", Usage: "connection timeout",
EnvVar: "PLUGIN_TIMEOUT,SSH_TIMEOUT", EnvVar: "PLUGIN_TIMEOUT,SSH_TIMEOUT,TIMEOUT",
}, },
cli.DurationFlag{ cli.DurationFlag{
Name: "command.timeout,T", Name: "command.timeout,T",
Usage: "command timeout", Usage: "command timeout",
EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT", EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT,COMMAND_TIMEOUT",
Value: 60 * time.Second, Value: 60 * time.Second,
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "script,s", Name: "script,s",
Usage: "execute commands", Usage: "execute commands",
EnvVar: "PLUGIN_SCRIPT,SSH_SCRIPT", EnvVar: "PLUGIN_SCRIPT,SSH_SCRIPT,SCRIPT",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "script.stop", Name: "script.stop",
Usage: "stop script after first failure", Usage: "stop script after first failure",
EnvVar: "PLUGIN_SCRIPT_STOP", EnvVar: "PLUGIN_SCRIPT_STOP,STOP",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "proxy.ssh-key", Name: "proxy.ssh-key",
@ -141,7 +141,7 @@ func main() {
cli.BoolFlag{ cli.BoolFlag{
Name: "debug", Name: "debug",
Usage: "debug mode", 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"), CommandTimeout: c.Duration("command.timeout"),
Script: c.StringSlice("script"), Script: c.StringSlice("script"),
ScriptStop: c.Bool("script.stop"), ScriptStop: c.Bool("script.stop"),
Secrets: c.StringSlice("secrets"),
Envs: c.StringSlice("envs"), Envs: c.StringSlice("envs"),
Debug: c.Bool("debug"), Debug: c.Bool("debug"),
Sync: c.Bool("sync"), Sync: c.Bool("sync"),

View File

@ -33,7 +33,6 @@ type (
CommandTimeout time.Duration CommandTimeout time.Duration
Script []string Script []string
ScriptStop bool ScriptStop bool
Secrets []string
Envs []string Envs []string
Proxy easyssh.DefaultConfig Proxy easyssh.DefaultConfig
Debug bool Debug bool

View File

@ -244,7 +244,6 @@ func TestSetENV(t *testing.T) {
Username: "drone-scp", Username: "drone-scp",
Port: 22, Port: 22,
KeyPath: "./tests/.ssh/id_rsa", KeyPath: "./tests/.ssh/id_rsa",
Secrets: []string{"FOO"},
Envs: []string{"foo"}, Envs: []string{"foo"},
Debug: true, Debug: true,
Script: []string{"whoami; echo $FOO"}, Script: []string{"whoami; echo $FOO"},
@ -271,7 +270,6 @@ func TestSetExistingENV(t *testing.T) {
Username: "drone-scp", Username: "drone-scp",
Port: 22, Port: 22,
KeyPath: "./tests/.ssh/id_rsa", KeyPath: "./tests/.ssh/id_rsa",
Secrets: []string{"FOO"},
Envs: []string{"foo", "bar", "baz"}, Envs: []string{"foo", "bar", "baz"},
Debug: true, 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"}, 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"},