chore: update default timeout to 10 minutes

chore(cmd): trim space in command
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2026-06-16 14:49:25 +08:00 · 2019-11-30 22:40:13 +08:00 · 2019-11-21 09:13:04 +08:00 · 2019-11-21 09:05:32 +08:00 · 2019-11-21 00:44:00 +08:00 · 2019-10-18 22:37:47 +08:00
9 changed files with 233 additions and 175 deletions
@@ -9,47 +9,39 @@ platform:
 steps:
 - name: vet
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - make vet
-  environment:
-    GO111MODULE: on
  volumes:
  - name: gopath
    path: /go

 - name: lint
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - make lint
-  environment:
-    GO111MODULE: on
  volumes:
  - name: gopath
    path: /go

 - name: misspell
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - make misspell-check
-  environment:
-    GO111MODULE: on
  volumes:
  - name: gopath
    path: /go

 - name: test
  pull: always
-  image: golang:1.12-alpine
+  image: golang:1.13-alpine
  commands:
  - apk add git make curl perl bash build-base zlib-dev ucl-dev
  - make ssh-server
  - make test
  - make coverage
-  environment:
-    GO111MODULE: on
  volumes:
  - name: gopath
    path: /go
@@ -76,12 +68,11 @@ platform:
 steps:
 - name: build-push
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh"
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
      exclude:
@@ -89,19 +80,18 @@ steps:

 - name: build-tag
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh"
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
    - tag

 - name: executable
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - ./release/linux/amd64/drone-ssh --help

@@ -140,8 +130,8 @@ steps:
 trigger:
  ref:
  - refs/heads/master
-  - "refs/pull/**"
-  - "refs/tags/**"
+  - refs/pull/**
+  - refs/tags/**

 depends_on:
 - testing
@@ -157,12 +147,11 @@ platform:
 steps:
 - name: build-push
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh"
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
      exclude:
@@ -170,19 +159,18 @@ steps:

 - name: build-tag
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh"
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
    - tag

 - name: executable
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - ./release/linux/arm64/drone-ssh --help

@@ -221,8 +209,8 @@ steps:
 trigger:
  ref:
  - refs/heads/master
-  - "refs/pull/**"
-  - "refs/tags/**"
+  - refs/pull/**
+  - refs/tags/**

 depends_on:
 - testing
@@ -238,12 +226,11 @@ platform:
 steps:
 - name: build-push
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh"
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
      exclude:
@@ -251,19 +238,18 @@ steps:

 - name: build-tag
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh"
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
    - tag

 - name: executable
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - ./release/linux/arm/drone-ssh --help

@@ -302,8 +288,8 @@ steps:
 trigger:
  ref:
  - refs/heads/master
-  - "refs/pull/**"
-  - "refs/tags/**"
+  - refs/pull/**
+  - refs/tags/**

 depends_on:
 - testing
@@ -319,11 +305,9 @@ platform:
 steps:
 - name: build-all-binary
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - make release
-  environment:
-    GO111MODULE: on
  when:
    event:
    - tag
@@ -335,14 +319,14 @@ steps:
    api_key:
      from_secret: github_release_api_key
    files:
-    - "dist/release/*"
+    - dist/release/*
  when:
    event:
    - tag

 trigger:
  ref:
-  - "refs/tags/**"
+  - refs/tags/**

 depends_on:
 - testing
@@ -367,17 +351,10 @@ steps:
    username:
      from_secret: docker_username

- name: microbadger
-  pull: always
-  image: plugins/webhook:1
-  settings:
-    url:
-      from_secret: microbadger_url
-
 trigger:
  ref:
  - refs/heads/master
-  - "refs/tags/**"
+  - refs/tags/**

 depends_on:
 - linux-amd64
@@ -1,8 +1,8 @@
 ---
-date: 2017-01-29T00:00:00+00:00
+date: 2019-08-04T00:00:00+00:00
 title: SSH
 author: appleboy
-tags: [ publish, ssh ]
+tags: [ deploy, publish, ssh ]
 repo: appleboy/drone-ssh
 logo: term.svg
 image: appleboy/drone-ssh
@@ -11,24 +11,22 @@ image: appleboy/drone-ssh
 Use the SSH plugin to execute commands on a remote server. The below pipeline configuration demonstrates simple usage:

 ```yaml
-pipeline:
-  ssh:
-    image: appleboy/drone-ssh
-    settings:
-      host: foo.com
-      username: root
-      password: 1234
-      port: 22
-      script:
-        - echo hello
-        - echo world
+- name: ssh commands
+  image: appleboy/drone-ssh
+  settings:
+    host: foo.com
+    username: root
+    password: 1234
+    port: 22
+    script:
+      - echo hello
+      - echo world
 ```

 Example configuration in your `.drone.yml` file for multiple hosts:

 ```diff
-pipeline:
-  ssh:
+  - name: ssh commands
    image: appleboy/drone-ssh
    settings:
      host:
@@ -38,22 +36,21 @@ pipeline:
      password: 1234
      port: 22
      script:
-        - echo hello
-        - echo world
+      - echo hello
+      - echo world
 ```

 Example configuration for command timeout, default value is 60 seconds:

 ```diff
-pipeline:
-  ssh:
+  - name: ssh commands
    image: appleboy/drone-ssh
    settings:
      host: foo.com
      username: root
      password: 1234
      port: 22
-+     command_timeout: 2m
+       command_timeout: 2m
      script:
        - echo hello
        - echo world
@@ -62,8 +59,7 @@ pipeline:
 Example configuration for execute commands on a remote server using ｀SSHProxyCommand｀:

 ```diff
-pipeline:
-  ssh:
+  - name: ssh commands
    image: appleboy/drone-ssh
    settings:
      host: foo.com
@@ -82,8 +78,7 @@ pipeline:
 Example configuration using password from secrets:

 ```diff
-pipeline:
-  ssh:
+  - name: ssh commands
    image: appleboy/drone-ssh
    settings:
      host: foo.com
@@ -99,8 +94,7 @@ pipeline:
 Example configuration using ssh key from secrets:

 ```diff
-pipeline:
-  ssh:
+  - name: ssh commands
    image: appleboy/drone-ssh
    settings:
      host: foo.com
@@ -116,21 +110,36 @@ pipeline:
 Example configuration for exporting custom secrets:

 ```diff
-pipeline:
-  ssh:
+  - name: ssh commands
    image: appleboy/drone-ssh
    settings:
      host: foo.com
      username: root
      password: 1234
      port: 22
-+     envs: 
+     envs:
        - aws_access_key_id
      script:
        - export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
 ```

-# Secret Reference
+Example configuration for stoping script after first failure:
+
+```diff
+  - name: ssh commands
+    image: appleboy/drone-ssh
+    settings:
+      host: foo.com
+      username: root
+      password: 1234
+      port: 22
+     script_stop: true
+      script:
+        - mkdir abc/def/efg
+        - echo "you can't see the steps."
+```
+
+## Secret Reference

 ssh_username
 : account for target host user
@@ -150,7 +159,7 @@ proxy_ssh_password
 proxy_ssh_key
 : plain text of user private key for proxy server

-# Parameter Reference
+## Parameter Reference

 host
 : target hostname or IP
@@ -176,11 +185,14 @@ envs
 script
 : execute commands on a remote server

+script_stop
+: stop script after first failure
+
 timeout
-: Timeout is the maximum amount of time for the TCP connection to establish.
+: Timeout is the maximum amount of time for the ssh connection to establish, default is 30 seconds.

 command_timeout
-: Command timeout is the maximum amount of time for the execute commands, default is 60 secs.
+: Command timeout is the maximum amount of time for the execute commands, default is 10 minutes.

 proxy_host
 : proxy hostname or IP
@@ -1,14 +1,14 @@
-<img src="images/ssh.png">
-
 # drone-ssh

-[![GitHub tag](https://img.shields.io/github/tag/appleboy/drone-ssh.svg)](https://github.com/appleboy/drone-ssh/releases) 
-[![GoDoc](https://godoc.org/github.com/appleboy/drone-ssh?status.svg)](https://godoc.org/github.com/appleboy/drone-ssh) 
+![sshlog](images/ssh.png)
+
+[![GitHub tag](https://img.shields.io/github/tag/appleboy/drone-ssh.svg)](https://github.com/appleboy/drone-ssh/releases)
+[![GoDoc](https://godoc.org/github.com/appleboy/drone-ssh?status.svg)](https://godoc.org/github.com/appleboy/drone-ssh)
 [![Build Status](https://cloud.drone.io/api/badges/appleboy/drone-ssh/status.svg)](https://cloud.drone.io/appleboy/drone-ssh)
-[![codecov](https://codecov.io/gh/appleboy/drone-ssh/branch/master/graph/badge.svg)](https://codecov.io/gh/appleboy/drone-ssh) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/appleboy/drone-ssh)](https://goreportcard.com/report/github.com/appleboy/drone-ssh) 
+[![codecov](https://codecov.io/gh/appleboy/drone-ssh/branch/master/graph/badge.svg)](https://codecov.io/gh/appleboy/drone-ssh)
+[![Go Report Card](https://goreportcard.com/badge/github.com/appleboy/drone-ssh)](https://goreportcard.com/report/github.com/appleboy/drone-ssh)
 [![Docker Pulls](https://img.shields.io/docker/pulls/appleboy/drone-ssh.svg)](https://hub.docker.com/r/appleboy/drone-ssh/)
-[![](https://images.microbadger.com/badges/image/appleboy/drone-ssh.svg)](https://microbadger.com/images/appleboy/drone-ssh "Get your own image badge on microbadger.com")
+[![micro badger](https://images.microbadger.com/badges/image/appleboy/drone-ssh.svg)](https://microbadger.com/images/appleboy/drone-ssh "Get your own image badge on microbadger.com")

 Drone plugin to execute commands on a remote host through SSH. For the usage
 information and a listing of the available options please take a look at [the docs](http://plugins.drone.io/appleboy/drone-ssh/).
@@ -49,29 +49,29 @@ The pre-compiled binaries can be downloaded from [release page](https://github.c

 With `Go` installed

+```sh
+go get -u -v github.com/appleboy/drone-ssh
 ```
-$ go get -u -v github.com/appleboy/drone-ssh
-``` 

 or build the binary with the following command:

-```
-$ export GOOS=linux
-$ export GOARCH=amd64
-$ export CGO_ENABLED=0
-$ export GO111MODULE=on
+```sh
+export GOOS=linux
+export GOARCH=amd64
+export CGO_ENABLED=0
+export GO111MODULE=on

-$ go test -cover ./...
+go test -cover ./...

-$ go build -v -a -tags netgo -o release/linux/amd64/drone-ssh .
+go build -v -a -tags netgo -o release/linux/amd64/drone-ssh .
 ```

 ## Docker

 Build the docker image with the following commands:

-```
-$ make docker
+```sh
+make docker
 ```

 ## Usage
@@ -1,10 +1,10 @@
 module github.com/appleboy/drone-ssh

-go 1.12
+go 1.13

 require (
 	github.com/appleboy/easyssh-proxy v1.2.0
 	github.com/joho/godotenv v1.3.0
-	github.com/stretchr/testify v1.3.0
-	github.com/urfave/cli v1.20.0
+	github.com/stretchr/testify v1.4.0
+	github.com/urfave/cli v1.22.1
 )
@@ -1,17 +1,29 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/appleboy/easyssh-proxy v1.2.0 h1:KvaUGC18WkBFet+N1oofQy03jkC5HaKFn2XGxFxCTtg=
 github.com/appleboy/easyssh-proxy v1.2.0/go.mod h1:vHskChUNhxwW4dXMe2MNE/k+UBCkBagrQDm70UWZrS0=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
-github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
+github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25 h1:jsG6UpNLt9iAsb0S2AGW28DveNzzgmbXR+ENoPjUeIU=
 golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -36,107 +36,113 @@ func main() {
 		cli.StringFlag{
 			Name:   "ssh-key",
 			Usage:  "private ssh key",
-			EnvVar: "PLUGIN_SSH_KEY,PLUGIN_KEY,SSH_KEY,KEY",
+			EnvVar: "PLUGIN_SSH_KEY,PLUGIN_KEY,SSH_KEY,KEY,INPUT_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,INPUT_KEY_PATH",
 		},
 		cli.StringFlag{
 			Name:   "username,user,u",
 			Usage:  "connect as user",
-			EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SSH_USERNAME,USERNAME",
+			EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SSH_USERNAME,USERNAME,INPUT_USERNAME",
 			Value:  "root",
 		},
 		cli.StringFlag{
 			Name:   "password,P",
 			Usage:  "user password",
-			EnvVar: "PLUGIN_PASSWORD,SSH_PASSWORD,PASSWORD",
+			EnvVar: "PLUGIN_PASSWORD,SSH_PASSWORD,PASSWORD,INPUT_PASSWORD",
 		},
 		cli.StringSliceFlag{
 			Name:   "host,H",
 			Usage:  "connect to host",
-			EnvVar: "PLUGIN_HOST,SSH_HOST,HOST",
+			EnvVar: "PLUGIN_HOST,SSH_HOST,HOST,INPUT_HOST",
 		},
 		cli.IntFlag{
 			Name:   "port,p",
 			Usage:  "connect to port",
-			EnvVar: "PLUGIN_PORT,SSH_PORT,PORT",
+			EnvVar: "PLUGIN_PORT,SSH_PORT,PORT,INPUT_PORT",
 			Value:  22,
 		},
 		cli.BoolFlag{
 			Name:   "sync",
 			Usage:  "sync mode",
-			EnvVar: "PLUGIN_SYNC,SYNC",
+			EnvVar: "PLUGIN_SYNC,SYNC,INPUT_SYNC",
 		},
 		cli.DurationFlag{
 			Name:   "timeout,t",
 			Usage:  "connection timeout",
-			EnvVar: "PLUGIN_TIMEOUT,SSH_TIMEOUT,TIMEOUT",
+			EnvVar: "PLUGIN_TIMEOUT,SSH_TIMEOUT,TIMEOUT,INPUT_TIMEOUT",
+			Value:  30 * time.Second,
 		},
 		cli.DurationFlag{
 			Name:   "command.timeout,T",
 			Usage:  "command timeout",
-			EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT,COMMAND_TIMEOUT",
-			Value:  60 * time.Second,
+			EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT,COMMAND_TIMEOUT,INPUT_COMMAND_TIMEOUT",
+			Value:  10 * time.Minute,
 		},
 		cli.StringSliceFlag{
 			Name:   "script,s",
 			Usage:  "execute commands",
 			EnvVar: "PLUGIN_SCRIPT,SSH_SCRIPT,SCRIPT",
 		},
+		cli.StringFlag{
+			Name:   "script.string",
+			Usage:  "execute single commands for github action",
+			EnvVar: "INPUT_SCRIPT",
+		},
 		cli.BoolFlag{
 			Name:   "script.stop",
 			Usage:  "stop script after first failure",
-			EnvVar: "PLUGIN_SCRIPT_STOP,STOP",
+			EnvVar: "PLUGIN_SCRIPT_STOP,STOP,INPUT_SCRIPT_STOP",
 		},
 		cli.StringFlag{
 			Name:   "proxy.ssh-key",
 			Usage:  "private ssh key of proxy",
-			EnvVar: "PLUGIN_PROXY_SSH_KEY,PLUGIN_PROXY_KEY,PROXY_SSH_KEY",
+			EnvVar: "PLUGIN_PROXY_SSH_KEY,PLUGIN_PROXY_KEY,PROXY_SSH_KEY,INPUT_PROXY_KEY",
 		},
 		cli.StringFlag{
 			Name:   "proxy.key-path",
 			Usage:  "ssh private key path of proxy",
-			EnvVar: "PLUGIN_PROXY_KEY_PATH,PROXY_SSH_KEY_PATH",
+			EnvVar: "PLUGIN_PROXY_KEY_PATH,PROXY_SSH_KEY_PATH,INPUT_PROXY_KEY_PATH",
 		},
 		cli.StringFlag{
 			Name:   "proxy.username",
 			Usage:  "connect as user of proxy",
-			EnvVar: "PLUGIN_PROXY_USERNAME,PLUGIN_PROXY_USER,PROXY_SSH_USERNAME",
+			EnvVar: "PLUGIN_PROXY_USERNAME,PLUGIN_PROXY_USER,PROXY_SSH_USERNAME,INPUT_PROXY_USERNAME",
 			Value:  "root",
 		},
 		cli.StringFlag{
 			Name:   "proxy.password",
 			Usage:  "user password of proxy",
-			EnvVar: "PLUGIN_PROXY_PASSWORD,PROXY_SSH_PASSWORD",
+			EnvVar: "PLUGIN_PROXY_PASSWORD,PROXY_SSH_PASSWORD,INPUT_PROXY_PASSWORD",
 		},
 		cli.StringFlag{
 			Name:   "proxy.host",
 			Usage:  "connect to host of proxy",
-			EnvVar: "PLUGIN_PROXY_HOST,PROXY_SSH_HOST",
+			EnvVar: "PLUGIN_PROXY_HOST,PROXY_SSH_HOST,INPUT_PROXY_HOST",
 		},
 		cli.StringFlag{
 			Name:   "proxy.port",
 			Usage:  "connect to port of proxy",
-			EnvVar: "PLUGIN_PROXY_PORT,PROXY_SSH_PORT",
+			EnvVar: "PLUGIN_PROXY_PORT,PROXY_SSH_PORT,INPUT_PROXY_PORT",
 			Value:  "22",
 		},
 		cli.DurationFlag{
 			Name:   "proxy.timeout",
 			Usage:  "proxy connection timeout",
-			EnvVar: "PLUGIN_PROXY_TIMEOUT,PROXY_SSH_TIMEOUT",
+			EnvVar: "PLUGIN_PROXY_TIMEOUT,PROXY_SSH_TIMEOUT,INPUT_PROXY_TIMEOUT",
 		},
 		cli.StringSliceFlag{
 			Name:   "envs",
-			Usage:  "Pass envs",
-			EnvVar: "PLUGIN_ENVS",
+			Usage:  "pass environment variable to shell script",
+			EnvVar: "PLUGIN_ENVS,INPUT_ENVS",
 		},
 		cli.BoolFlag{
 			Name:   "debug",
 			Usage:  "debug mode",
-			EnvVar: "PLUGIN_DEBUG,DEBUG",
+			EnvVar: "PLUGIN_DEBUG,DEBUG,INPUT_DEBUG",
 		},
 	}

@@ -179,6 +185,10 @@ REPOSITORY:
 }

 func run(c *cli.Context) error {
+	scripts := c.StringSlice("script")
+	if s := c.String("script.string"); s != "" {
+		scripts = append(scripts, s)
+	}
 	plugin := Plugin{
 		Config: Config{
 			Key:            c.String("ssh-key"),
@@ -189,7 +199,7 @@ func run(c *cli.Context) error {
 			Port:           c.Int("port"),
 			Timeout:        c.Duration("timeout"),
 			CommandTimeout: c.Duration("command.timeout"),
-			Script:         c.StringSlice("script"),
+			Script:         scripts,
 			ScriptStop:     c.Bool("script.stop"),
 			Envs:           c.StringSlice("envs"),
 			Debug:          c.Bool("debug"),
@@ -9,11 +9,8 @@
    steps: [
      {
        name: 'vet',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'make vet',
        ],
@@ -26,11 +23,8 @@
      },
      {
        name: 'lint',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'make lint',
        ],
@@ -43,11 +37,8 @@
      },
      {
        name: 'misspell',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'make misspell-check',
        ],
@@ -60,11 +51,8 @@
      },
      {
        name: 'test',
-        image: 'golang:1.12-alpine',
+        image: 'golang:1.13-alpine',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'apk add git make curl perl bash build-base zlib-dev ucl-dev',
          'make ssh-server',
@@ -105,11 +93,10 @@
    steps: [
      {
        name: 'build-push',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
        environment: {
          CGO_ENABLED: '0',
-          GO111MODULE: 'on',
        },
        commands: [
          'go build -v -ldflags \'-X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name,
@@ -122,11 +109,10 @@
      },
      {
        name: 'build-tag',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
        environment: {
          CGO_ENABLED: '0',
-          GO111MODULE: 'on',
        },
        commands: [
          'go build -v -ldflags \'-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name,
@@ -137,7 +123,7 @@
      },
      {
        name: 'executable',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
        commands: [
          './release/' + os + '/' + arch + '/' + name + ' --help',
@@ -202,11 +188,8 @@
    steps: [
      {
        name: 'build-all-binary',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'make release'
        ],
@@ -256,14 +239,6 @@
          ignore_missing: true,
        },
      },
-      {
-        name: 'microbadger',
-        image: 'plugins/webhook:1',
-        pull: 'always',
-        settings: {
-          url: { 'from_secret': 'microbadger_url' },
-        },
-      },
    ],
    depends_on: depends_on,
    trigger: {
@@ -174,27 +174,34 @@ func (p Plugin) Exec() error {
 		}
 	}

-	fmt.Println("==========================================")
-	fmt.Println("Successfully executed commands to all host.")
-	fmt.Println("==========================================")
+	fmt.Println("==============================================")
+	fmt.Println("✅ Successfully executed commands to all host.")
+	fmt.Println("==============================================")

 	return nil
 }

 func (p Plugin) scriptCommands() []string {
-	numCommands := len(p.Config.Script)
-	if p.Config.ScriptStop {
-		numCommands *= 2
-	}
-
-	commands := make([]string, numCommands)
+	scripts := []string{}

 	for _, cmd := range p.Config.Script {
+		if p.Config.ScriptStop {
+			scripts = append(scripts, strings.Split(cmd, "\n")...)
+		} else {
+			scripts = append(scripts, cmd)
+		}
+	}
+
+	commands := make([]string, 0)
+
+	for _, cmd := range scripts {
+		if strings.TrimSpace(cmd) == "" {
+			continue
+		}
+		commands = append(commands, cmd)
 		if p.Config.ScriptStop {
 			commands = append(commands, "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;")
 		}
-
-		commands = append(commands, cmd)
 	}

 	return commands
@@ -2,7 +2,9 @@ package main

 import (
 	"bytes"
+	"io"
 	"os"
+	"reflect"
 	"strings"
 	"testing"
 	"time"
@@ -527,3 +529,66 @@ func TestEnvOutput(t *testing.T) {
 func unindent(text string) string {
 	return strings.TrimSpace(strings.Replace(text, "\t", "", -1))
 }
+
+func TestPlugin_scriptCommands(t *testing.T) {
+	type fields struct {
+		Config Config
+		Writer io.Writer
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		want   []string
+	}{
+		{
+			name: "normal testing",
+			fields: fields{
+				Config: Config{
+					Script: []string{"mkdir a", "mkdir b"},
+				},
+			},
+			want: []string{"mkdir a", "mkdir b"},
+		},
+		{
+			name: "script stop",
+			fields: fields{
+				Config: Config{
+					Script:     []string{"mkdir a", "mkdir b"},
+					ScriptStop: true,
+				},
+			},
+			want: []string{"mkdir a", "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;", "mkdir b", "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;"},
+		},
+		{
+			name: "normal testing 2",
+			fields: fields{
+				Config: Config{
+					Script:     []string{"mkdir a\nmkdir c", "mkdir b"},
+					ScriptStop: true,
+				},
+			},
+			want: []string{"mkdir a", "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;", "mkdir c", "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;", "mkdir b", "DRONE_SSH_PREV_COMMAND_EXIT_CODE=$? ; if [ $DRONE_SSH_PREV_COMMAND_EXIT_CODE -ne 0 ]; then exit $DRONE_SSH_PREV_COMMAND_EXIT_CODE; fi;"},
+		},
+		{
+			name: "trim space",
+			fields: fields{
+				Config: Config{
+					Script:     []string{"mkdir a", "mkdir b", "\t", " "},
+					ScriptStop: false,
+				},
+			},
+			want: []string{"mkdir a", "mkdir b"},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			p := Plugin{
+				Config: tt.fields.Config,
+				Writer: tt.fields.Writer,
+			}
+			if got := p.scriptCommands(); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("Plugin.scriptCommands() = %#v, want %#v", got, tt.want)
+			}
+		})
+	}
+}
Author	SHA1	Message	Date
Bo-Yi Wu	8d0b62974a	chore: update default timeout to 10 minutes	2019-11-30 22:40:13 +08:00
Bo-Yi Wu	9b57f85e47	chore(cmd): trim space in command Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2019-11-21 09:13:04 +08:00
Bo-Yi Wu	648e3c1321	chore: support split from string text (#148 )	2019-11-21 09:05:32 +08:00
Bo-Yi Wu	9ef0a47bc0	chore: add single command for github actions.	2019-11-21 00:44:00 +08:00
Bo-Yi Wu	530cb1df6e	docs: update diff format	2019-10-18 22:37:47 +08:00
Bo-Yi Wu	414ebba911	chore: udpate success message	2019-09-29 12:47:36 +08:00
Bo-Yi Wu	ff6e63366c	docs: add example for stoping script stoping script after first failure fix: https://github.com/appleboy/drone-ssh/issues/143	2019-09-29 12:32:38 +08:00
Bo-Yi Wu	553894abe6	docs: update drone document fix: https://github.com/appleboy/drone-ssh/issues/144 fix: https://github.com/appleboy/drone-ssh/issues/146	2019-09-29 12:29:29 +08:00
Bo-Yi Wu	79584d6cfa	docs: update envs usage,	2019-09-29 11:21:15 +08:00
Bo-Yi Wu	cacb93d984	chore: support github actions input variable.	2019-09-29 10:26:21 +08:00
Bo-Yi Wu	160519dca6	chore: upgrade go module	2019-09-29 10:18:15 +08:00
Bo-Yi Wu	b8149fe18c	chore: remove microbadger	2019-09-29 10:17:23 +08:00
Bo-Yi Wu	5e47c61788	chore: upgrade to go1.13	2019-09-29 10:12:57 +08:00
Bo-Yi Wu	bd8532afdc	docs: update markdown format	2019-08-04 07:04:52 +08:00