diff --git a/go.mod b/go.mod index c051c6c..d45136a 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,10 @@ go 1.18 require ( github.com/appleboy/easyssh-proxy v1.3.10 + github.com/davecgh/go-spew v1.1.1 github.com/joho/godotenv v1.5.1 + github.com/mattn/go-isatty v0.0.19 + github.com/rs/zerolog v1.29.1 github.com/stretchr/testify v1.8.2 github.com/urfave/cli/v2 v2.25.4 golang.org/x/crypto v0.9.0 @@ -13,8 +16,8 @@ require ( require ( github.com/ScaleFT/sshkeys v1.2.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect + github.com/mattn/go-colorable v0.1.12 // indirect 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 diff --git a/go.sum b/go.sum index 2da244f..d4d890b 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,7 @@ github.com/ScaleFT/sshkeys v1.2.0 h1:5BRp6rTVIhJzXT3VcUQrKgXR8zWA3sOsNeuyW15WUA8 github.com/ScaleFT/sshkeys v1.2.0/go.mod h1:gxOHeajFfvGQh/fxlC8oOKBe23xnnJTif00IFFbiT+o= github.com/appleboy/easyssh-proxy v1.3.10 h1:iriF68tlrYoxgWhS7t7Wyr0FA+hJlOem5tMfm+RDlx4= github.com/appleboy/easyssh-proxy v1.3.10/go.mod h1:T81pu/Cxx/zf/7YXhFCFiucBa4xeQ81ci5b0PFnMRJc= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -9,10 +10,20 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a h1:saTgr5tMLFnmy/yg3qDTft4rE5DY2uJ/cCxCe3q0XTU= github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a/go.mod h1:Bw9BbhOJVNR+t0jCqx2GC6zv0TGBsShs56Y3gfSCvl0= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= +github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -35,6 +46,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn 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-20200219091948-cb0a6d8edb6c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= diff --git a/main.go b/main.go index f97eff1..b4dd0d2 100644 --- a/main.go +++ b/main.go @@ -1,13 +1,16 @@ package main import ( - "log" "os" "strconv" "time" "github.com/appleboy/easyssh-proxy" + "github.com/davecgh/go-spew/spew" "github.com/joho/godotenv" + "github.com/mattn/go-isatty" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" "github.com/urfave/cli/v2" ) @@ -24,6 +27,26 @@ func main() { _ = godotenv.Overload("/run/drone/env") } + isTerm := isatty.IsTerminal(os.Stdout.Fd()) + zerolog.SetGlobalLevel(zerolog.InfoLevel) + log.Logger = log.Output( + zerolog.ConsoleWriter{ + Out: os.Stderr, + NoColor: !isTerm, + }, + ) + zerolog.CallerMarshalFunc = func(pc uintptr, file string, line int) string { + short := file + for i := len(file) - 1; i > 0; i-- { + if file[i] == '/' { + short = file[i+1:] + break + } + } + file = short + return file + ":" + strconv.Itoa(line) + } + app := cli.NewApp() app.Name = "Drone SSH" app.Usage = "Executing remote ssh commands" @@ -108,7 +131,7 @@ func main() { EnvVars: []string{"PLUGIN_SYNC", "INPUT_SYNC"}, }, &cli.DurationFlag{ - Name: "command.timeout", + Name: "command-timeout", Aliases: []string{"T"}, Usage: "command timeout", EnvVars: []string{"PLUGIN_COMMAND_TIMEOUT", "SSH_COMMAND_TIMEOUT", "INPUT_COMMAND_TIMEOUT"}, @@ -198,7 +221,7 @@ func main() { EnvVars: []string{"PLUGIN_DEBUG", "INPUT_DEBUG"}, }, &cli.StringFlag{ - Name: "envs.format", + Name: "envs-format", Usage: "flexible configuration of environment value transfer", EnvVars: []string{"PLUGIN_ENVS_FORMAT", "INPUT_ENVS_FORMAT"}, Value: envsFormat, @@ -239,11 +262,16 @@ REPOSITORY: ` if err := app.Run(os.Args); err != nil { - log.Fatal(err) + log.Fatal().Err(err).Msg("can't run app") } } func run(c *cli.Context) error { + if c.Bool("debug") { + zerolog.SetGlobalLevel(zerolog.DebugLevel) + log.Logger = log.With().Caller().Logger() + } + scripts := c.StringSlice("script") if s := c.String("script.string"); s != "" { scripts = append(scripts, s) @@ -264,7 +292,7 @@ func run(c *cli.Context) error { Script: scripts, ScriptStop: c.Bool("script.stop"), Envs: c.StringSlice("envs"), - EnvsFormat: c.String("envs.format"), + EnvsFormat: c.String("envs-format"), Debug: c.Bool("debug"), Sync: c.Bool("sync"), Ciphers: c.StringSlice("ciphers"), @@ -286,5 +314,9 @@ func run(c *cli.Context) error { Writer: os.Stdout, } + if plugin.Config.Debug { + spew.Dump(plugin) + } + return plugin.Exec() } diff --git a/plugin.go b/plugin.go index 14d619f..46d66b5 100644 --- a/plugin.go +++ b/plugin.go @@ -11,6 +11,7 @@ import ( "time" "github.com/appleboy/easyssh-proxy" + "github.com/rs/zerolog/log" ) var ( @@ -213,9 +214,9 @@ func (p Plugin) Exec() error { } } - fmt.Println("==============================================") - fmt.Println("✅ Successfully executed commands to all host.") - fmt.Println("==============================================") + log.Info().Msg("==============================================") + log.Info().Msg("✅ Successfully executed commands to all host.") + log.Info().Msg("==============================================") return nil }