reuse prom clientconfig tls field in grpc

Author: leandroberetta

go.mod

@@ -175,3 +175,5 @@ require (
 )
 
 replace github.com/vmware/go-ipfix => github.com/jotak/go-ipfix v0.0.0-20250708115123-407c539ea101
+
+replace github.com/netobserv/loki-client-go => ../loki-client-go

go.sum

@@ -255,8 +255,6 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/netobserv/gopipes v0.3.0 h1:IYmPnnAVCdSK7VmHmpFhrVBOEm45qpgbZmJz1sSW+60=
 github.com/netobserv/gopipes v0.3.0/go.mod h1:N7/Gz05EOF0CQQSKWsv3eof22Cj2PB08Pbttw98YFYU=
-github.com/netobserv/loki-client-go v0.0.0-20250929121122-f26971f6d948 h1:UqGWIz4zzJl/XKGpM44HIDuhRDBE1e4x4wbKO/WVb7g=
-github.com/netobserv/loki-client-go v0.0.0-20250929121122-f26971f6d948/go.mod h1:Zb/jtD3Lnu88Poo+jnhTASzxYnvncmHOoZaT93xQjJ8=
 github.com/netobserv/netobserv-ebpf-agent v1.9.2-community h1:ghW16OO4QRWj0Uh1gMYX+NjAlgx2sZmCsO3Tkwoj4Do=
 github.com/netobserv/netobserv-ebpf-agent v1.9.2-community/go.mod h1:17OaUNAwx0LxoeV/SaHlJIJP6bpN7zSvUP3GtZelESQ=
 github.com/netsampler/goflow2 v1.3.7 h1:XZaTy8kkMnGXpJ9hS3KbO1McyrFTpVNhVFEx9rNhMmc=

pkg/api/write_loki.go

@@ -54,18 +54,8 @@ type WriteLoki struct {
 }
 
 type GRPCLokiConfig struct {
-	KeepAlive        string         `yaml:"keepAlive,omitempty" json:"keepAlive,omitempty" doc:"keep alive interval"`
-	KeepAliveTimeout string         `yaml:"keepAliveTimeout,omitempty" json:"keepAliveTimeout,omitempty" doc:"keep alive timeout"`
-	TLS              *GRPCTLSConfig `yaml:"tls,omitempty" json:"tls,omitempty" doc:"TLS configuration"`
-}
-
-type GRPCTLSConfig struct {
-	Enabled            bool   `yaml:"enabled,omitempty" json:"enabled,omitempty" doc:"enable TLS"`
-	CertFile           string `yaml:"certFile,omitempty" json:"certFile,omitempty" doc:"path to client certificate file"`
-	KeyFile            string `yaml:"keyFile,omitempty" json:"keyFile,omitempty" doc:"path to client key file"`
-	CAFile             string `yaml:"caFile,omitempty" json:"caFile,omitempty" doc:"path to CA certificate file"`
-	ServerName         string `yaml:"serverName,omitempty" json:"serverName,omitempty" doc:"server name for certificate verification"`
-	InsecureSkipVerify bool   `yaml:"insecureSkipVerify,omitempty" json:"insecureSkipVerify,omitempty" doc:"skip certificate verification (insecure)"`
+	KeepAlive        string `yaml:"keepAlive,omitempty" json:"keepAlive,omitempty" doc:"keep alive interval"`
+	KeepAliveTimeout string `yaml:"keepAliveTimeout,omitempty" json:"keepAliveTimeout,omitempty" doc:"keep alive timeout"`
 }
 
 func (w *WriteLoki) SetDefaults() {

pkg/pipeline/write/write_loki.go

@@ -199,16 +199,9 @@ func buildGRPCLokiConfig(c *api.WriteLoki) (grpc.Config, error) {
 		cfg.ExternalLabels.LabelSet = c.StaticLabels
 	}
 
-	// Configure TLS if provided
-	if c.GRPCConfig.TLS != nil {
-		cfg.TLS = grpc.TLSConfig{
-			Enabled:            c.GRPCConfig.TLS.Enabled,
-			CertFile:           c.GRPCConfig.TLS.CertFile,
-			KeyFile:            c.GRPCConfig.TLS.KeyFile,
-			CAFile:             c.GRPCConfig.TLS.CAFile,
-			ServerName:         c.GRPCConfig.TLS.ServerName,
-			InsecureSkipVerify: c.GRPCConfig.TLS.InsecureSkipVerify,
-		}
+	// Configure TLS from shared ClientConfig (same as HTTP client)
+	if c.ClientConfig != nil {
+		cfg.TLS = c.ClientConfig.TLSConfig
 	}
 
 	return cfg, nil

pkg/pipeline/write/write_loki_test.go

@@ -30,6 +30,7 @@ import (
 	"github.com/netobserv/flowlogs-pipeline/pkg/config"
 	"github.com/netobserv/flowlogs-pipeline/pkg/operational"
 	"github.com/netobserv/flowlogs-pipeline/pkg/test"
+	promConfig "github.com/prometheus/common/config"
 	"github.com/prometheus/common/model"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
@@ -391,18 +392,19 @@ func TestGRPCClientCreationWithTLS(t *testing.T) {
 		URL:            "loki.example.com:9095",
 		ClientProtocol: "grpc",
 		TenantID:       "test-tenant",
-		GRPCConfig: &api.GRPCLokiConfig{
-			KeepAlive:        "30s",
-			KeepAliveTimeout: "5s",
-			TLS: &api.GRPCTLSConfig{
-				Enabled:            true,
+		ClientConfig: &promConfig.HTTPClientConfig{
+			TLSConfig: promConfig.TLSConfig{
 				CertFile:           "/path/to/cert.pem",
 				KeyFile:            "/path/to/key.pem",
 				CAFile:             "/path/to/ca.pem",
 				ServerName:         "loki.example.com",
 				InsecureSkipVerify: false,
 			},
 		},
+		GRPCConfig: &api.GRPCLokiConfig{
+			KeepAlive:        "30s",
+			KeepAliveTimeout: "5s",
+		},
 	}
 
 	// This test expects to fail due to missing certificate files

vendor/github.com/netobserv/loki-client-go/grpc/config.go

@@ -305,7 +305,7 @@ github.com/mxk/go-flowrate/flowrate
 ## explicit; go 1.18
 github.com/netobserv/gopipes/pkg/node
 github.com/netobserv/gopipes/pkg/node/internal/connect
-# github.com/netobserv/loki-client-go v0.0.0-20250929121122-f26971f6d948
+# github.com/netobserv/loki-client-go v0.0.0-20250929121122-f26971f6d948 => ../loki-client-go
 ## explicit; go 1.23.0
 github.com/netobserv/loki-client-go/grpc
 github.com/netobserv/loki-client-go/loki
@@ -1404,3 +1404,4 @@ sigs.k8s.io/structured-merge-diff/v6/value
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
 # github.com/vmware/go-ipfix => github.com/jotak/go-ipfix v0.0.0-20250708115123-407c539ea101
+# github.com/netobserv/loki-client-go => ../loki-client-go