Skip to content

Commit fc5ee6c

Browse files
committed
Replace go-spew with pp
1 parent 08e384f commit fc5ee6c

File tree

108 files changed

+12467
-3314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+12467
-3314
lines changed

cmd/dump_project.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"github.com/Graylog2/graylog-project-cli/config"
66
"github.com/Graylog2/graylog-project-cli/logger"
77
"github.com/Graylog2/graylog-project-cli/project"
8-
"github.com/davecgh/go-spew/spew"
8+
"github.com/k0kubun/pp/v3"
99
"github.com/spf13/cobra"
1010
"os"
1111
)
@@ -27,13 +27,13 @@ var parseManifestCmd = &cobra.Command{
2727
projectData := project.New(cfg, cfg.Checkout.ManifestFiles)
2828

2929
logger.Println("#### Project ####")
30-
logger.Println(spew.Sdump(projectData))
30+
logger.Println(pp.Sprint(projectData))
3131
logger.Println("")
3232
logger.Println("#### Maven Dependencies ####")
33-
logger.Println(spew.Sdump(project.MavenDependencies(projectData)))
33+
logger.Println(pp.Sprint(project.MavenDependencies(projectData)))
3434
logger.Println("")
3535
logger.Println("#### Maven Assemblies ####")
36-
logger.Println(spew.Sdump(dumpMavenAssemblies(projectData)))
36+
logger.Println(pp.Sprint(dumpMavenAssemblies(projectData)))
3737
logger.Println("")
3838
},
3939
}

config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package config
22

33
import (
44
"github.com/Graylog2/graylog-project-cli/logger"
5-
"github.com/davecgh/go-spew/spew"
5+
"github.com/k0kubun/pp/v3"
66
"github.com/spf13/viper"
77
"os"
88
)
@@ -61,7 +61,7 @@ func get(config Config) Config {
6161
logger.Fatal("Unable to unmarshal config: %v", err)
6262
}
6363

64-
logger.Debug("Active configuration:\n%v", spew.Sdump(config))
64+
logger.Debug("Active configuration:\n%v", pp.Sprint(config))
6565

6666
return config
6767
}

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ module github.com/Graylog2/graylog-project-cli
33
go 1.18
44

55
require (
6-
github.com/davecgh/go-spew v1.1.1
76
github.com/fatih/color v1.13.0
87
github.com/golang-jwt/jwt/v4 v4.4.3
98
github.com/google/go-github/v27 v27.0.6
109
github.com/hashicorp/go-version v1.6.0
1110
github.com/imdario/mergo v0.3.13
11+
github.com/k0kubun/pp/v3 v3.2.0
1212
github.com/manifoldco/promptui v0.9.0
1313
github.com/mattn/go-isatty v0.0.17
1414
github.com/pelletier/go-toml/v2 v2.0.6
@@ -19,7 +19,7 @@ require (
1919
github.com/yuin/goldmark v1.5.3
2020
golang.org/x/exp v0.0.0-20221230185412-738e83a70c30
2121
golang.org/x/oauth2 v0.3.0
22-
golang.org/x/text v0.5.0
22+
golang.org/x/text v0.6.0
2323
)
2424

2525
require (
@@ -40,7 +40,7 @@ require (
4040
github.com/subosito/gotenv v1.4.1 // indirect
4141
golang.org/x/crypto v0.4.0 // indirect
4242
golang.org/x/net v0.4.0 // indirect
43-
golang.org/x/sys v0.3.0 // indirect
43+
golang.org/x/sys v0.4.0 // indirect
4444
google.golang.org/appengine v1.6.7 // indirect
4545
google.golang.org/protobuf v1.28.1 // indirect
4646
gopkg.in/ini.v1 v1.67.0 // indirect

go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
151151
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
152152
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
153153
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
154+
github.com/k0kubun/pp/v3 v3.2.0 h1:h33hNTZ9nVFNP3u2Fsgz8JXiF5JINoZfFq4SvKJwNcs=
155+
github.com/k0kubun/pp/v3 v3.2.0/go.mod h1:ODtJQbQcIRfAD3N+theGCV1m/CBxweERz2dapdz1EwA=
154156
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
155157
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
156158
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -362,17 +364,17 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
362364
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
363365
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
364366
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
365-
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
366-
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
367+
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
368+
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
367369
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
368370
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
369371
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
370372
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
371373
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
372374
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
373375
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
374-
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
375-
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
376+
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
377+
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
376378
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
377379
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
378380
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

main.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
package main
22

3-
import "github.com/Graylog2/graylog-project-cli/cmd"
3+
import (
4+
"github.com/Graylog2/graylog-project-cli/cmd"
5+
"github.com/k0kubun/pp/v3"
6+
"github.com/mattn/go-isatty"
7+
"os"
8+
)
9+
10+
func init() {
11+
pp.Default.SetColoringEnabled(isatty.IsTerminal(os.Stdout.Fd()))
12+
}
413

514
func main() {
615
cmd.Execute()

vendor/github.com/davecgh/go-spew/LICENSE

Lines changed: 0 additions & 15 deletions
This file was deleted.

vendor/github.com/davecgh/go-spew/spew/bypass.go

Lines changed: 0 additions & 145 deletions
This file was deleted.

vendor/github.com/davecgh/go-spew/spew/bypasssafe.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)