Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] NewJSONFileWhitelist => NewConfigFileWhitelist #789

Merged
merged 3 commits into from
Jun 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 9 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,25 @@ go 1.16
require (
github.com/AudriusButkevicius/pfilter v0.0.0-20210515103320-4b4b86609d51
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
github.com/VictoriaMetrics/metrics v1.12.3
github.com/VictoriaMetrics/metrics v1.17.2
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/creack/pty v1.1.11 // indirect
github.com/go-chi/chi v4.1.2+incompatible
github.com/go-ole/go-ole v1.2.4 // indirect
github.com/google/go-github v17.0.0+incompatible
github.com/google/uuid v1.1.1
github.com/gorilla/securecookie v1.1.1
github.com/json-iterator/go v1.1.11 // indirect
github.com/klauspost/reedsolomon v1.9.9 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.13 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mholt/archiver/v3 v3.3.0
github.com/mmcloughlin/avo v0.0.0-20200523190732-4439b6b2c061 // indirect
github.com/pkg/profile v1.5.0
github.com/schollz/progressbar/v2 v2.15.0
github.com/shirou/gopsutil v2.20.5+incompatible
github.com/sirupsen/logrus v1.7.0
github.com/skycoin/dmsg v0.0.0-20201216183836-dae8a7acfc14
github.com/sirupsen/logrus v1.8.1
github.com/skycoin/dmsg v0.0.0-20210603142231-3cba29fefe94
github.com/skycoin/skycoin v0.27.1
github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
Expand All @@ -36,11 +37,11 @@ require (
github.com/xtaci/kcp-go v5.4.20+incompatible
github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 // indirect
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/net v0.0.0-20201021035429-f5854403a974
golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
golang.org/x/sys v0.0.0-20210603125802-9665404d3644
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
golang.org/x/tools v0.1.0 // indirect
golang.zx2c4.com/wireguard v0.0.20200320
nhooyr.io/websocket v1.8.2
Expand Down
75 changes: 37 additions & 38 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/visor/init_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func initDmsgpty(ctx context.Context, v *Visor, log *logging.Logger) error {
wl = dmsgpty.NewMemoryWhitelist()
} else {
var err error
if wl, err = dmsgpty.NewJSONFileWhiteList(v.conf.Dmsgpty.AuthFile); err != nil {
if wl, err = dmsgpty.NewConfigWhitelist(v.conf.Dmsgpty.AuthFile); err != nil {
return err
}
}
Expand Down
8 changes: 4 additions & 4 deletions vendor/github.com/VictoriaMetrics/metrics/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

198 changes: 61 additions & 137 deletions vendor/github.com/VictoriaMetrics/metrics/histogram.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading