diff --git a/cmd/drone-docker/main.go b/cmd/drone-docker/main.go index 8175d8e..692eb91 100644 --- a/cmd/drone-docker/main.go +++ b/cmd/drone-docker/main.go @@ -5,11 +5,11 @@ import ( "os" "github.com/joho/godotenv" + "github.com/sirupsen/logrus" "github.com/thegeeklab/drone-docker/plugin" "github.com/urfave/cli/v2" - "github.com/thegeeklab/drone-plugin-lib/errors" - "github.com/thegeeklab/drone-plugin-lib/urfave" + "github.com/thegeeklab/drone-plugin-lib/v2/urfave" ) var ( @@ -37,7 +37,7 @@ func main() { } if err := app.Run(os.Args); err != nil { - errors.HandleExit(err) + logrus.Fatal(err) } } @@ -52,19 +52,11 @@ func run(settings *plugin.Settings) cli.ActionFunc { ) if err := plugin.Validate(); err != nil { - if e, ok := err.(errors.ExitCoder); ok { - return e - } - - return errors.ExitMessagef("validation failed: %w", err) + return fmt.Errorf("validation failed: %w", err) } if err := plugin.Execute(); err != nil { - if e, ok := err.(errors.ExitCoder); ok { - return e - } - - return errors.ExitMessagef("execution failed: %w", err) + return fmt.Errorf("execution failed: %w", err) } return nil diff --git a/go.mod b/go.mod index 863a0bd..b7c7876 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/coreos/go-semver v0.3.0 github.com/joho/godotenv v1.4.0 github.com/sirupsen/logrus v1.8.1 - github.com/thegeeklab/drone-plugin-lib v1.0.0 + github.com/thegeeklab/drone-plugin-lib/v2 v2.0.0 github.com/urfave/cli/v2 v2.8.1 ) diff --git a/go.sum b/go.sum index 1ea1623..6fde57d 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/thegeeklab/drone-plugin-lib v1.0.0 h1:PQeLnJa0q988rODYod/XtDy/f0cHHUhOA2Y8m5XRW4g= -github.com/thegeeklab/drone-plugin-lib v1.0.0/go.mod h1:XAlZDTSNNJogOH1+nS5u0notdj5dO/gtKnU7guzE95g= +github.com/thegeeklab/drone-plugin-lib/v2 v2.0.0 h1:ejM1fIkGhn9sy7HTidRiQhZJuEfUNF6sO9ko090PYvM= +github.com/thegeeklab/drone-plugin-lib/v2 v2.0.0/go.mod h1:cXNc+dmGLA748rAnXVBsTFG1UO+A/0XlV5jUEf/ahgk= github.com/urfave/cli/v2 v2.8.1 h1:CGuYNZF9IKZY/rfBe3lJpccSoIY1ytfvmgQT90cNOl4= github.com/urfave/cli/v2 v2.8.1/go.mod h1:Z41J9TPoffeoqP0Iza0YbAhGvymRdZAd2uPmZ5JxRdY= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= diff --git a/plugin/plugin.go b/plugin/plugin.go index 4d16e7f..65eada6 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -1,7 +1,7 @@ package plugin import ( - "github.com/thegeeklab/drone-plugin-lib/drone" + "github.com/thegeeklab/drone-plugin-lib/v2/drone" ) // Plugin implements drone.Plugin to provide the plugin implementation.