feat: refactor code for parallel execution on multiple hosts (#249 )

- Add `trimValues` function for cleaning up slice values - Remove unused `wg.Done()` call - Modify `Exec` function to launch goroutines for each host in `Config.Host` - Add test for `ScriptStop` with multiple hosts and sync mode refer to: https://github.com/appleboy/ssh-action/issues/233
chore: remove Hadolint configuration file
2026-06-16 14:49:25 +08:00 · 2023-04-04 16:56:50 +08:00 · 2023-04-04 15:39:10 +08:00 · 2023-04-04 15:38:42 +08:00 · 2023-03-29 08:59:31 +08:00 · 2023-03-28 14:43:00 +08:00
14 changed files with 206 additions and 91 deletions
@@ -1,24 +0,0 @@
-name: Release Binary
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - 'v*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: techknowlogick/xgo:go-1.19.x
-    steps:
-
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      # - name: Release binary
-      #   run: |
-      #     ls -al
-      #     make release
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
        with:
          go-version: '^1'
      - name: Checkout repository
@@ -19,7 +19,7 @@ jobs:
          fetch-depth: 0
      -
        name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
        with:
          go-version: '^1'

@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
        with:
          go-version: '^1'
      - name: Checkout repository
@@ -0,0 +1,84 @@
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+- env:
+  - CGO_ENABLED=0
+  goos:
+  - darwin
+  - linux
+  - windows
+  - freebsd
+  goarch:
+  - amd64
+  - arm
+  - arm64
+  goarm:
+  - "5"
+  - "6"
+  - "7"
+  ignore:
+    - goos: darwin
+      goarch: arm
+    - goos: darwin
+      goarch: ppc64le
+    - goos: darwin
+      goarch: s390x
+    - goos: windows
+      goarch: ppc64le
+    - goos: windows
+      goarch: s390x
+    - goos: windows
+      goarch: arm
+      goarm: "5"
+    - goos: windows
+      goarch: arm
+      goarm: "6"
+    - goos: windows
+      goarch: arm
+      goarm: "7"
+    - goos: windows
+      goarch: arm64
+    - goos: freebsd
+      goarch: ppc64le
+    - goos: freebsd
+      goarch: s390x
+    - goos: freebsd
+      goarch: arm
+      goarm: "5"
+    - goos: freebsd
+      goarch: arm
+      goarm: "6"
+    - goos: freebsd
+      goarch: arm
+      goarm: "7"
+    - goos: freebsd
+      goarch: arm64
+  flags:
+  - -trimpath
+  ldflags:
+  - -s -w
+  - -X main.Version={{.Version}}
+  binary: >-
+    {{ .ProjectName }}-
+    {{- if .IsSnapshot }}{{ .Branch }}-
+    {{- else }}{{- .Version }}-{{ end }}
+    {{- .Os }}-
+    {{- if eq .Arch "amd64" }}amd64
+    {{- else if eq .Arch "amd64_v1" }}amd64
+    {{- else if eq .Arch "386" }}386
+    {{- else }}{{ .Arch }}{{ end }}
+    {{- if .Arm }}-{{ .Arm }}{{ end }}
+  no_unique_dist_dir: true
+
+archives:
+  - format: binary
+    name_template: "{{ .Binary }}"
+    allow_different_binary_count: true
+
+checksum:
+  name_template: 'checksums.txt'
+
+snapshot:
+  name_template: "{{ incpatch .Version }}"
@@ -1,2 +0,0 @@
-ignored:
-  - DL3018
@@ -5,14 +5,14 @@ author: appleboy
 tags: [ deploy, publish, ssh ]
 repo: appleboy/drone-ssh
 logo: term.svg
-image: appleboy/drone-ssh
+image: ghcr.io/appleboy/drone-ssh
 ---

 Use the SSH plugin to execute commands on a remote server. The below pipeline configuration demonstrates simple usage:

 ```yaml
 - name: ssh commands
-  image: appleboy/drone-ssh
+  image: ghcr.io/appleboy/drone-ssh
  settings:
    host: foo.com
    username: root
@@ -27,7 +27,7 @@ Example configuration in your `.drone.yml` file for multiple hosts:

 ```diff
  - name: ssh commands
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    settings:
      host:
 +       - foo.com
@@ -44,7 +44,7 @@ Example configuration for multiple hosts with different port:

 ```diff
  - name: ssh commands
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    settings:
      host:
 +       - foo.com:1234
@@ -61,7 +61,7 @@ Example configuration for command timeout, default value is 60 seconds:

 ```diff
  - name: ssh commands
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    settings:
      host: foo.com
      username: root
@@ -77,7 +77,7 @@ Example configuration for execute commands on a remote server using ｀SSHProxyC

 ```diff
  - name: ssh commands
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    settings:
      host: foo.com
      username: root
@@ -96,7 +96,7 @@ Example configuration using password from secrets:

 ```diff
  - name: ssh commands
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    settings:
      host: foo.com
      username: root
@@ -112,7 +112,7 @@ Example configuration using ssh key from secrets:

 ```diff
  - name: ssh commands
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    settings:
      host: foo.com
      username: root
@@ -128,7 +128,7 @@ Example configuration for exporting custom secrets:

 ```diff
  - name: ssh commands
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    environment:
      commit: ${DRONE_BUILD_NUMBER}
    settings:
@@ -148,7 +148,7 @@ Example configuration for stoping script after first failure:

 ```diff
  - name: ssh commands
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    settings:
      host: foo.com
      username: root
@@ -164,7 +164,7 @@ Example configuration for passphrase which protecting a private key:

 ```diff
  - name: ssh commands
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    settings:
      host: foo.com
      username: root
@@ -23,7 +23,7 @@ information and a listing of the available options please take a look at [the do
 ```diff
 pipeline:
  scp:
-    image: appleboy/drone-scp
+    image: ghcr.io/appleboy/drone-ssh
    settings:
      host:
        - example1.com
@@ -49,7 +49,7 @@ 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 install github.com/appleboy/drone-ssh@latest
 ```

 or build the binary with the following command:
@@ -85,7 +85,7 @@ docker run --rm \
  -e PLUGIN_SCRIPT=whoami \
  -v $(pwd):$(pwd) \
  -w $(pwd) \
-  appleboy/drone-ssh
+  ghcr.io/appleboy/drone-ssh
 ```

 ## Mount key from file path
@@ -99,7 +99,7 @@ Mount private key in `volumes` setting of `.drone.yml` config
 ```diff
 pipeline:
  ssh:
-    image: appleboy/drone-ssh
+    image: ghcr.io/appleboy/drone-ssh
    host: xxxxx.com
    username: deploy
 +   volumes:
@@ -118,8 +118,7 @@ See [DOCS.md](./DOCS.md) for examples and full configuration options
 Configuration options are loaded from multiple sources:

 0. Hardcoded drone-ssh defaults.  See [main.go CLI Flags](https://github.com/appleboy/drone-ssh/blob/6d9d6acc6aef1f9166118c6ba8bd214d3a582bdb/main.go#L39) for more information.
-1. From a `.env` [dotenv](https://github.com/joho/godotenv) file at the root of the repository tested by drone.
-2. From a dotenv file at a path specified by the `PLUGIN_ENV_FILE` environment variable.
-3. From your `.drone.yml` Drone configuration.
+1. From a dotenv file at a path specified by the `PLUGIN_ENV_FILE` environment variable.
+2. From your `.drone.yml` Drone configuration.

 Later sources override previous sources, i.e. if `PORT` is set in an `.env` file committed in the repository or created by previous test steps, it will override the default set `main.go`.
@@ -8,7 +8,11 @@ LABEL maintainer="Bo-Yi Wu <appleboy.tw@gmail.com>" \
  org.label-schema.vendor="Bo-Yi Wu" \
  org.label-schema.schema-version="1.0"

-RUN apk add --no-cache ca-certificates && \
+LABEL org.opencontainers.image.source=https://github.com/appleboy/drone-ssh
+LABEL org.opencontainers.image.description="Execute commands on a remote host through SSH"
+LABEL org.opencontainers.image.licenses=MIT
+
+RUN apk add --no-cache ca-certificates=20220614-r4 && \
  rm -rf /var/cache/apk/*

 COPY release/${TARGETOS}/${TARGETARCH}/drone-ssh /bin/
@@ -6,8 +6,8 @@ require (
 	github.com/appleboy/easyssh-proxy v1.3.9
 	github.com/joho/godotenv v1.5.1
 	github.com/stretchr/testify v1.8.1
-	github.com/urfave/cli/v2 v2.24.4
-	golang.org/x/crypto v0.6.0
+	github.com/urfave/cli/v2 v2.25.1
+	golang.org/x/crypto v0.7.0
 )

 require (
@@ -18,6 +18,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
@@ -25,24 +25,24 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/urfave/cli/v2 v2.24.4 h1:0gyJJEBYtCV87zI/x2nZCPyDxD51K6xM8SkwjHFCNEU=
-github.com/urfave/cli/v2 v2.24.4/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
+github.com/urfave/cli/v2 v2.25.1 h1:zw8dSP7ghX0Gmm8vugrs6q9Ku0wzweqPyshy+syu9Gw=
+github.com/urfave/cli/v2 v2.25.1/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 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=
@@ -7,7 +7,6 @@ import (

 	"github.com/appleboy/easyssh-proxy"
 	"github.com/joho/godotenv"
-	_ "github.com/joho/godotenv/autoload"
 	"github.com/urfave/cli/v2"
 )

@@ -65,6 +65,7 @@ func (p Plugin) hostPort(host string) (string, string) {
 }

 func (p Plugin) exec(host string, wg *sync.WaitGroup, errChannel chan error) {
+	defer wg.Done()
 	host, port := p.hostPort(host)
 	// Create MakeConfig instance with remote username, server address and path to private key.
 	ssh := &easyssh.MakeConfig{
@@ -117,38 +118,36 @@ func (p Plugin) exec(host string, wg *sync.WaitGroup, errChannel chan error) {
 	stdoutChan, stderrChan, doneChan, errChan, err := ssh.Stream(strings.Join(p.Config.Script, "\n"), p.Config.CommandTimeout)
 	if err != nil {
 		errChannel <- err
-	} else {
-		// read from the output channel until the done signal is passed
-		isTimeout := true
-	loop:
-		for {
-			select {
-			case isTimeout = <-doneChan:
-				break loop
-			case outline := <-stdoutChan:
-				if outline != "" {
-					p.log(host, "out:", outline)
-				}
-			case errline := <-stderrChan:
-				if errline != "" {
-					p.log(host, "err:", errline)
-				}
-			case err = <-errChan:
+		return
+	}
+	// read from the output channel until the done signal is passed
+	isTimeout := true
+loop:
+	for {
+		select {
+		case isTimeout = <-doneChan:
+			break loop
+		case outline := <-stdoutChan:
+			if outline != "" {
+				p.log(host, "out:", outline)
 			}
-		}
-
-		// get exit code or command error.
-		if err != nil {
-			errChannel <- err
-		}
-
-		// command time out
-		if !isTimeout {
-			errChannel <- errCommandTimeOut
+		case errline := <-stderrChan:
+			if errline != "" {
+				p.log(host, "err:", errline)
+			}
+		case err = <-errChan:
 		}
 	}

-	wg.Done()
+	// get exit code or command error.
+	if err != nil {
+		errChannel <- err
+	}
+
+	// command time out
+	if !isTimeout {
+		errChannel <- errCommandTimeOut
+	}
 }

 func (p Plugin) log(host string, message ...interface{}) {
@@ -164,6 +163,8 @@ func (p Plugin) log(host string, message ...interface{}) {

 // Exec executes the plugin.
 func (p Plugin) Exec() error {
+	p.Config.Host = trimValues(p.Config.Host)
+
 	if len(p.Config.Host) == 0 {
 		return errMissingHost
 	}
@@ -176,10 +177,14 @@ func (p Plugin) Exec() error {
 	wg.Add(len(p.Config.Host))
 	errChannel := make(chan error)
 	finished := make(chan struct{})
-	for _, host := range p.Config.Host {
-		if p.Config.Sync {
-			p.exec(host, &wg, errChannel)
-		} else {
+	if p.Config.Sync {
+		go func() {
+			for _, host := range p.Config.Host {
+				p.exec(host, &wg, errChannel)
+			}
+		}()
+	} else {
+		for _, host := range p.Config.Host {
 			go p.exec(host, &wg, errChannel)
 		}
 	}
@@ -230,3 +235,18 @@ func (p Plugin) scriptCommands() []string {

 	return commands
 }
+
+func trimValues(keys []string) []string {
+	var newKeys []string
+
+	for _, value := range keys {
+		value = strings.TrimSpace(value)
+		if len(value) == 0 {
+			continue
+		}
+
+		newKeys = append(newKeys, value)
+	}
+
+	return newKeys
+}
@@ -440,6 +440,41 @@ func TestFingerprint(t *testing.T) {
 	assert.Equal(t, unindent(expected), unindent(buffer.String()))
 }

+func TestScriptStopWithMultipleHostAndSyncMode(t *testing.T) {
+	var (
+		buffer   bytes.Buffer
+		expected = `
+			======CMD======
+			mkdir a/b/c
+			mkdir d/e/f
+			======END======
+			err: mkdir: can't create directory 'a/b/c': No such file or directory
+		`
+	)
+
+	plugin := Plugin{
+		Config: Config{
+			Host:     []string{"", "localhost"},
+			Username: "drone-scp",
+			Port:     22,
+			KeyPath:  "./tests/.ssh/id_rsa",
+			Script: []string{
+				"mkdir a/b/c",
+				"mkdir d/e/f",
+			},
+			CommandTimeout: 10 * time.Second,
+			ScriptStop:     true,
+			Sync:           true,
+		},
+		Writer: &buffer,
+	}
+
+	err := plugin.Exec()
+	assert.NotNil(t, err)
+
+	assert.Equal(t, unindent(expected), unindent(buffer.String()))
+}
+
 func TestScriptStop(t *testing.T) {
 	var (
 		buffer   bytes.Buffer
Author	SHA1	Message	Date
Bo-Yi Wu	a8d30dc133	feat: refactor code for parallel execution on multiple hosts (#249 ) - Add `trimValues` function for cleaning up slice values - Remove unused `wg.Done()` call - Modify `Exec` function to launch goroutines for each host in `Config.Host` - Add test for `ScriptStop` with multiple hosts and sync mode refer to: https://github.com/appleboy/ssh-action/issues/233	2023-04-04 16:56:50 +08:00
Bo-Yi.Wu	f733bb5ebf	chore: remove Hadolint configuration file - Delete the `.hadolint.yaml` file. Signed-off-by: Bo-Yi.Wu <appleboy.tw@gmail.com>	2023-04-04 15:39:10 +08:00
Bo-Yi.Wu	b0ddeb9413	chore: update container security measures - Add Open Container Initiative labels for image source, description, and licenses - Update `apk` command to include specific version of `ca-certificates` Signed-off-by: Bo-Yi.Wu <appleboy.tw@gmail.com>	2023-04-04 15:38:42 +08:00
Bo-Yi Wu	8c5d17d83d	chore: refactor release process to use main.Version flag - Change the `drone-ssh` version flag to `main.Version` in `.goreleaser.yaml` Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2023-03-29 08:59:31 +08:00
Bo-Yi Wu	050e0e6efd	docs: use ghcr.io/appleboy/drone-ssh image for SSH connections - Update the `image` field to use `ghcr.io/appleboy/drone-ssh` in DOCS.md - Update the `image` field to use `ghcr.io/appleboy/drone-ssh` in README.md Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2023-03-28 14:43:00 +08:00
Bo-Yi Wu	f01d5d9454	chore(deps): update go.sum	2023-03-28 14:23:20 +08:00
Bo-Yi.Wu	c004469746	ci: upgrade setup-go action and remove release binary action - Remove release binary github action - Upgrade setup-go action from v3 to v4 in docker, goreleaser, and lint github actions Signed-off-by: Bo-Yi.Wu <appleboy.tw@gmail.com>	2023-03-27 22:02:48 +08:00
Bo-Yi.Wu	bc2dac669a	chore: refactor installation command for `drone-ssh` using `go install` - Update `drone-ssh` installation command to use `go install` instead of `go get` Signed-off-by: Bo-Yi.Wu <appleboy.tw@gmail.com>	2023-03-27 22:01:11 +08:00
Albert Wang	541508632d	chore: remove dotenv autoloading (#243 )	2023-03-27 21:56:04 +08:00
Bo-Yi.Wu	22cd751b47	chore: update third-party libraries for improved security and performance - Update urfave/cli to version 2.25.1 - Update golang.org/x/crypto to version 0.7.0 - Update golang.org/x/sys to version 0.6.0 (indirect) Signed-off-by: Bo-Yi.Wu <appleboy.tw@gmail.com>	2023-03-27 21:52:44 +08:00
Bo-Yi.Wu	5a6a923356	build: configure cross-platform builds with Goreleaser - Add a new file `.goreleaser.yaml` - Configure builds for multiple operating systems and architectures - Set flags and ldflags for the builds - Add a binary name template for the builds - Add an archive format - Add a checksum template - Add a snapshot template Signed-off-by: Bo-Yi.Wu <appleboy.tw@gmail.com>	2023-03-27 21:51:52 +08:00