Put TLS config in seperate Go package.

tools/kafka-console-consumer/kafka-console-consumer.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"crypto/tls"
 	"flag"
 	"fmt"
 	"log"
@@ -12,6 +11,7 @@ import (
 	"sync"
 
 	"github.com/Shopify/sarama"
+	"github.com/Shopify/sarama/tools/tls"
 )
 
 var (
@@ -57,7 +57,7 @@ func main() {
 
 	config := sarama.NewConfig()
 	if *tlsEnabled {
-		tlsConfig, err := newTLSConfig(*tlsClientCert, *tlsClientKey)
+		tlsConfig, err := tls.NewConfig(*tlsClientCert, *tlsClientKey)
 		if err != nil {
 			printErrorAndExit(69, "Failed to create TLS config: %s", err)
 		}
@@ -161,17 +161,3 @@ func printUsageErrorAndExit(format string, values ...interface{}) {
 	flag.PrintDefaults()
 	os.Exit(64)
 }
-
-func newTLSConfig(clientCert, clientKey string) (*tls.Config, error) {
-	tlsConfig := tls.Config{}
-
-	if clientCert != "" && clientKey != "" {
-		cert, err := tls.LoadX509KeyPair(clientCert, clientKey)
-		if err != nil {
-			return &tlsConfig, err
-		}
-		tlsConfig.Certificates = []tls.Certificate{cert}
-	}
-
-	return &tlsConfig, nil
-}

tools/kafka-console-producer/kafka-console-producer.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"crypto/tls"
 	"flag"
 	"fmt"
 	"io/ioutil"
@@ -10,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/Shopify/sarama"
+	"github.com/Shopify/sarama/tools/tls"
 	"github.com/rcrowley/go-metrics"
 )
 
@@ -51,7 +51,7 @@ func main() {
 	config.Producer.Return.Successes = true
 
 	if *tlsEnabled {
-		tlsConfig, err := newTLSConfig(*tlsClientCert, *tlsClientKey)
+		tlsConfig, err := tls.NewConfig(*tlsClientCert, *tlsClientKey)
 		if err != nil {
 			printErrorAndExit(69, "Failed to create TLS config: %s", err)
 		}
@@ -138,17 +138,3 @@ func stdinAvailable() bool {
 	stat, _ := os.Stdin.Stat()
 	return (stat.Mode() & os.ModeCharDevice) == 0
 }
-
-func newTLSConfig(clientCert, clientKey string) (*tls.Config, error) {
-	tlsConfig := tls.Config{}
-
-	if clientCert != "" && clientKey != "" {
-		cert, err := tls.LoadX509KeyPair(clientCert, clientKey)
-		if err != nil {
-			return &tlsConfig, err
-		}
-		tlsConfig.Certificates = []tls.Certificate{cert}
-	}
-
-	return &tlsConfig, nil
-}

tools/tls/config.go

@@ -0,0 +1,17 @@
+package tls
+
+import "crypto/tls"
+
+func NewConfig(clientCert, clientKey string) (*tls.Config, error) {
+	tlsConfig := tls.Config{}
+
+	if clientCert != "" && clientKey != "" {
+		cert, err := tls.LoadX509KeyPair(clientCert, clientKey)
+		if err != nil {
+			return &tlsConfig, err
+		}
+		tlsConfig.Certificates = []tls.Certificate{cert}
+	}
+
+	return &tlsConfig, nil
+}