Refactor: Move existing class to tlscommon

elastic · May 4, 2018 · 5dad679 · 5dad679
1 parent 62f04a0
commit 5dad679
Show file tree

Hide file tree

Showing 21 changed files with 90 additions and 85 deletions.
diff --git a/heartbeat/monitors/active/http/config.go b/heartbeat/monitors/active/http/config.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/elastic/beats/libbeat/common/match"
-	"github.com/elastic/beats/libbeat/outputs"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 
 	"github.com/elastic/beats/heartbeat/monitors"
 )
@@ -26,7 +26,7 @@ type Config struct {
 	Password string `config:"password"`
 
 	// configure tls (if not configured HTTPS will use system defaults)
-	TLS *outputs.TLSConfig `config:"ssl"`
+	TLS *tlscommon.Config `config:"ssl"`
 
 	// http(s) ping validation
 	Check checkConfig `config:"check"`

diff --git a/heartbeat/monitors/active/tcp/config.go b/heartbeat/monitors/active/tcp/config.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/elastic/beats/libbeat/outputs"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/outputs/transport"
 
 	"github.com/elastic/beats/heartbeat/monitors"
@@ -22,7 +22,7 @@ type Config struct {
 	Socks5 transport.ProxyConfig `config:",inline"`
 
 	// configure tls
-	TLS *outputs.TLSConfig `config:"ssl"`
+	TLS *tlscommon.Config `config:"ssl"`
 
 	Timeout time.Duration `config:"timeout"`
 

diff --git a/heartbeat/scripts/generator/{{monitor}}/config.go.tmpl b/heartbeat/scripts/generator/{{monitor}}/config.go.tmpl
@@ -3,9 +3,9 @@ package {{monitor}}
 import (
 	"time"
 
-	"github.com/elastic/beats/libbeat/outputs"
 	"github.com/elastic/beats/libbeat/outputs/transport"
 
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/heartbeat/monitors"
 )
 
@@ -19,7 +19,7 @@ type config struct {
 	Mode   monitors.IPSettings   `config:",inline"`
 
 	// configure tls
-	TLS *outputs.TLSConfig `config:"ssl"`
+	TLS *tlscommon.Config `config:"ssl"`
 
 	// configure validation
 	Check   checkConfig   `config:"check"`

diff --git a/libbeat/monitoring/report/elasticsearch/config.go b/libbeat/monitoring/report/elasticsearch/config.go
@@ -3,27 +3,27 @@ package elasticsearch
 import (
 	"time"
 
-	"github.com/elastic/beats/libbeat/outputs"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 )
 
 // config is subset of libbeat/outputs/elasticsearch config tailored
 // for reporting metrics only
 type config struct {
 	Hosts            []string
 	Protocol         string
-	Params           map[string]string  `config:"parameters"`
-	Headers          map[string]string  `config:"headers"`
-	Username         string             `config:"username"`
-	Password         string             `config:"password"`
-	ProxyURL         string             `config:"proxy_url"`
-	CompressionLevel int                `config:"compression_level" validate:"min=0, max=9"`
-	TLS              *outputs.TLSConfig `config:"ssl"`
-	MaxRetries       int                `config:"max_retries"`
-	Timeout          time.Duration      `config:"timeout"`
-	Period           time.Duration      `config:"period"`
-	BulkMaxSize      int                `config:"bulk_max_size" validate:"min=0"`
-	BufferSize       int                `config:"buffer_size"`
-	Tags             []string           `config:"tags"`
+	Params           map[string]string `config:"parameters"`
+	Headers          map[string]string `config:"headers"`
+	Username         string            `config:"username"`
+	Password         string            `config:"password"`
+	ProxyURL         string            `config:"proxy_url"`
+	CompressionLevel int               `config:"compression_level" validate:"min=0, max=9"`
+	TLS              *tlscommon.Config `config:"ssl"`
+	MaxRetries       int               `config:"max_retries"`
+	Timeout          time.Duration     `config:"timeout"`
+	Period           time.Duration     `config:"period"`
+	BulkMaxSize      int               `config:"bulk_max_size" validate:"min=0"`
+	BufferSize       int               `config:"buffer_size"`
+	Tags             []string          `config:"tags"`
 }
 
 var defaultConfig = config{

diff --git a/libbeat/monitoring/report/elasticsearch/elasticsearch.go b/libbeat/monitoring/report/elasticsearch/elasticsearch.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/monitoring"
 	"github.com/elastic/beats/libbeat/monitoring/report"
@@ -72,7 +73,7 @@ func makeReporter(beat beat.Info, cfg *common.Config) (report.Reporter, error) {
 	if proxyURL != nil {
 		logp.Info("Using proxy URL: %s", proxyURL)
 	}
-	tlsConfig, err := outputs.LoadTLSConfig(config.TLS)
+	tlsConfig, err := tlscommon.LoadTLSConfig(config.TLS)
 	if err != nil {
 		return nil, err
 	}

diff --git a/libbeat/outputs/elasticsearch/config.go b/libbeat/outputs/elasticsearch/config.go
@@ -3,24 +3,24 @@ package elasticsearch
 import (
 	"time"
 
-	"github.com/elastic/beats/libbeat/outputs"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 )
 
 type elasticsearchConfig struct {
-	Protocol         string             `config:"protocol"`
-	Path             string             `config:"path"`
-	Params           map[string]string  `config:"parameters"`
-	Headers          map[string]string  `config:"headers"`
-	Username         string             `config:"username"`
-	Password         string             `config:"password"`
-	ProxyURL         string             `config:"proxy_url"`
-	LoadBalance      bool               `config:"loadbalance"`
-	CompressionLevel int                `config:"compression_level" validate:"min=0, max=9"`
-	TLS              *outputs.TLSConfig `config:"ssl"`
-	BulkMaxSize      int                `config:"bulk_max_size"`
-	MaxRetries       int                `config:"max_retries"`
-	Timeout          time.Duration      `config:"timeout"`
-	Backoff          Backoff            `config:"backoff"`
+	Protocol         string            `config:"protocol"`
+	Path             string            `config:"path"`
+	Params           map[string]string `config:"parameters"`
+	Headers          map[string]string `config:"headers"`
+	Username         string            `config:"username"`
+	Password         string            `config:"password"`
+	ProxyURL         string            `config:"proxy_url"`
+	LoadBalance      bool              `config:"loadbalance"`
+	CompressionLevel int               `config:"compression_level" validate:"min=0, max=9"`
+	TLS              *tlscommon.Config `config:"ssl"`
+	BulkMaxSize      int               `config:"bulk_max_size"`
+	MaxRetries       int               `config:"max_retries"`
+	Timeout          time.Duration     `config:"timeout"`
+	Backoff          Backoff           `config:"backoff"`
 }
 
 type Backoff struct {

diff --git a/libbeat/outputs/elasticsearch/elasticsearch.go b/libbeat/outputs/elasticsearch/elasticsearch.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/outputs"
 	"github.com/elastic/beats/libbeat/outputs/outil"
@@ -81,7 +82,7 @@ func makeES(
 		return outputs.Fail(err)
 	}
 
-	tlsConfig, err := outputs.LoadTLSConfig(config.TLS)
+	tlsConfig, err := tlscommon.LoadTLSConfig(config.TLS)
 	if err != nil {
 		return outputs.Fail(err)
 	}
@@ -188,7 +189,7 @@ func NewElasticsearchClients(cfg *common.Config) ([]Client, error) {
 		return nil, err
 	}
 
-	tlsConfig, err := outputs.LoadTLSConfig(config.TLS)
+	tlsConfig, err := tlscommon.LoadTLSConfig(config.TLS)
 	if err != nil {
 		return nil, err
 	}

diff --git a/libbeat/outputs/kafka/config.go b/libbeat/outputs/kafka/config.go
@@ -8,13 +8,13 @@ import (
 
 	"github.com/elastic/beats/libbeat/common"
 	"github.com/elastic/beats/libbeat/common/fmtstr"
-	"github.com/elastic/beats/libbeat/outputs"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/outputs/codec"
 )
 
 type kafkaConfig struct {
 	Hosts           []string                  `config:"hosts"               validate:"required"`
-	TLS             *outputs.TLSConfig        `config:"ssl"`
+	TLS             *tlscommon.Config         `config:"ssl"`
 	Timeout         time.Duration             `config:"timeout"             validate:"min=1"`
 	Metadata        metaConfig                `config:"metadata"`
 	Key             *fmtstr.EventFormatString `config:"key"`

diff --git a/libbeat/outputs/kafka/kafka.go b/libbeat/outputs/kafka/kafka.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/monitoring"
 	"github.com/elastic/beats/libbeat/monitoring/adapter"
@@ -176,7 +177,7 @@ func newKafkaConfig(config *kafkaConfig) (*sarama.Config, error) {
 	k.Net.KeepAlive = config.KeepAlive
 	k.Producer.Timeout = config.BrokerTimeout
 
-	tls, err := outputs.LoadTLSConfig(config.TLS)
+	tls, err := tlscommon.LoadTLSConfig(config.TLS)
 	if err != nil {
 		return nil, err
 	}

diff --git a/libbeat/outputs/logstash/config.go b/libbeat/outputs/logstash/config.go
@@ -3,7 +3,7 @@ package logstash
 import (
 	"time"
 
-	"github.com/elastic/beats/libbeat/outputs"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/outputs/transport"
 )
 
@@ -18,7 +18,7 @@ type Config struct {
 	Pipelining       int                   `config:"pipelining"        validate:"min=0"`
 	CompressionLevel int                   `config:"compression_level" validate:"min=0, max=9"`
 	MaxRetries       int                   `config:"max_retries"       validate:"min=-1"`
-	TLS              *outputs.TLSConfig    `config:"ssl"`
+	TLS              *tlscommon.Config     `config:"ssl"`
 	Proxy            transport.ProxyConfig `config:",inline"`
 	Backoff          Backoff               `config:"backoff"`
 }

diff --git a/libbeat/outputs/logstash/logstash.go b/libbeat/outputs/logstash/logstash.go
@@ -3,6 +3,7 @@ package logstash
 import (
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/outputs"
 	"github.com/elastic/beats/libbeat/outputs/transport"
@@ -38,7 +39,7 @@ func makeLogstash(
 		return outputs.Fail(err)
 	}
 
-	tls, err := outputs.LoadTLSConfig(config.TLS)
+	tls, err := tlscommon.LoadTLSConfig(config.TLS)
 	if err != nil {
 		return outputs.Fail(err)
 	}

diff --git a/libbeat/outputs/redis/config.go b/libbeat/outputs/redis/config.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
-	"github.com/elastic/beats/libbeat/outputs"
 	"github.com/elastic/beats/libbeat/outputs/codec"
 	"github.com/elastic/beats/libbeat/outputs/transport"
 )
@@ -20,7 +20,7 @@ type redisConfig struct {
 	Timeout     time.Duration         `config:"timeout"`
 	BulkMaxSize int                   `config:"bulk_max_size"`
 	MaxRetries  int                   `config:"max_retries"`
-	TLS         *outputs.TLSConfig    `config:"ssl"`
+	TLS         *tlscommon.Config     `config:"ssl"`
 	Proxy       transport.ProxyConfig `config:",inline"`
 	Codec       codec.Config          `config:"codec"`
 	Db          int                   `config:"db"`

diff --git a/libbeat/outputs/redis/redis.go b/libbeat/outputs/redis/redis.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/libbeat/outputs"
 	"github.com/elastic/beats/libbeat/outputs/codec"
@@ -80,7 +81,7 @@ func makeRedis(
 		return outputs.Fail(err)
 	}
 
-	tls, err := outputs.LoadTLSConfig(config.TLS)
+	tls, err := tlscommon.LoadTLSConfig(config.TLS)
 	if err != nil {
 		return outputs.Fail(err)
 	}

diff --git a/libbeat/outputs/transport/transptest/testing.go b/libbeat/outputs/transport/transptest/testing.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/elastic/beats/libbeat/outputs"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/outputs/transport"
 )
 
@@ -108,8 +108,8 @@ func NewMockServerTLS(t *testing.T, to time.Duration, cert string, proxy *transp
 		t.Fatalf("failed to generate TCP listener")
 	}
 
-	tlsConfig, err := outputs.LoadTLSConfig(&outputs.TLSConfig{
-		Certificate: outputs.CertificateConfig{
+	tlsConfig, err := tlscommon.LoadTLSConfig(&tlscommon.Config{
+		Certificate: tlscommon.CertificateConfig{
 			Certificate: cert + ".pem",
 			Key:         cert + ".key",
 		},
@@ -158,7 +158,7 @@ func connectTCP(timeout time.Duration) TransportFactory {
 
 func connectTLS(timeout time.Duration, certName string) TransportFactory {
 	return func(addr string, proxy *transport.ProxyConfig) (*transport.Client, error) {
-		tlsConfig, err := outputs.LoadTLSConfig(&outputs.TLSConfig{
+		tlsConfig, err := tlscommon.LoadTLSConfig(&tlscommon.Config{
 			CAs: []string{certName + ".pem"},
 		})
 		if err != nil {

diff --git a/libbeat/setup/kibana/client.go b/libbeat/setup/kibana/client.go
@@ -13,8 +13,8 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/logp"
-	"github.com/elastic/beats/libbeat/outputs"
 	"github.com/elastic/beats/libbeat/outputs/transport"
 )
 
@@ -91,7 +91,7 @@ func NewKibanaClient(cfg *common.Config) (*Client, error) {
 
 	var dialer, tlsDialer transport.Dialer
 
-	tlsConfig, err := outputs.LoadTLSConfig(config.TLS)
+	tlsConfig, err := tlscommon.LoadTLSConfig(config.TLS)
 	if err != nil {
 		return nil, fmt.Errorf("fail to load the TLS config: %v", err)
 	}

diff --git a/libbeat/setup/kibana/config.go b/libbeat/setup/kibana/config.go
@@ -3,17 +3,17 @@ package kibana
 import (
 	"time"
 
-	"github.com/elastic/beats/libbeat/outputs"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 )
 
 type kibanaConfig struct {
-	Protocol string             `config:"protocol"`
-	Host     string             `config:"host"`
-	Path     string             `config:"path"`
-	Username string             `config:"username"`
-	Password string             `config:"password"`
-	TLS      *outputs.TLSConfig `config:"ssl"`
-	Timeout  time.Duration      `config:"timeout"`
+	Protocol string            `config:"protocol"`
+	Host     string            `config:"host"`
+	Path     string            `config:"path"`
+	Username string            `config:"username"`
+	Password string            `config:"password"`
+	TLS      *tlscommon.Config `config:"ssl"`
+	Timeout  time.Duration     `config:"timeout"`
 }
 
 var (

diff --git a/metricbeat/helper/http.go b/metricbeat/helper/http.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/elastic/beats/libbeat/outputs"
+	"github.com/elastic/beats/libbeat/common/transport/tlscommon"
 	"github.com/elastic/beats/libbeat/outputs/transport"
 	"github.com/elastic/beats/metricbeat/mb"
 )
@@ -27,9 +27,9 @@ type HTTP struct {
 // NewHTTP creates new http helper
 func NewHTTP(base mb.BaseMetricSet) (*HTTP, error) {
 	config := struct {
-		TLS     *outputs.TLSConfig `config:"ssl"`
-		Timeout time.Duration      `config:"timeout"`
-		Headers map[string]string  `config:"headers"`
+		TLS     *tlscommon.Config `config:"ssl"`
+		Timeout time.Duration     `config:"timeout"`
+		Headers map[string]string `config:"headers"`
 	}{}
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err
@@ -39,7 +39,7 @@ func NewHTTP(base mb.BaseMetricSet) (*HTTP, error) {
 		config.Headers = map[string]string{}
 	}
 
-	tlsConfig, err := outputs.LoadTLSConfig(config.TLS)
+	tlsConfig, err := tlscommon.LoadTLSConfig(config.TLS)
 	if err != nil {
 		return nil, err
 	}