Skip to content

Commit 699bab5

Browse files
SlyngDKSlyngDK
authored
Bump (#43)
* Updated nebula to 1.5.2 * Updated cobra to 1.3.0 and oauth2
1 parent 61f0156 commit 699bab5

9 files changed

Lines changed: 203 additions & 113 deletions

File tree

‎cmd/agent/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"time"
1717

1818
"github.com/sirupsen/logrus"
19-
"github.com/slackhq/nebula"
19+
conf "github.com/slackhq/nebula/config"
2020
"github.com/slyngdk/nebula-provisioner/protocol"
2121
"github.com/spf13/cobra"
2222
"google.golang.org/grpc"
@@ -40,7 +40,7 @@ var (
4040
logLevel string
4141
configPath string
4242
configDir string
43-
config *nebula.Config
43+
config *conf.C
4444

4545
rootCmd = &cobra.Command{}
4646
)
@@ -68,7 +68,7 @@ func initConfig() {
6868
l = logrus.New()
6969
l.Out = os.Stdout
7070

71-
config = nebula.NewConfig(l)
71+
config = conf.NewC(l)
7272

7373
if configPath == "" {
7474
configPath = getConfigPath()
@@ -122,7 +122,7 @@ type agentClient struct {
122122
client protocol.AgentServiceClient
123123
}
124124

125-
func NewClient(l *logrus.Logger, config *nebula.Config) (*agentClient, error) {
125+
func NewClient(l *logrus.Logger, config *conf.C) (*agentClient, error) {
126126

127127
var opts []grpc.DialOption
128128

‎cmd/server-client/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import (
55
"os"
66

77
"github.com/sirupsen/logrus"
8-
"github.com/slackhq/nebula"
8+
conf "github.com/slackhq/nebula/config"
99
"github.com/spf13/cobra"
1010
)
1111

1212
var (
1313
l *logrus.Logger
1414
configPath string
15-
config *nebula.Config
15+
config *conf.C
1616

1717
rootCmd = &cobra.Command{}
1818
)
@@ -38,7 +38,7 @@ func init() {
3838
func initConfig() {
3939
l = logrus.New()
4040
l.Out = os.Stdout
41-
config = nebula.NewConfig(l)
41+
config = conf.NewC(l)
4242
if configPath != "" {
4343
err := config.Load(configPath)
4444
if err != nil {

‎cmd/server-client/server-client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"fmt"
55

6-
"github.com/slackhq/nebula"
6+
conf "github.com/slackhq/nebula/config"
77
"github.com/slyngdk/nebula-provisioner/protocol"
88
"google.golang.org/grpc"
99
)
@@ -13,7 +13,7 @@ type serverClient struct {
1313
client protocol.ServerCommandClient
1414
}
1515

16-
func NewClient(config *nebula.Config) (*serverClient, error) {
16+
func NewClient(config *conf.C) (*serverClient, error) {
1717

1818
var opts []grpc.DialOption
1919

‎cmd/server/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"os"
77

88
"github.com/sirupsen/logrus"
9-
"github.com/slackhq/nebula"
9+
"github.com/slackhq/nebula/config"
1010
"github.com/slyngdk/nebula-provisioner/server"
1111
)
1212

@@ -43,7 +43,7 @@ func main() {
4343
l := logrus.New()
4444
l.Out = os.Stdout
4545

46-
config := nebula.NewConfig(l)
46+
config := config.NewC(l)
4747
err := config.Load(*configPath)
4848
if err != nil {
4949
fmt.Printf("failed to load config: %s", err)

‎go.mod‎

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,43 @@ require (
1212
github.com/lafriks/go-spaproxy v0.2.0
1313
github.com/mitchellh/go-ps v1.0.0
1414
github.com/sirupsen/logrus v1.8.1
15-
github.com/slackhq/nebula v1.4.0
16-
github.com/spf13/cobra v1.2.1
15+
github.com/slackhq/nebula v1.5.2
16+
github.com/spf13/cobra v1.3.0
1717
github.com/vektah/gqlparser/v2 v2.2.0
18-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
19-
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
18+
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e
19+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
2020
google.golang.org/grpc v1.43.0
2121
google.golang.org/protobuf v1.27.1
2222
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
2323
)
2424

2525
require (
2626
github.com/agnivade/levenshtein v1.1.0 // indirect
27-
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect
28-
github.com/armon/go-radix v1.0.0 // indirect
29-
github.com/beorn7/perks v1.0.1 // indirect
3027
github.com/cespare/xxhash v1.1.0 // indirect
31-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
32-
github.com/cyberdelia/go-metrics-graphite v0.0.0-20161219230853-39f87cc3b432 // indirect
28+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3329
github.com/dgraph-io/ristretto v0.1.0 // indirect
3430
github.com/dustin/go-humanize v1.0.0 // indirect
35-
github.com/flynn/noise v0.0.0-20210331153838-4bdb43be3117 // indirect
3631
github.com/gogo/protobuf v1.3.2 // indirect
3732
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
38-
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
33+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3934
github.com/golang/snappy v0.0.4 // indirect
4035
github.com/google/flatbuffers v1.12.1 // indirect
41-
github.com/google/gopacket v1.1.19 // indirect
4236
github.com/gorilla/securecookie v1.1.1 // indirect
4337
github.com/gorilla/websocket v1.4.2 // indirect
4438
github.com/hashicorp/golang-lru v0.5.4 // indirect
4539
github.com/imdario/mergo v0.3.11 // indirect
4640
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4741
github.com/klauspost/compress v1.12.3 // indirect
48-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
49-
github.com/miekg/dns v1.1.40 // indirect
50-
github.com/mitchellh/mapstructure v1.4.1 // indirect
51-
github.com/nbrownus/go-metrics-prometheus v0.0.0-20180622211546-6e6d5173d99c // indirect
42+
github.com/mitchellh/mapstructure v1.4.3 // indirect
5243
github.com/pkg/errors v0.9.1 // indirect
53-
github.com/prometheus/client_golang v1.7.1 // indirect
54-
github.com/prometheus/client_model v0.2.0 // indirect
55-
github.com/prometheus/common v0.11.1 // indirect
56-
github.com/prometheus/procfs v0.1.3 // indirect
57-
github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 // indirect
58-
github.com/songgao/water v0.0.0-20190725173103-fd331bda3f4b // indirect
5944
github.com/spf13/pflag v1.0.5 // indirect
60-
github.com/vishvananda/netlink v1.0.1-0.20190522153524-00009fb8606a // indirect
61-
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
6245
go.opencensus.io v0.23.0 // indirect
63-
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
64-
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
65-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
66-
golang.org/x/text v0.3.6 // indirect
46+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
47+
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
48+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
49+
golang.org/x/text v0.3.8-0.20211004125949-5bd84dd9b33b // indirect
6750
google.golang.org/appengine v1.6.7 // indirect
68-
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
51+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
52+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
6953
gopkg.in/yaml.v2 v2.4.0 // indirect
7054
)

0 commit comments

Comments
 (0)