Fix IP SAN issue with tls (#15)

SneaksAndData · Feb 26, 2025 · 2bcd4c5 · 2bcd4c5
1 parent 9bfad58
commit 2bcd4c5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pkg/checkpoint/request/cql_store.go b/pkg/checkpoint/request/cql_store.go
@@ -11,6 +11,7 @@ import (
 	"github.com/scylladb/gocqlx/v3"
 	"io"
 	"k8s.io/klog/v2"
+	"strconv"
 )
 
 type CqlStore struct {
@@ -80,7 +81,7 @@ func NewAstraCqlStoreConfig(logger klog.Logger, config *AstraBundleConfig) *Astr
 
 	caCertPool := x509.NewCertPool()
 	caCertPool.AppendCertsFromPEM(bundleFiles["ca.crt"])
-	var gatewayConfig map[string]string
+	var gatewayConfig map[string]any
 
 	err = json.Unmarshal(bundleFiles["config.json"], &gatewayConfig)
 	if err != nil {
@@ -89,13 +90,14 @@ func NewAstraCqlStoreConfig(logger klog.Logger, config *AstraBundleConfig) *Astr
 	}
 
 	return &AstraCqlStoreConfig{
-		GatewayHost: gatewayConfig["host"],
-		GatewayPort: gatewayConfig["cql_port"],
+		GatewayHost: gatewayConfig["host"].(string),
+		GatewayPort: strconv.Itoa(int(gatewayConfig["cql_port"].(float64))),
 		GatewayPass: config.GatewayPassword,
 		GatewayUser: config.GatewayUser,
 		TlsConfig: &tls.Config{
 			Certificates: []tls.Certificate{cert},
 			RootCAs:      caCertPool,
+			ServerName:   gatewayConfig["host"].(string),
 		},
 	}