From 188b9e6eb58431549b1d4cdc2a117150936fbb20 Mon Sep 17 00:00:00 2001 From: Anbraten Date: Tue, 21 Sep 2021 16:36:41 +0200 Subject: [PATCH] Refactor cli (#329) - move cli files from `cli/drone` to `cli/` - move cli main to `cmd/cli/main.go` to match agent and server - use version from `version/version.go` to match agent and server --- .gitignore | 2 +- Makefile | 20 ++++---- cli/.drone.yml | 57 ----------------------- cli/README.md | 6 ++- cli/{drone => }/build/build.go | 0 cli/{drone => }/build/build_approve.go | 2 +- cli/{drone => }/build/build_decline.go | 2 +- cli/{drone => }/build/build_info.go | 2 +- cli/{drone => }/build/build_kill.go | 2 +- cli/{drone => }/build/build_last.go | 2 +- cli/{drone => }/build/build_list.go | 2 +- cli/{drone => }/build/build_logs.go | 0 cli/{drone => }/build/build_ps.go | 2 +- cli/{drone => }/build/build_queue.go | 2 +- cli/{drone => }/build/build_start.go | 2 +- cli/{drone => }/build/build_stop.go | 2 +- cli/{drone => }/deploy/deploy.go | 2 +- cli/{drone => }/exec/exec.go | 0 cli/{drone => }/exec/line.go | 0 cli/{drone => }/info/info.go | 2 +- cli/{drone => }/internal/util.go | 0 cli/{drone => }/internal/util_test.go | 0 cli/{drone => }/log/log.go | 0 cli/{drone => }/log/log_purge.go | 2 +- cli/{drone => }/registry/registry.go | 0 cli/{drone => }/registry/registry_add.go | 2 +- cli/{drone => }/registry/registry_info.go | 2 +- cli/{drone => }/registry/registry_list.go | 2 +- cli/{drone => }/registry/registry_rm.go | 2 +- cli/{drone => }/registry/registry_set.go | 2 +- cli/{drone => }/repo/repo.go | 0 cli/{drone => }/repo/repo_add.go | 2 +- cli/{drone => }/repo/repo_chown.go | 2 +- cli/{drone => }/repo/repo_info.go | 2 +- cli/{drone => }/repo/repo_list.go | 2 +- cli/{drone => }/repo/repo_repair.go | 2 +- cli/{drone => }/repo/repo_rm.go | 2 +- cli/{drone => }/repo/repo_sync.go | 2 +- cli/{drone => }/repo/repo_update.go | 2 +- cli/{drone => }/secret/secret.go | 0 cli/{drone => }/secret/secret_add.go | 2 +- cli/{drone => }/secret/secret_info.go | 2 +- cli/{drone => }/secret/secret_list.go | 2 +- cli/{drone => }/secret/secret_rm.go | 2 +- cli/{drone => }/secret/secret_set.go | 2 +- cli/{drone => }/user/user.go | 0 cli/{drone => }/user/user_add.go | 2 +- cli/{drone => }/user/user_info.go | 2 +- cli/{drone => }/user/user_list.go | 2 +- cli/{drone => }/user/user_rm.go | 2 +- {cli/drone => cmd/cli}/main.go | 38 +++++++-------- 51 files changed, 69 insertions(+), 124 deletions(-) delete mode 100644 cli/.drone.yml rename cli/{drone => }/build/build.go (100%) rename cli/{drone => }/build/build_approve.go (92%) rename cli/{drone => }/build/build_decline.go (92%) rename cli/{drone => }/build/build_info.go (95%) rename cli/{drone => }/build/build_kill.go (92%) rename cli/{drone => }/build/build_last.go (93%) rename cli/{drone => }/build/build_list.go (96%) rename cli/{drone => }/build/build_logs.go (100%) rename cli/{drone => }/build/build_ps.go (96%) rename cli/{drone => }/build/build_queue.go (94%) rename cli/{drone => }/build/build_start.go (95%) rename cli/{drone => }/build/build_stop.go (92%) rename cli/{drone => }/deploy/deploy.go (97%) rename cli/{drone => }/exec/exec.go (100%) rename cli/{drone => }/exec/line.go (100%) rename cli/{drone => }/info/info.go (93%) rename cli/{drone => }/internal/util.go (100%) rename cli/{drone => }/internal/util_test.go (100%) rename cli/{drone => }/log/log.go (100%) rename cli/{drone => }/log/log_purge.go (92%) rename cli/{drone => }/registry/registry.go (100%) rename cli/{drone => }/registry/registry_add.go (96%) rename cli/{drone => }/registry/registry_info.go (95%) rename cli/{drone => }/registry/registry_list.go (95%) rename cli/{drone => }/registry/registry_rm.go (93%) rename cli/{drone => }/registry/registry_set.go (96%) rename cli/{drone => }/repo/repo.go (100%) rename cli/{drone => }/repo/repo_add.go (90%) rename cli/{drone => }/repo/repo_chown.go (91%) rename cli/{drone => }/repo/repo_info.go (94%) rename cli/{drone => }/repo/repo_list.go (94%) rename cli/{drone => }/repo/repo_repair.go (88%) rename cli/{drone => }/repo/repo_rm.go (90%) rename cli/{drone => }/repo/repo_sync.go (93%) rename cli/{drone => }/repo/repo_update.go (97%) rename cli/{drone => }/secret/secret.go (100%) rename cli/{drone => }/secret/secret_add.go (96%) rename cli/{drone => }/secret/secret_info.go (95%) rename cli/{drone => }/secret/secret_list.go (95%) rename cli/{drone => }/secret/secret_rm.go (92%) rename cli/{drone => }/secret/secret_set.go (96%) rename cli/{drone => }/user/user.go (100%) rename cli/{drone => }/user/user_add.go (90%) rename cli/{drone => }/user/user_info.go (93%) rename cli/{drone => }/user/user_list.go (92%) rename cli/{drone => }/user/user_rm.go (88%) rename {cli/drone => cmd/cli}/main.go (64%) diff --git a/.gitignore b/.gitignore index b1b3e900f..fb09e2eb0 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,7 @@ docker-compose.yml /.env extras/ release/ -build/ +/build/ cli/release/ server/swagger/files/*.json diff --git a/Makefile b/Makefile index 773f3cbae..90c71ba22 100644 --- a/Makefile +++ b/Makefile @@ -74,17 +74,17 @@ release-cli: # disable CGO for cross-compiling export CGO_ENABLED=0 # compile for all architectures - GOOS=linux GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/amd64/woodpecker github.com/woodpecker-ci/woodpecker/cli/drone - GOOS=linux GOARCH=arm64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm64/woodpecker github.com/woodpecker-ci/woodpecker/cli/drone - GOOS=linux GOARCH=arm go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/linux/arm/woodpecker github.com/woodpecker-ci/woodpecker/cli/drone - GOOS=windows GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/windows/amd64/woodpecker github.com/woodpecker-ci/woodpecker/cli/drone - GOOS=darwin GOARCH=amd64 go build -ldflags "-X main.version=${DRONE_TAG##v}" -o cli/release/darwin/amd64/woodpecker github.com/woodpecker-ci/woodpecker/cli/drone + GOOS=linux GOARCH=amd64 go build -ldflags '${LDFLAGS}' -o cli/release/linux/amd64/woodpecker-cli github.com/woodpecker-ci/woodpecker/cmd/cli + GOOS=linux GOARCH=arm64 go build -ldflags '${LDFLAGS}' -o cli/release/linux/arm64/woodpecker-cli github.com/woodpecker-ci/woodpecker/cmd/cli + GOOS=linux GOARCH=arm go build -ldflags '${LDFLAGS}' -o cli/release/linux/arm/woodpecker-cli github.com/woodpecker-ci/woodpecker/cmd/cli + GOOS=windows GOARCH=amd64 go build -ldflags '${LDFLAGS}' -o cli/release/windows/amd64/woodpecker-cli github.com/woodpecker-ci/woodpecker/cmd/cli + GOOS=darwin GOARCH=amd64 go build -ldflags '${LDFLAGS}' -o cli/release/darwin/amd64/woodpecker-cli github.com/woodpecker-ci/woodpecker/cmd/cli # tar binary files prior to upload - tar -cvzf cli/release/woodpecker_linux_amd64.tar.gz -C cli/release/linux/amd64 woodpecker - tar -cvzf cli/release/woodpecker_linux_arm64.tar.gz -C cli/release/linux/arm64 woodpecker - tar -cvzf cli/release/woodpecker_linux_arm.tar.gz -C cli/release/linux/arm woodpecker - tar -cvzf cli/release/woodpecker_windows_amd64.tar.gz -C cli/release/windows/amd64 woodpecker - tar -cvzf cli/release/woodpecker_darwin_amd64.tar.gz -C cli/release/darwin/amd64 woodpecker + tar -cvzf cli/release/woodpecker_linux_amd64.tar.gz -C cli/release/linux/amd64 woodpecker-cli + tar -cvzf cli/release/woodpecker_linux_arm64.tar.gz -C cli/release/linux/arm64 woodpecker-cli + tar -cvzf cli/release/woodpecker_linux_arm.tar.gz -C cli/release/linux/arm woodpecker-cli + tar -cvzf cli/release/woodpecker_windows_amd64.tar.gz -C cli/release/windows/amd64 woodpecker-cli + tar -cvzf cli/release/woodpecker_darwin_amd64.tar.gz -C cli/release/darwin/amd64 woodpecker-cli # generate shas for tar files sha256sum cli/release/*.tar.gz > cli/release/woodpecker_checksums.txt diff --git a/cli/.drone.yml b/cli/.drone.yml deleted file mode 100644 index 4bda077bc..000000000 --- a/cli/.drone.yml +++ /dev/null @@ -1,57 +0,0 @@ -workspace: - base: /go - path: src/github.com/drone/drone-cli - -pipeline: - build: - image: golang:1.9 - commands: sh .drone.sh - - publish_latest: - image: plugins/docker - repo: drone/cli - secrets: [docker_username, docker_password] - auto_tag: true - when: - event: [push, tag] - - publish_alpine: - image: plugins/docker - repo: drone/cli - secrets: [docker_username, docker_password] - auto_tag: true - auto_tag_suffix: alpine - dockerfile: Dockerfile.alpine - when: - event: [push, tag] - - publish_linux_arm: - image: plugins/docker - repo: drone/cli - secrets: [docker_username, docker_password] - auto_tag: true - auto_tag_suffix: linux-arm - dockerfile: Dockerfile.linux.arm - when: - event: [push, tag] - - publish_linux_arm64: - image: plugins/docker - repo: drone/cli - secrets: [docker_username, docker_password] - auto_tag: true - auto_tag_suffix: linux-arm64 - dockerfile: Dockerfile.linux.arm64 - when: - event: [push, tag] - - release: - image: plugins/github-release - files: - - release/woodpecker_*.tar.gz - - release/woodpecker_checksums.txt - secrets: - - source: github_token - target: github_release_api_key - when: - event: tag diff --git a/cli/README.md b/cli/README.md index 46cb15612..1e9b629ed 100644 --- a/cli/README.md +++ b/cli/README.md @@ -1 +1,5 @@ -Command line client for the Drone continuous integration server. Please see the official documentation at http://docs.drone.io/cli-installation/ +# Woodpecker CLI + +Command line client for the Woodpecker continuous integration server. + +Please see the official documentation at https://woodpecker-ci.github.io/docs/cli diff --git a/cli/drone/build/build.go b/cli/build/build.go similarity index 100% rename from cli/drone/build/build.go rename to cli/build/build.go diff --git a/cli/drone/build/build_approve.go b/cli/build/build_approve.go similarity index 92% rename from cli/drone/build/build_approve.go rename to cli/build/build_approve.go index 9c0c4081a..505f10cf7 100644 --- a/cli/drone/build/build_approve.go +++ b/cli/build/build_approve.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildApproveCmd = cli.Command{ diff --git a/cli/drone/build/build_decline.go b/cli/build/build_decline.go similarity index 92% rename from cli/drone/build/build_decline.go rename to cli/build/build_decline.go index da9ac36bb..9ff0be443 100644 --- a/cli/drone/build/build_decline.go +++ b/cli/build/build_decline.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildDeclineCmd = cli.Command{ diff --git a/cli/drone/build/build_info.go b/cli/build/build_info.go similarity index 95% rename from cli/drone/build/build_info.go rename to cli/build/build_info.go index 30e46f30e..640af5362 100644 --- a/cli/drone/build/build_info.go +++ b/cli/build/build_info.go @@ -6,7 +6,7 @@ import ( "text/template" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildInfoCmd = cli.Command{ diff --git a/cli/drone/build/build_kill.go b/cli/build/build_kill.go similarity index 92% rename from cli/drone/build/build_kill.go rename to cli/build/build_kill.go index 9c99259d2..8902c319d 100644 --- a/cli/drone/build/build_kill.go +++ b/cli/build/build_kill.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildKillCmd = cli.Command{ diff --git a/cli/drone/build/build_last.go b/cli/build/build_last.go similarity index 93% rename from cli/drone/build/build_last.go rename to cli/build/build_last.go index 7f317b55d..1ef038658 100644 --- a/cli/drone/build/build_last.go +++ b/cli/build/build_last.go @@ -5,7 +5,7 @@ import ( "text/template" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildLastCmd = cli.Command{ diff --git a/cli/drone/build/build_list.go b/cli/build/build_list.go similarity index 96% rename from cli/drone/build/build_list.go rename to cli/build/build_list.go index d75057683..65c96c3c9 100644 --- a/cli/drone/build/build_list.go +++ b/cli/build/build_list.go @@ -5,7 +5,7 @@ import ( "text/template" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildListCmd = cli.Command{ diff --git a/cli/drone/build/build_logs.go b/cli/build/build_logs.go similarity index 100% rename from cli/drone/build/build_logs.go rename to cli/build/build_logs.go diff --git a/cli/drone/build/build_ps.go b/cli/build/build_ps.go similarity index 96% rename from cli/drone/build/build_ps.go rename to cli/build/build_ps.go index 5e31ef961..6b4f37324 100644 --- a/cli/drone/build/build_ps.go +++ b/cli/build/build_ps.go @@ -6,7 +6,7 @@ import ( "text/template" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildPsCmd = cli.Command{ diff --git a/cli/drone/build/build_queue.go b/cli/build/build_queue.go similarity index 94% rename from cli/drone/build/build_queue.go rename to cli/build/build_queue.go index af2040c6c..58372d4f1 100644 --- a/cli/drone/build/build_queue.go +++ b/cli/build/build_queue.go @@ -6,7 +6,7 @@ import ( "text/template" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildQueueCmd = cli.Command{ diff --git a/cli/drone/build/build_start.go b/cli/build/build_start.go similarity index 95% rename from cli/drone/build/build_start.go rename to cli/build/build_start.go index dc403325c..bcd299de0 100644 --- a/cli/drone/build/build_start.go +++ b/cli/build/build_start.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildStartCmd = cli.Command{ diff --git a/cli/drone/build/build_stop.go b/cli/build/build_stop.go similarity index 92% rename from cli/drone/build/build_stop.go rename to cli/build/build_stop.go index 681484ab3..419758eda 100644 --- a/cli/drone/build/build_stop.go +++ b/cli/build/build_stop.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var buildStopCmd = cli.Command{ diff --git a/cli/drone/deploy/deploy.go b/cli/deploy/deploy.go similarity index 97% rename from cli/drone/deploy/deploy.go rename to cli/deploy/deploy.go index 77e12c03b..8f14af47d 100644 --- a/cli/drone/deploy/deploy.go +++ b/cli/deploy/deploy.go @@ -6,7 +6,7 @@ import ( "os" "strconv" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" "github.com/woodpecker-ci/woodpecker/drone-go/drone" "github.com/urfave/cli" diff --git a/cli/drone/exec/exec.go b/cli/exec/exec.go similarity index 100% rename from cli/drone/exec/exec.go rename to cli/exec/exec.go diff --git a/cli/drone/exec/line.go b/cli/exec/line.go similarity index 100% rename from cli/drone/exec/line.go rename to cli/exec/line.go diff --git a/cli/drone/info/info.go b/cli/info/info.go similarity index 93% rename from cli/drone/info/info.go rename to cli/info/info.go index b19067f00..1ded8d492 100644 --- a/cli/drone/info/info.go +++ b/cli/info/info.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) // Command exports the info command. diff --git a/cli/drone/internal/util.go b/cli/internal/util.go similarity index 100% rename from cli/drone/internal/util.go rename to cli/internal/util.go diff --git a/cli/drone/internal/util_test.go b/cli/internal/util_test.go similarity index 100% rename from cli/drone/internal/util_test.go rename to cli/internal/util_test.go diff --git a/cli/drone/log/log.go b/cli/log/log.go similarity index 100% rename from cli/drone/log/log.go rename to cli/log/log.go diff --git a/cli/drone/log/log_purge.go b/cli/log/log_purge.go similarity index 92% rename from cli/drone/log/log_purge.go rename to cli/log/log_purge.go index a55180688..c4802a451 100644 --- a/cli/drone/log/log_purge.go +++ b/cli/log/log_purge.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var logPurgeCmd = cli.Command{ diff --git a/cli/drone/registry/registry.go b/cli/registry/registry.go similarity index 100% rename from cli/drone/registry/registry.go rename to cli/registry/registry.go diff --git a/cli/drone/registry/registry_add.go b/cli/registry/registry_add.go similarity index 96% rename from cli/drone/registry/registry_add.go rename to cli/registry/registry_add.go index 50b82399e..aaec85c45 100644 --- a/cli/drone/registry/registry_add.go +++ b/cli/registry/registry_add.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "strings" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" "github.com/woodpecker-ci/woodpecker/drone-go/drone" "github.com/urfave/cli" diff --git a/cli/drone/registry/registry_info.go b/cli/registry/registry_info.go similarity index 95% rename from cli/drone/registry/registry_info.go rename to cli/registry/registry_info.go index 0c7b27fbe..bcf71a7a7 100644 --- a/cli/drone/registry/registry_info.go +++ b/cli/registry/registry_info.go @@ -4,7 +4,7 @@ import ( "html/template" "os" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" "github.com/urfave/cli" ) diff --git a/cli/drone/registry/registry_list.go b/cli/registry/registry_list.go similarity index 95% rename from cli/drone/registry/registry_list.go rename to cli/registry/registry_list.go index f85342685..f5cc79016 100644 --- a/cli/drone/registry/registry_list.go +++ b/cli/registry/registry_list.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var registryListCmd = cli.Command{ diff --git a/cli/drone/registry/registry_rm.go b/cli/registry/registry_rm.go similarity index 93% rename from cli/drone/registry/registry_rm.go rename to cli/registry/registry_rm.go index 214e806ae..e9d9fb1c8 100644 --- a/cli/drone/registry/registry_rm.go +++ b/cli/registry/registry_rm.go @@ -1,7 +1,7 @@ package registry import ( - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" "github.com/urfave/cli" ) diff --git a/cli/drone/registry/registry_set.go b/cli/registry/registry_set.go similarity index 96% rename from cli/drone/registry/registry_set.go rename to cli/registry/registry_set.go index 4cf86cc72..d3ccac834 100644 --- a/cli/drone/registry/registry_set.go +++ b/cli/registry/registry_set.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "strings" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" "github.com/woodpecker-ci/woodpecker/drone-go/drone" "github.com/urfave/cli" diff --git a/cli/drone/repo/repo.go b/cli/repo/repo.go similarity index 100% rename from cli/drone/repo/repo.go rename to cli/repo/repo.go diff --git a/cli/drone/repo/repo_add.go b/cli/repo/repo_add.go similarity index 90% rename from cli/drone/repo/repo_add.go rename to cli/repo/repo_add.go index af4060e2e..39ed116e6 100644 --- a/cli/drone/repo/repo_add.go +++ b/cli/repo/repo_add.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var repoAddCmd = cli.Command{ diff --git a/cli/drone/repo/repo_chown.go b/cli/repo/repo_chown.go similarity index 91% rename from cli/drone/repo/repo_chown.go rename to cli/repo/repo_chown.go index 8b6a366ab..45ce0ddcf 100644 --- a/cli/drone/repo/repo_chown.go +++ b/cli/repo/repo_chown.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var repoChownCmd = cli.Command{ diff --git a/cli/drone/repo/repo_info.go b/cli/repo/repo_info.go similarity index 94% rename from cli/drone/repo/repo_info.go rename to cli/repo/repo_info.go index 9e3b279da..971d834d5 100644 --- a/cli/drone/repo/repo_info.go +++ b/cli/repo/repo_info.go @@ -5,7 +5,7 @@ import ( "text/template" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var repoInfoCmd = cli.Command{ diff --git a/cli/drone/repo/repo_list.go b/cli/repo/repo_list.go similarity index 94% rename from cli/drone/repo/repo_list.go rename to cli/repo/repo_list.go index dddf4a355..b60a3f1e4 100644 --- a/cli/drone/repo/repo_list.go +++ b/cli/repo/repo_list.go @@ -5,7 +5,7 @@ import ( "text/template" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var repoListCmd = cli.Command{ diff --git a/cli/drone/repo/repo_repair.go b/cli/repo/repo_repair.go similarity index 88% rename from cli/drone/repo/repo_repair.go rename to cli/repo/repo_repair.go index 9b7c26df5..6b06d483d 100644 --- a/cli/drone/repo/repo_repair.go +++ b/cli/repo/repo_repair.go @@ -2,7 +2,7 @@ package repo import ( "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var repoRepairCmd = cli.Command{ diff --git a/cli/drone/repo/repo_rm.go b/cli/repo/repo_rm.go similarity index 90% rename from cli/drone/repo/repo_rm.go rename to cli/repo/repo_rm.go index bdf375368..2e2e36f35 100644 --- a/cli/drone/repo/repo_rm.go +++ b/cli/repo/repo_rm.go @@ -3,7 +3,7 @@ package repo import ( "fmt" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" "github.com/urfave/cli" ) diff --git a/cli/drone/repo/repo_sync.go b/cli/repo/repo_sync.go similarity index 93% rename from cli/drone/repo/repo_sync.go rename to cli/repo/repo_sync.go index 00582951c..2a6feab92 100644 --- a/cli/drone/repo/repo_sync.go +++ b/cli/repo/repo_sync.go @@ -5,7 +5,7 @@ import ( "text/template" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var repoSyncCmd = cli.Command{ diff --git a/cli/drone/repo/repo_update.go b/cli/repo/repo_update.go similarity index 97% rename from cli/drone/repo/repo_update.go rename to cli/repo/repo_update.go index f26d19660..30887805e 100644 --- a/cli/drone/repo/repo_update.go +++ b/cli/repo/repo_update.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" "github.com/woodpecker-ci/woodpecker/drone-go/drone" "github.com/urfave/cli" diff --git a/cli/drone/secret/secret.go b/cli/secret/secret.go similarity index 100% rename from cli/drone/secret/secret.go rename to cli/secret/secret.go diff --git a/cli/drone/secret/secret_add.go b/cli/secret/secret_add.go similarity index 96% rename from cli/drone/secret/secret_add.go rename to cli/secret/secret_add.go index 9d9fb800c..7fda8bb0b 100644 --- a/cli/drone/secret/secret_add.go +++ b/cli/secret/secret_add.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "strings" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" "github.com/woodpecker-ci/woodpecker/drone-go/drone" "github.com/urfave/cli" diff --git a/cli/drone/secret/secret_info.go b/cli/secret/secret_info.go similarity index 95% rename from cli/drone/secret/secret_info.go rename to cli/secret/secret_info.go index 75a83b5bb..23145141e 100644 --- a/cli/drone/secret/secret_info.go +++ b/cli/secret/secret_info.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var secretInfoCmd = cli.Command{ diff --git a/cli/drone/secret/secret_list.go b/cli/secret/secret_list.go similarity index 95% rename from cli/drone/secret/secret_list.go rename to cli/secret/secret_list.go index 2d7ac897a..e2f526c48 100644 --- a/cli/drone/secret/secret_list.go +++ b/cli/secret/secret_list.go @@ -7,7 +7,7 @@ import ( "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var secretListCmd = cli.Command{ diff --git a/cli/drone/secret/secret_rm.go b/cli/secret/secret_rm.go similarity index 92% rename from cli/drone/secret/secret_rm.go rename to cli/secret/secret_rm.go index c396f04df..a4c92389e 100644 --- a/cli/drone/secret/secret_rm.go +++ b/cli/secret/secret_rm.go @@ -3,7 +3,7 @@ package secret import ( "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var secretDeleteCmd = cli.Command{ diff --git a/cli/drone/secret/secret_set.go b/cli/secret/secret_set.go similarity index 96% rename from cli/drone/secret/secret_set.go rename to cli/secret/secret_set.go index 2d2135c4e..025940f5a 100644 --- a/cli/drone/secret/secret_set.go +++ b/cli/secret/secret_set.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "strings" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" "github.com/woodpecker-ci/woodpecker/drone-go/drone" "github.com/urfave/cli" diff --git a/cli/drone/user/user.go b/cli/user/user.go similarity index 100% rename from cli/drone/user/user.go rename to cli/user/user.go diff --git a/cli/drone/user/user_add.go b/cli/user/user_add.go similarity index 90% rename from cli/drone/user/user_add.go rename to cli/user/user_add.go index bb6bee2ff..73ccd80f6 100644 --- a/cli/drone/user/user_add.go +++ b/cli/user/user_add.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli" "github.com/woodpecker-ci/woodpecker/drone-go/drone" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var userAddCmd = cli.Command{ diff --git a/cli/drone/user/user_info.go b/cli/user/user_info.go similarity index 93% rename from cli/drone/user/user_info.go rename to cli/user/user_info.go index bfcc83137..55f1f5e8a 100644 --- a/cli/drone/user/user_info.go +++ b/cli/user/user_info.go @@ -7,7 +7,7 @@ import ( "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var userInfoCmd = cli.Command{ diff --git a/cli/drone/user/user_list.go b/cli/user/user_list.go similarity index 92% rename from cli/drone/user/user_list.go rename to cli/user/user_list.go index 24738141c..fb2432200 100644 --- a/cli/drone/user/user_list.go +++ b/cli/user/user_list.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var userListCmd = cli.Command{ diff --git a/cli/drone/user/user_rm.go b/cli/user/user_rm.go similarity index 88% rename from cli/drone/user/user_rm.go rename to cli/user/user_rm.go index 7af753c0b..a2467abbd 100644 --- a/cli/drone/user/user_rm.go +++ b/cli/user/user_rm.go @@ -5,7 +5,7 @@ import ( "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/cli/drone/internal" + "github.com/woodpecker-ci/woodpecker/cli/internal" ) var userRemoveCmd = cli.Command{ diff --git a/cli/drone/main.go b/cmd/cli/main.go similarity index 64% rename from cli/drone/main.go rename to cmd/cli/main.go index bf1233ad5..d79f284de 100644 --- a/cli/drone/main.go +++ b/cmd/cli/main.go @@ -4,57 +4,55 @@ import ( "fmt" "os" - "github.com/woodpecker-ci/woodpecker/cli/drone/build" - "github.com/woodpecker-ci/woodpecker/cli/drone/deploy" - "github.com/woodpecker-ci/woodpecker/cli/drone/exec" - "github.com/woodpecker-ci/woodpecker/cli/drone/info" - "github.com/woodpecker-ci/woodpecker/cli/drone/log" - "github.com/woodpecker-ci/woodpecker/cli/drone/registry" - "github.com/woodpecker-ci/woodpecker/cli/drone/repo" - "github.com/woodpecker-ci/woodpecker/cli/drone/secret" - "github.com/woodpecker-ci/woodpecker/cli/drone/user" + "github.com/woodpecker-ci/woodpecker/cli/build" + "github.com/woodpecker-ci/woodpecker/cli/deploy" + "github.com/woodpecker-ci/woodpecker/cli/exec" + "github.com/woodpecker-ci/woodpecker/cli/info" + "github.com/woodpecker-ci/woodpecker/cli/log" + "github.com/woodpecker-ci/woodpecker/cli/registry" + "github.com/woodpecker-ci/woodpecker/cli/repo" + "github.com/woodpecker-ci/woodpecker/cli/secret" + "github.com/woodpecker-ci/woodpecker/cli/user" + "github.com/woodpecker-ci/woodpecker/version" _ "github.com/joho/godotenv/autoload" "github.com/urfave/cli" ) -// drone version number -var version string - func main() { app := cli.NewApp() - app.Name = "drone" - app.Version = version + app.Name = "woodpecker-cli" + app.Version = version.String() app.Usage = "command line utility" app.EnableBashCompletion = true app.Flags = []cli.Flag{ cli.StringFlag{ + EnvVar: "DRONE_TOKEN,WOODPECKER_TOKEN", Name: "t, token", Usage: "server auth token", - EnvVar: "DRONE_TOKEN,WOODPECKER_TOKEN", }, cli.StringFlag{ + EnvVar: "DRONE_SERVER,WOODPECKER_SERVER", Name: "s, server", Usage: "server address", - EnvVar: "DRONE_SERVER,WOODPECKER_SERVER", }, cli.BoolFlag{ - Name: "skip-verify", - Usage: "skip ssl verfification", EnvVar: "DRONE_SKIP_VERIFY,WOODPECKER_SKIP_VERIFY", + Name: "skip-verify", + Usage: "skip ssl verification", Hidden: true, }, cli.StringFlag{ + EnvVar: "SOCKS_PROXY", Name: "socks-proxy", Usage: "socks proxy address", - EnvVar: "SOCKS_PROXY", Hidden: true, }, cli.BoolFlag{ + EnvVar: "SOCKS_PROXY_OFF", Name: "socks-proxy-off", Usage: "socks proxy ignored", - EnvVar: "SOCKS_PROXY_OFF", Hidden: true, }, }