From 2f267e2a7939c7637a4141a8d2350b97425f7eac Mon Sep 17 00:00:00 2001 From: Anbraten Date: Sun, 3 Oct 2021 00:27:43 +0200 Subject: [PATCH] Rename drone-go (#390) --- cli/deploy/deploy.go | 6 +++--- cli/internal/util.go | 12 ++++++------ cli/registry/registry_add.go | 4 ++-- cli/registry/registry_set.go | 4 ++-- cli/repo/repo_update.go | 6 +++--- cli/secret/secret_add.go | 10 +++++----- cli/secret/secret_set.go | 4 ++-- cli/user/user_add.go | 4 ++-- {drone-go => woodpecker-go}/LICENSE | 0 {drone-go => woodpecker-go}/README.md | 12 ++++++------ .../drone => woodpecker-go/woodpecker}/client.go | 2 +- .../woodpecker}/client_test.go | 2 +- .../drone => woodpecker-go/woodpecker}/const.go | 2 +- .../drone => woodpecker-go/woodpecker}/interface.go | 2 +- .../drone => woodpecker-go/woodpecker}/types.go | 2 +- 15 files changed, 36 insertions(+), 36 deletions(-) rename {drone-go => woodpecker-go}/LICENSE (100%) rename {drone-go => woodpecker-go}/README.md (61%) rename {drone-go/drone => woodpecker-go/woodpecker}/client.go (99%) rename {drone-go/drone => woodpecker-go/woodpecker}/client_test.go (97%) rename {drone-go/drone => woodpecker-go/woodpecker}/const.go (95%) rename {drone-go/drone => woodpecker-go/woodpecker}/interface.go (99%) rename {drone-go/drone => woodpecker-go/woodpecker}/types.go (99%) diff --git a/cli/deploy/deploy.go b/cli/deploy/deploy.go index 8f14af47d..1f4d6c89f 100644 --- a/cli/deploy/deploy.go +++ b/cli/deploy/deploy.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/woodpecker-ci/woodpecker/cli/internal" - "github.com/woodpecker-ci/woodpecker/drone-go/drone" + "github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker" "github.com/urfave/cli" ) @@ -32,12 +32,12 @@ var Command = cli.Command{ cli.StringFlag{ Name: "event", Usage: "event filter", - Value: drone.EventPush, + Value: woodpecker.EventPush, }, cli.StringFlag{ Name: "status", Usage: "status filter", - Value: drone.StatusSuccess, + Value: woodpecker.StatusSuccess, }, cli.StringSliceFlag{ Name: "param, p", diff --git a/cli/internal/util.go b/cli/internal/util.go index 93c9d60c4..7865ddb81 100644 --- a/cli/internal/util.go +++ b/cli/internal/util.go @@ -11,11 +11,11 @@ import ( "golang.org/x/net/proxy" "golang.org/x/oauth2" - "github.com/woodpecker-ci/woodpecker/drone-go/drone" + "github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker" ) // NewClient returns a new client from the CLI context. -func NewClient(c *cli.Context) (drone.Client, error) { +func NewClient(c *cli.Context) (woodpecker.Client, error) { var ( skip = c.GlobalBool("skip-verify") socks = c.GlobalString("socks-proxy") @@ -26,12 +26,12 @@ func NewClient(c *cli.Context) (drone.Client, error) { server = strings.TrimRight(server, "/") // if no server url is provided we can default - // to the hosted Drone service. + // to the hosted Woodpecker service. if len(server) == 0 { - return nil, fmt.Errorf("Error: you must provide the Drone server address.") + return nil, fmt.Errorf("Error: you must provide the Woodpecker server address.") } if len(token) == 0 { - return nil, fmt.Errorf("Error: you must provide your Drone access token.") + return nil, fmt.Errorf("Error: you must provide your Woodpecker access token.") } // attempt to find system CA certs @@ -68,7 +68,7 @@ func NewClient(c *cli.Context) (drone.Client, error) { } } - return drone.NewClient(server, auther), nil + return woodpecker.NewClient(server, auther), nil } // ParseRepo parses the repository owner and name from a string. diff --git a/cli/registry/registry_add.go b/cli/registry/registry_add.go index aaec85c45..306cc34dd 100644 --- a/cli/registry/registry_add.go +++ b/cli/registry/registry_add.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/woodpecker-ci/woodpecker/cli/internal" - "github.com/woodpecker-ci/woodpecker/drone-go/drone" + "github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker" "github.com/urfave/cli" ) @@ -54,7 +54,7 @@ func registryCreate(c *cli.Context) error { if err != nil { return err } - registry := &drone.Registry{ + registry := &woodpecker.Registry{ Address: hostname, Username: username, Password: password, diff --git a/cli/registry/registry_set.go b/cli/registry/registry_set.go index d3ccac834..a0ec8e918 100644 --- a/cli/registry/registry_set.go +++ b/cli/registry/registry_set.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/woodpecker-ci/woodpecker/cli/internal" - "github.com/woodpecker-ci/woodpecker/drone-go/drone" + "github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker" "github.com/urfave/cli" ) @@ -54,7 +54,7 @@ func registryUpdate(c *cli.Context) error { if err != nil { return err } - registry := &drone.Registry{ + registry := &woodpecker.Registry{ Address: hostname, Username: username, Password: password, diff --git a/cli/repo/repo_update.go b/cli/repo/repo_update.go index 30887805e..fb7b647a2 100644 --- a/cli/repo/repo_update.go +++ b/cli/repo/repo_update.go @@ -5,7 +5,7 @@ import ( "time" "github.com/woodpecker-ci/woodpecker/cli/internal" - "github.com/woodpecker-ci/woodpecker/drone-go/drone" + "github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker" "github.com/urfave/cli" ) @@ -34,7 +34,7 @@ var repoUpdateCmd = cli.Command{ }, cli.StringFlag{ Name: "config", - Usage: "repository configuration path (e.g. .drone.yml)", + Usage: "repository configuration path (e.g. .woodpecker.yml)", }, cli.IntFlag{ Name: "build-counter", @@ -69,7 +69,7 @@ func repoUpdate(c *cli.Context) error { unsafe = c.Bool("unsafe") ) - patch := new(drone.RepoPatch) + patch := new(woodpecker.RepoPatch) if c.IsSet("trusted") { patch.IsTrusted = &trusted } diff --git a/cli/secret/secret_add.go b/cli/secret/secret_add.go index 7fda8bb0b..9412e4970 100644 --- a/cli/secret/secret_add.go +++ b/cli/secret/secret_add.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/woodpecker-ci/woodpecker/cli/internal" - "github.com/woodpecker-ci/woodpecker/drone-go/drone" + "github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker" "github.com/urfave/cli" ) @@ -52,7 +52,7 @@ func secretCreate(c *cli.Context) error { if err != nil { return err } - secret := &drone.Secret{ + secret := &woodpecker.Secret{ Name: c.String("name"), Value: c.String("value"), Images: c.StringSlice("image"), @@ -74,7 +74,7 @@ func secretCreate(c *cli.Context) error { } var defaultSecretEvents = []string{ - drone.EventPush, - drone.EventTag, - drone.EventDeploy, + woodpecker.EventPush, + woodpecker.EventTag, + woodpecker.EventDeploy, } diff --git a/cli/secret/secret_set.go b/cli/secret/secret_set.go index 025940f5a..360b2174c 100644 --- a/cli/secret/secret_set.go +++ b/cli/secret/secret_set.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/woodpecker-ci/woodpecker/cli/internal" - "github.com/woodpecker-ci/woodpecker/drone-go/drone" + "github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker" "github.com/urfave/cli" ) @@ -52,7 +52,7 @@ func secretUpdate(c *cli.Context) error { if err != nil { return err } - secret := &drone.Secret{ + secret := &woodpecker.Secret{ Name: c.String("name"), Value: c.String("value"), Images: c.StringSlice("image"), diff --git a/cli/user/user_add.go b/cli/user/user_add.go index 73ccd80f6..83f3bd289 100644 --- a/cli/user/user_add.go +++ b/cli/user/user_add.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/urfave/cli" - "github.com/woodpecker-ci/woodpecker/drone-go/drone" + "github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker" "github.com/woodpecker-ci/woodpecker/cli/internal" ) @@ -24,7 +24,7 @@ func userAdd(c *cli.Context) error { return err } - user, err := client.UserPost(&drone.User{Login: login}) + user, err := client.UserPost(&woodpecker.User{Login: login}) if err != nil { return err } diff --git a/drone-go/LICENSE b/woodpecker-go/LICENSE similarity index 100% rename from drone-go/LICENSE rename to woodpecker-go/LICENSE diff --git a/drone-go/README.md b/woodpecker-go/README.md similarity index 61% rename from drone-go/README.md rename to woodpecker-go/README.md index a19df5d15..b092ff934 100644 --- a/drone-go/README.md +++ b/woodpecker-go/README.md @@ -1,14 +1,14 @@ -# drone-go +# woodpecker-go ```Go import ( - "github.com/woodpecker-ci/woodpecker/drone-go/drone" + "github.com/woodpecker-ci/woodpecker/woodpecker-go/woodpecker" "golang.org/x/oauth2" ) const ( token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9" - host = "http://drone.company.com" + host = "http://woodpecker.company.tld" ) func main() { @@ -21,15 +21,15 @@ func main() { }, ) - // create the drone client with authenticator - client := drone.NewClient(host, auther) + // create the woodpecker client with authenticator + client := woodpecker.NewClient(host, auther) // gets the current user user, err := client.Self() fmt.Println(user, err) // gets the named repository information - repo, err := client.Repo("drone", "drone-go") + repo, err := client.Repo("woodpecker-ci", "woodpecker") fmt.Println(repo, err) } ``` diff --git a/drone-go/drone/client.go b/woodpecker-go/woodpecker/client.go similarity index 99% rename from drone-go/drone/client.go rename to woodpecker-go/woodpecker/client.go index b5c6da7d7..10e838b8a 100644 --- a/drone-go/drone/client.go +++ b/woodpecker-go/woodpecker/client.go @@ -1,4 +1,4 @@ -package drone +package woodpecker import ( "bytes" diff --git a/drone-go/drone/client_test.go b/woodpecker-go/woodpecker/client_test.go similarity index 97% rename from drone-go/drone/client_test.go rename to woodpecker-go/woodpecker/client_test.go index b2aa1a160..fee25290c 100644 --- a/drone-go/drone/client_test.go +++ b/woodpecker-go/woodpecker/client_test.go @@ -1,4 +1,4 @@ -package drone +package woodpecker import ( "fmt" diff --git a/drone-go/drone/const.go b/woodpecker-go/woodpecker/const.go similarity index 95% rename from drone-go/drone/const.go rename to woodpecker-go/woodpecker/const.go index f61b612ae..e77fb9c7f 100644 --- a/drone-go/drone/const.go +++ b/woodpecker-go/woodpecker/const.go @@ -1,4 +1,4 @@ -package drone +package woodpecker // Event values. const ( diff --git a/drone-go/drone/interface.go b/woodpecker-go/woodpecker/interface.go similarity index 99% rename from drone-go/drone/interface.go rename to woodpecker-go/woodpecker/interface.go index 1682bd339..0ac00439a 100644 --- a/drone-go/drone/interface.go +++ b/woodpecker-go/woodpecker/interface.go @@ -1,4 +1,4 @@ -package drone +package woodpecker import "net/http" diff --git a/drone-go/drone/types.go b/woodpecker-go/woodpecker/types.go similarity index 99% rename from drone-go/drone/types.go rename to woodpecker-go/woodpecker/types.go index d25d4ca96..deab4ddd0 100644 --- a/drone-go/drone/types.go +++ b/woodpecker-go/woodpecker/types.go @@ -1,4 +1,4 @@ -package drone +package woodpecker type ( // User represents a user account.