Skip to content

Commit

Permalink
Bump (#43)
Browse files Browse the repository at this point in the history 
* Updated nebula to 1.5.2

* Updated cobra to 1.3.0 and oauth2
  • Loading branch information
@SlyngDK
SlyngDK authored Jan 12, 2022
1 parent 61f0156 commit 699bab5
Show file tree
Hide file tree
Showing 9 changed files with 203 additions and 113 deletions.
8 changes: 4 additions & 4 deletions cmd/agent/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"

"github.com/sirupsen/logrus"
"github.com/slackhq/nebula"
conf "github.com/slackhq/nebula/config"
"github.com/slyngdk/nebula-provisioner/protocol"
"github.com/spf13/cobra"
"google.golang.org/grpc"
Expand All @@ -40,7 +40,7 @@ var (
logLevel string
configPath string
configDir string
config *nebula.Config
config *conf.C

rootCmd = &cobra.Command{}
)
Expand Down Expand Up @@ -68,7 +68,7 @@ func initConfig() {
l = logrus.New()
l.Out = os.Stdout

config = nebula.NewConfig(l)
config = conf.NewC(l)

if configPath == "" {
configPath = getConfigPath()
Expand Down Expand Up @@ -122,7 +122,7 @@ type agentClient struct {
client protocol.AgentServiceClient
}

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

var opts []grpc.DialOption

Expand Down
6 changes: 3 additions & 3 deletions cmd/server-client/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"os"

"github.com/sirupsen/logrus"
"github.com/slackhq/nebula"
conf "github.com/slackhq/nebula/config"
"github.com/spf13/cobra"
)

var (
l *logrus.Logger
configPath string
config *nebula.Config
config *conf.C

rootCmd = &cobra.Command{}
)
Expand All @@ -38,7 +38,7 @@ func init() {
func initConfig() {
l = logrus.New()
l.Out = os.Stdout
config = nebula.NewConfig(l)
config = conf.NewC(l)
if configPath != "" {
err := config.Load(configPath)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions cmd/server-client/server-client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"fmt"

"github.com/slackhq/nebula"
conf "github.com/slackhq/nebula/config"
"github.com/slyngdk/nebula-provisioner/protocol"
"google.golang.org/grpc"
)
Expand All @@ -13,7 +13,7 @@ type serverClient struct {
client protocol.ServerCommandClient
}

func NewClient(config *nebula.Config) (*serverClient, error) {
func NewClient(config *conf.C) (*serverClient, error) {

var opts []grpc.DialOption

Expand Down
4 changes: 2 additions & 2 deletions cmd/server/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"

"github.com/sirupsen/logrus"
"github.com/slackhq/nebula"
"github.com/slackhq/nebula/config"
"github.com/slyngdk/nebula-provisioner/server"
)

Expand Down Expand Up @@ -43,7 +43,7 @@ func main() {
l := logrus.New()
l.Out = os.Stdout

config := nebula.NewConfig(l)
config := config.NewC(l)
err := config.Load(*configPath)
if err != nil {
fmt.Printf("failed to load config: %s", err)
Expand Down
42 changes: 13 additions & 29 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,59 +12,43 @@ require (
github.com/lafriks/go-spaproxy v0.2.0
github.com/mitchellh/go-ps v1.0.0
github.com/sirupsen/logrus v1.8.1
github.com/slackhq/nebula v1.4.0
github.com/spf13/cobra v1.2.1
github.com/slackhq/nebula v1.5.2
github.com/spf13/cobra v1.3.0
github.com/vektah/gqlparser/v2 v2.2.0
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
google.golang.org/grpc v1.43.0
google.golang.org/protobuf v1.27.1
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)

require (
github.com/agnivade/levenshtein v1.1.0 // indirect
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cyberdelia/go-metrics-graphite v0.0.0-20161219230853-39f87cc3b432 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/dgraph-io/ristretto v0.1.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/flynn/noise v0.0.0-20210331153838-4bdb43be3117 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/flatbuffers v1.12.1 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/klauspost/compress v1.12.3 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/miekg/dns v1.1.40 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/nbrownus/go-metrics-prometheus v0.0.0-20180622211546-6e6d5173d99c // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.7.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.11.1 // indirect
github.com/prometheus/procfs v0.1.3 // indirect
github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 // indirect
github.com/songgao/water v0.0.0-20190725173103-fd331bda3f4b // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/vishvananda/netlink v1.0.1-0.20190522153524-00009fb8606a // indirect
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.8-0.20211004125949-5bd84dd9b33b // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading

0 comments on commit 699bab5

Please sign in to comment.