From 94767f06d3c4c7e4c4f2dd23e4b1da9165ba2f74 Mon Sep 17 00:00:00 2001
From: Marc Di Luzio <marc.diluzio@gmail.com>
Date: Sun, 26 Jul 2020 23:53:29 +0100
Subject: [PATCH] Fix to disable TLS in tests

---
 cmd/rove/main.go      | 9 ++++++---
 cmd/rove/main_test.go | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cmd/rove/main.go b/cmd/rove/main.go
index 99a1f77..06999d3 100644
--- a/cmd/rove/main.go
+++ b/cmd/rove/main.go
@@ -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])
 	}
 
-	tls := &tls.Config{
-		InsecureSkipVerify: true,
+	var opts []grpc.DialOption
+	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
-	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 {
 		return err
 	}
diff --git a/cmd/rove/main_test.go b/cmd/rove/main_test.go
index d0e12d6..25e08ae 100644
--- a/cmd/rove/main_test.go
+++ b/cmd/rove/main_test.go
@@ -13,6 +13,7 @@ import (
 )
 
 func Test_InnerMain(t *testing.T) {
+	os.Setenv("NO_TLS", "1")
 
 	// Use temporary local user data
 	tmp, err := ioutil.TempDir(os.TempDir(), "rove-")