diff --git a/go.mod b/go.mod index 85a2757f..c69b6256 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,6 @@ require ( github.com/k0sproject/dig v0.3.1 github.com/k0sproject/rig v0.19.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 - github.com/logrusorgru/aurora v2.0.3+incompatible github.com/mattn/go-isatty v0.0.20 github.com/mattn/go-shellwords v1.0.12 github.com/mitchellh/go-homedir v1.1.0 diff --git a/go.sum b/go.sum index f777deb4..5b481875 100644 --- a/go.sum +++ b/go.sum @@ -662,8 +662,6 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= -github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= -github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= diff --git a/pkg/log/formatter_hook.go b/pkg/log/formatter_hook.go index 05b5e05e..51277e14 100644 --- a/pkg/log/formatter_hook.go +++ b/pkg/log/formatter_hook.go @@ -4,7 +4,6 @@ import ( "fmt" "io" "os" - "runtime" "time" log "github.com/sirupsen/logrus" @@ -47,7 +46,7 @@ func (hook *FormatterWriterHook) Levels() []log.Level { func NewStdoutHook() *FormatterWriterHook { stdoutHook := &FormatterWriterHook{ Writer: os.Stdout, - Formatter: &log.TextFormatter{DisableTimestamp: true, ForceColors: runtime.GOOS != "windows"}, + Formatter: &log.TextFormatter{DisableTimestamp: false, ForceColors: false, DisableColors: true, DisableQuote: true}, LogLevels: []log.Level{ log.InfoLevel, log.PanicLevel, diff --git a/pkg/phase/manager.go b/pkg/phase/manager.go index 311fbb98..20fe7eb5 100644 --- a/pkg/phase/manager.go +++ b/pkg/phase/manager.go @@ -6,7 +6,6 @@ import ( "time" "github.com/Mirantis/mcc/pkg/analytics" - "github.com/logrusorgru/aurora" log "github.com/sirupsen/logrus" event "gopkg.in/segmentio/analytics-go.v3" ) @@ -85,8 +84,7 @@ func (m *Manager) Run() error { } } - text := aurora.Green("==> Running phase: %s").String() - log.Infof(text, title) + log.Infof("Running phase: %s", title) start := time.Now() result := phase.Run() diff --git a/pkg/util/logo/logo.go b/pkg/util/logo/logo.go index 58ea1a19..b8466e3d 100644 --- a/pkg/util/logo/logo.go +++ b/pkg/util/logo/logo.go @@ -1,28 +1,25 @@ -//go:build !windows -// +build !windows - package logo -// Logo is the logo displayed on startup. +// Logo logo without color var Logo = ` -                                                                                 -                       ..,,,,,..                                                 -              .:i1fCG0088@@@@@880GCLt;,               .,,::::::,,...             -         ,;tC0@@@@@@@@@@@@@@@@@@@@@@@@@0:,     .,:ii111i;:,,..                   -      ,;1ttt1;;::::;;itfCG8@@@@@@@@@i @@@@0fi1t111i;,.                           -     .,.                  .:1L0@@   @8GCft111ii1;                                -                               :f0CLft1i;i1tL . @8Cti:.               .,:,.      -                           .:;i1111i;itC;  @@@@@@@@@@@80GCLftt11ttfLLLf1:.       -                    .,:;ii1111i:,.    , G8@@@@@@@@@@@@@@@@@@@@@@@0Lt;,           -            ...,,::;;;;::,.               ,;itfLCGGG0GGGCLft1;:.                 -                                                                                 -                                                                                 -                                                                                 -   ;1:      i1, .1, .11111i:      .1i     :1;     ,1, i11111111: ;i   ;1111;     -   G@GC:  1G0@i ;@1 ;@t:::;G0.   .0G8f    L@GC:   i@i :;;;@G;;;, C@ .80i:,:;     -   C8 10CGC::@i :@i :@f:;;;CG.  .0G ,@L   f@.iGL, ;@;     @L     L@. tLft1;.     -   G8   1;  ;@i ;@i :@L11C@t   ,08fffL@L  L@.  10fi@;    .@L     L@.    .:t@1    -   C0       ;@i :@i :@i   ;Gf..0C     ,8L f@.   .f0@;    .8L     L8  fft11fG;    -   ..        .   .   ..     ,..,        , ..      ..      ..     ..  .,:::,      -                                                                                 + + ..,,,,,.. + .:i1fCG0088@@@@@880GCLt;, .,,::::::,,... + ,;tC0@@@@@@@@@@@@@@@@@@@@@@@@@0:, .,:ii111i;:,,.. + ,;1ttt1;;::::;;itfCG8@@@@@@@@@i @@@@0fi1t111i;,. + .,. .:1L0@@ @8GCft111ii1; + :f0CLft1i;i1tL . @8Cti:. .,:,. + .:;i1111i;itC; @@@@@@@@@@@80GCLftt11ttfLLLf1:. + .,:;ii1111i:,. , G8@@@@@@@@@@@@@@@@@@@@@@@0Lt;, + ...,,::;;;;::,. ,;itfLCGGG0GGGCLft1;:. + + + + ;1: i1, .1, .11111i: .1i :1; ,1, i11111111: ;i ;1111; + G@GC: 1G0@i ;@1 ;@t:::;G0. .0G8f L@GC: i@i :;;;@G;;;, C@ .80i:,:; + C8 10CGC::@i :@i :@f:;;;CG. .0G ,@L f@.iGL, ;@; @L L@. tLft1;. + G8 1; ;@i ;@i :@L11C@t ,08fffL@L L@. 10fi@; .@L L@. .:t@1 + C0 ;@i :@i :@i ;Gf..0C ,8L f@. .f0@; .8L L8 fft11fG; + .. . . .. ,.., , .. .. .. .. .,:::, + ` diff --git a/pkg/util/logo/logo_windows.go b/pkg/util/logo/logo_windows.go deleted file mode 100644 index 860b7395..00000000 --- a/pkg/util/logo/logo_windows.go +++ /dev/null @@ -1,28 +0,0 @@ -//go:build windows -// +build windows - -package logo - -// Logo logo without color -var Logo = ` - - ..,,,,,.. - .:i1fCG0088@@@@@880GCLt;, .,,::::::,,... - ,;tC0@@@@@@@@@@@@@@@@@@@@@@@@@0:, .,:ii111i;:,,.. - ,;1ttt1;;::::;;itfCG8@@@@@@@@@i @@@@0fi1t111i;,. - .,. .:1L0@@ @8GCft111ii1; - :f0CLft1i;i1tL . @8Cti:. .,:,. - .:;i1111i;itC; @@@@@@@@@@@80GCLftt11ttfLLLf1:. - .,:;ii1111i:,. , G8@@@@@@@@@@@@@@@@@@@@@@@0Lt;, - ...,,::;;;;::,. ,;itfLCGGG0GGGCLft1;:. - - - - ;1: i1, .1, .11111i: .1i :1; ,1, i11111111: ;i ;1111; - G@GC: 1G0@i ;@1 ;@t:::;G0. .0G8f L@GC: i@i :;;;@G;;;, C@ .80i:,:; - C8 10CGC::@i :@i :@f:;;;CG. .0G ,@L f@.iGL, ;@; @L L@. tLft1;. - G8 1; ;@i ;@i :@L11C@t ,08fffL@L L@. 10fi@; .@L L@. .:t@1 - C0 ;@i :@i :@i ;Gf..0C ,8L f@. .f0@; .8L L8 fft11fG; - .. . . .. ,.., , .. .. .. .. .,:::, - -`