mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix to disable TLS in tests

Browse source
This commit is contained in:
Marc Di Luzio 2020-07-26 23:53:29 +01:00
parent 500e0f9557
commit 94767f06d3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cmd/rove/main.go
View file

@ -187,12 +187,15 @@ func InnerMain(command string, args ...string) error {
return fmt.Errorf("no host set in %s, set one with '%s config {HOST}'", ConfigPath(), os.Args[0]) return fmt.Errorf("no host set in %s, set one with '%s config {HOST}'", ConfigPath(), os.Args[0])
} }
tls := &tls.Config{ var opts []grpc.DialOption
InsecureSkipVerify: true, if len(os.Getenv("NO_TLS")) == 0 {
opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{})))
} else {
opts = append(opts, grpc.WithInsecure())
} }
// Set up the server // Set up the server
clientConn, err := grpc.Dial(fmt.Sprintf("%s:%d", config.Host, gRPCport), grpc.WithTransportCredentials(credentials.NewTLS(tls))) clientConn, err := grpc.Dial(fmt.Sprintf("%s:%d", config.Host, gRPCport), opts...)
if err != nil { if err != nil {
return err return err
} }

1
cmd/rove/main_test.go
View file

@ -13,6 +13,7 @@ import (
) )
func Test_InnerMain(t *testing.T) { func Test_InnerMain(t *testing.T) {
os.Setenv("NO_TLS", "1")
// Use temporary local user data // Use temporary local user data
tmp, err := ioutil.TempDir(os.TempDir(), "rove-") tmp, err := ioutil.TempDir(os.TempDir(), "rove-")