fix(e2e-test): carbon-clickhouse only adds tls certificates for

clickhouse with tls configs

cmd/e2e-test/clickhouse.go

@@ -30,6 +30,7 @@ type Clickhouse struct {
 	httpAddress  string `toml:"-"`
 	httpsAddress string `toml:"-"`
 	url          string `toml:"-"`
+	tlsurl       string `toml:"-"`
 	container    string `toml:"-"`
 	client       *http.Client
 }
@@ -97,7 +98,7 @@ func (c *Clickhouse) Start() (string, error) {
 			return "", err
 		}
 		port = strings.Split(c.httpsAddress, ":")[1]
-		c.url = "https://" + c.httpsAddress
+		c.tlsurl = "https://" + c.httpsAddress
 		chStart = append(chStart,
 			"-v", c.Dir+"/server.crt:/etc/clickhouse-server/server.crt",
 			"-v", c.Dir+"/server.key:/etc/clickhouse-server/server.key",
@@ -154,6 +155,13 @@ func (c *Clickhouse) URL() string {
 	return c.url
 }
 
+func (c *Clickhouse) TLSURL() (string, bool) {
+	if c.tlsurl == "" {
+		return "", false
+	}
+	return c.tlsurl, true
+}
+
 func (c *Clickhouse) Container() string {
 	return c.container
 }

cmd/e2e-test/e2etesting.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -72,6 +73,10 @@ type TestSchema struct {
 	chVersions map[string]bool `toml:"-"`
 }
 
+func (schema *TestSchema) HasTLSSettings() bool {
+	return strings.Contains(schema.dir, "tls")
+}
+
 func getFreeTCPPort(name string) (string, error) {
 	if len(name) == 0 {
 		name = "127.0.0.1:0"
@@ -165,7 +170,16 @@ func testCarbonClickhouse(
 	cch := CarbonClickhouse{
 		ConfigTpl: testDir + "/" + test.ConfigTpl,
 	}
-	err = cch.Start(clickhouse.URL())
+	if test.HasTLSSettings() {
+		url, exists := clickhouse.TLSURL()
+		if exists {
+			err = cch.Start(url)
+		} else {
+			err = errors.New("test has tls settings but there is no clickhouse tls url")
+		}
+	} else {
+		err = cch.Start(clickhouse.URL())
+	}
 	if err != nil {
 		logger.Error("starting carbon-clickhouse",
 			zap.String("config", test.name),

cmd/e2e-test/main.go

@@ -172,7 +172,7 @@ func main() {
 				for _, config := range configs {
 					testDir := config.Test.dir
 					client := &http.Client{Timeout: time.Minute}
-					if ch.TLSEnabled {
+					if ch.TLSEnabled && config.Test.HasTLSSettings() {
 						conf, err := helpercfg.ParseClientTLSConfig(&helpercfg.TLS{
 							Certificates: []helpercfg.CertificatePair{{testDir + "/client.key", testDir + "/client.crt"}},
 							CACertFiles:  []string{testDir + "/ca.crt"},