refactor: modernize linting and refactor code for consistency and clarity

- Update golangci-lint configuration to use a more modern format, revise enabled linters and add formatter settings
- Split environment variable lists in main.go into multiple lines for better readability
- Refactor function signatures for consistency in repo/key.go and repo/remote.go

Signed-off-by: appleboy <appleboy.tw@gmail.com>

Author: appleboy

.golangci.yml

@@ -1,41 +1,63 @@
-run:
-  timeout: 5m
+version: "2"
 linters:
+  default: none
   enable:
-    - asciicheck
+    - bodyclose
     - dogsled
-    - durationcheck
+    - dupl
     - errcheck
-    - errorlint
-    - exportloopref
-    - gci
-    - gofmt
-    - goimports
+    - exhaustive
+    - goconst
+    - gocritic
+    - gocyclo
+    - goprintffuncname
     - gosec
+    - govet
+    - ineffassign
     - misspell
     - nakedret
-    - nilerr
-    - perfsprint
-    - revive
-    - testifylint
-    - usestdlibvars
-    - wastedassign
+    - noctx
+    - nolintlint
+    - rowserrcheck
+    - staticcheck
+    - unconvert
+    - unparam
+    - unused
+    - whitespace
+    - copyloopvar
+    - predeclared
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - internal/mocks
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+    - golines
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 
-linters-settings:
-  gosec:
-    # To select a subset of rules to run.
-    # Available rules: https://github.com/securego/gosec#available-rules
-    # Default: [] - means include all rules
-    includes: []
-    # To exclude a subset of rules from running.
-    # Default: [] - means exclude no rules
-    excludes:
-      - G402
-  perfsprint:
-    err-error: true
-    errorf: true
-    int-conversion: true
-    sprintf1: true
-    strconcat: true
-  testifylint:
-    enable-all: true
+  settings:
+    gofmt:
+      simplify: true
+    gofumpt:
+      # Module path which contains the source code being formatted.
+      # Default: ""
+      module-path: github/appleboy/drone-git-push
+      # Choose whether to use the extra rules.
+      # Default: false
+      extra-rules: true

main.go

@@ -34,14 +34,24 @@ func main() {
 	app.Version = Version
 	app.Flags = []cli.Flag{
 		&cli.StringFlag{
-			Name:    "commit.author.name",
-			Usage:   "git author name",
-			EnvVars: []string{"PLUGIN_AUTHOR_NAME", "DRONE_COMMIT_AUTHOR", "CI_COMMIT_AUTHOR", "INPUT_AUTHOR_NAME"},
+			Name:  "commit.author.name",
+			Usage: "git author name",
+			EnvVars: []string{
+				"PLUGIN_AUTHOR_NAME",
+				"DRONE_COMMIT_AUTHOR",
+				"CI_COMMIT_AUTHOR",
+				"INPUT_AUTHOR_NAME",
+			},
 		},
 		&cli.StringFlag{
-			Name:    "commit.author.email",
-			Usage:   "git author email",
-			EnvVars: []string{"PLUGIN_AUTHOR_EMAIL", "DRONE_COMMIT_AUTHOR_EMAIL", "CI_COMMIT_AUTHOR_EMAIL", "INPUT_AUTHOR_EMAIL"},
+			Name:  "commit.author.email",
+			Usage: "git author email",
+			EnvVars: []string{
+				"PLUGIN_AUTHOR_EMAIL",
+				"DRONE_COMMIT_AUTHOR_EMAIL",
+				"CI_COMMIT_AUTHOR_EMAIL",
+				"INPUT_AUTHOR_EMAIL",
+			},
 		},
 
 		&cli.StringFlag{
@@ -50,14 +60,24 @@ func main() {
 			EnvVars: []string{"PLUGIN_NETRC_MACHINE", "DRONE_NETRC_MACHINE", "INPUT_NETRC_MACHINE"},
 		},
 		&cli.StringFlag{
-			Name:    "netrc.username",
-			Usage:   "netrc username",
-			EnvVars: []string{"PLUGIN_USERNAME", "DRONE_NETRC_USERNAME", "GITHUB_USERNAME", "INPUT_USERNAME"},
+			Name:  "netrc.username",
+			Usage: "netrc username",
+			EnvVars: []string{
+				"PLUGIN_USERNAME",
+				"DRONE_NETRC_USERNAME",
+				"GITHUB_USERNAME",
+				"INPUT_USERNAME",
+			},
 		},
 		&cli.StringFlag{
-			Name:    "netrc.password",
-			Usage:   "netrc password",
-			EnvVars: []string{"PLUGIN_PASSWORD", "DRONE_NETRC_PASSWORD", "GITHUB_PASSWORD", "INPUT_PASSWORD"},
+			Name:  "netrc.password",
+			Usage: "netrc password",
+			EnvVars: []string{
+				"PLUGIN_PASSWORD",
+				"DRONE_NETRC_PASSWORD",
+				"GITHUB_PASSWORD",
+				"INPUT_PASSWORD",
+			},
 		},
 		&cli.StringFlag{
 			Name:    "ssh-key",
@@ -113,9 +133,13 @@ func main() {
 			EnvVars: []string{"PLUGIN_COMMIT", "GIT_PUSH_COMMIT", "INPUT_COMMIT"},
 		},
 		&cli.StringFlag{
-			Name:    "commit-message",
-			Usage:   "commit message",
-			EnvVars: []string{"PLUGIN_COMMIT_MESSAGE", "GIT_PUSH_COMMIT_MESSAGE", "INPUT_COMMIT_MESSAGE"},
+			Name:  "commit-message",
+			Usage: "commit message",
+			EnvVars: []string{
+				"PLUGIN_COMMIT_MESSAGE",
+				"GIT_PUSH_COMMIT_MESSAGE",
+				"INPUT_COMMIT_MESSAGE",
+			},
 		},
 		&cli.StringFlag{
 			Name:    "tag",

repo/key.go

@@ -83,7 +83,7 @@ func WriteNetrc(machine, login, password string) error {
 }
 
 // WriteToken authenticate with Git hosting using a token.
-func WriteToken(remote string, login, password string) (string, error) {
+func WriteToken(remote, login, password string) (string, error) {
 	if remote == "" || login == "" || password == "" {
 		return remote, nil
 	}

repo/remote.go

@@ -29,7 +29,7 @@ func RemoteAdd(name, url string) *exec.Cmd {
 }
 
 // RemotePush pushs the changes from the local head to a remote branch..
-func RemotePush(remote, branch string, force bool, followtags bool) *exec.Cmd {
+func RemotePush(remote, branch string, force, followtags bool) *exec.Cmd {
 	return RemotePushNamedBranch(remote, "HEAD", branch, force, followtags)
 }
 
@@ -58,7 +58,7 @@ func isValidInput(input string) bool {
 }
 
 // RemotePushNamedBranch puchs changes from a local to a remote branch.
-func RemotePushNamedBranch(remote, localbranch string, branch string, force bool, followtags bool) *exec.Cmd {
+func RemotePushNamedBranch(remote, localbranch, branch string, force, followtags bool) *exec.Cmd {
 	sanitizedRemote := sanitizeInput(remote)
 	sanitizedLocalBranch := sanitizeInput(localbranch)
 	sanitizedBranch := sanitizeInput(branch)