address a few issues

jaegertracing · Dec 20, 2019 · b7d5be8 · b7d5be8
1 parent 0eaf54c
commit b7d5be8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/cmd/agent/app/reporter/grpc/flags.go b/cmd/agent/app/reporter/grpc/flags.go
@@ -24,11 +24,11 @@ import (
 )
 
 const (
-	gRPCPrefix        = "reporter.grpc."
-	collectorHostPort = gRPCPrefix + "host-port"
-	retry             = gRPCPrefix + "retry.max"
+	gRPCPrefix        = "reporter.grpc"
+	collectorHostPort = gRPCPrefix + ".host-port"
+	retry             = gRPCPrefix + ".retry.max"
 	defaultMaxRetry   = 3
-	discoveryMinPeers = gRPCPrefix + "discovery.min-peers"
+	discoveryMinPeers = gRPCPrefix + ".discovery.min-peers"
 )
 
 var tlsFlagsConfig = tlscfg.ClientFlagsConfig{

diff --git a/pkg/config/tlscfg/options.go b/pkg/config/tlscfg/options.go
@@ -47,6 +47,8 @@ func (p Options) Config() (*tls.Config, error) {
 	tlsCfg := &tls.Config{
 		RootCAs:    certPool,
 		ServerName: p.ServerName,
+		// #nosec G402
+		InsecureSkipVerify: p.SkipHostVerify,
 	}
 
 	if (p.CertPath == "" && p.KeyPath != "") || (p.CertPath != "" && p.KeyPath == "") {

diff --git a/pkg/es/config/config.go b/pkg/es/config/config.go
@@ -17,6 +17,7 @@ package config
 
 import (
 	"context"
+	"crypto/tls"
 	"io/ioutil"
 	"net/http"
 	"path/filepath"
@@ -291,8 +292,10 @@ func (c *Configuration) getConfigOptions(logger *zap.Logger) ([]elastic.ClientOp
 		}
 	} else {
 		httpTransport := &http.Transport{
-      Proxy: http.ProxyFromEnvironment,
-    }
+			Proxy: http.ProxyFromEnvironment,
+			// #nosec G402
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: c.TLS.SkipHostVerify},
+		}
 		if c.TLS.CAPath != "" {
 			config, err := c.TLS.Config()
 			if err != nil {