Pass the whole config and pass headers

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

cmd/docker-mcp/internal/catalog/types.go

@@ -37,8 +37,9 @@ type Env struct {
 }
 
 type Remote struct {
-	URL       string `yaml:"url" json:"url"`
-	Transport string `yaml:"transport,omitempty" json:"transport,omitempty"`
+	URL       string            `yaml:"url" json:"url"`
+	Transport string            `yaml:"transport,omitempty" json:"transport,omitempty"`
+	Headers   map[string]string `yaml:"headers,omitempty" json:"headers,omitempty"`
 }
 
 // POCI tools

cmd/docker-mcp/internal/gateway/clientpool.go

@@ -313,12 +313,9 @@ func (cg *clientGetter) GetClient(ctx context.Context) (mcpclient.Client, error)
 
 			// Deprecated: Use Remote instead
 			if cg.serverConfig.Spec.SSEEndpoint != "" {
-				client = mcpclient.NewRemoteMCPClient(cg.serverConfig.Name, catalog.Remote{
-					URL:       cg.serverConfig.Spec.SSEEndpoint,
-					Transport: "sse",
-				})
+				client = mcpclient.NewRemoteMCPClient(cg.serverConfig)
 			} else if cg.serverConfig.Spec.Remote.URL != "" {
-				client = mcpclient.NewRemoteMCPClient(cg.serverConfig.Name, cg.serverConfig.Spec.Remote)
+				client = mcpclient.NewRemoteMCPClient(cg.serverConfig)
 			} else if cg.cp.Static {
 				client = mcpclient.NewStdioCmdClient(cg.serverConfig.Name, "socat", nil, "STDIO", fmt.Sprintf("TCP:mcp-%s:4444", cg.serverConfig.Name))
 			} else {

cmd/docker-mcp/internal/mcp/remote.go

@@ -3,25 +3,25 @@ package mcp
 import (
 	"context"
 	"fmt"
+	"os"
 	"sync/atomic"
 
 	"github.com/mark3labs/mcp-go/client"
+	mcptransport "github.com/mark3labs/mcp-go/client/transport"
 	"github.com/mark3labs/mcp-go/mcp"
 
 	"github.com/docker/mcp-gateway/cmd/docker-mcp/internal/catalog"
 )
 
 type remoteMCPClient struct {
-	name   string
-	config catalog.Remote
+	config catalog.ServerConfig
 
 	initialized atomic.Bool
 	*client.Client
 }
 
-func NewRemoteMCPClient(name string, config catalog.Remote) Client {
+func NewRemoteMCPClient(config catalog.ServerConfig) Client {
 	return &remoteMCPClient{
-		name:   name,
 		config: config,
 	}
 }
@@ -36,19 +36,45 @@ func (c *remoteMCPClient) Initialize(ctx context.Context, request mcp.Initialize
 		err          error
 	)
 
-	switch c.config.Transport {
+	// Read configuration.
+	var (
+		url       string
+		transport string
+	)
+	if c.config.Spec.SSEEndpoint != "" {
+		// Deprecated
+		url = c.config.Spec.SSEEndpoint
+		transport = "sse"
+	} else {
+		url = c.config.Spec.Remote.URL
+		transport = c.config.Spec.Remote.Transport
+	}
+
+	// Secrets to env
+	env := map[string]string{}
+	for _, secret := range c.config.Spec.Secrets {
+		env[secret.Env] = c.config.Secrets[secret.Name]
+	}
+
+	// Headers
+	headers := map[string]string{}
+	for k, v := range c.config.Spec.Remote.Headers {
+		headers[k] = expandEnv(v, env)
+	}
+
+	switch transport {
 	case "sse":
-		remoteClient, err = client.NewSSEMCPClient(c.config.URL)
+		remoteClient, err = client.NewSSEMCPClient(url, client.WithHeaders(headers))
 		if err != nil {
 			return nil, err
 		}
 	case "http":
-		remoteClient, err = client.NewStreamableHttpClient(c.config.URL)
+		remoteClient, err = client.NewStreamableHttpClient(url, mcptransport.WithHTTPHeaders(headers))
 		if err != nil {
 			return nil, err
 		}
 	default:
-		return nil, fmt.Errorf("unsupported remote transport: %s", c.config.Transport)
+		return nil, fmt.Errorf("unsupported remote transport: %s", transport)
 	}
 
 	if err := remoteClient.Start(context.WithoutCancel(ctx)); err != nil {
@@ -64,3 +90,9 @@ func (c *remoteMCPClient) Initialize(ctx context.Context, request mcp.Initialize
 	c.initialized.Store(true)
 	return result, nil
 }
+
+func expandEnv(value string, secrets map[string]string) string {
+	return os.Expand(value, func(name string) string {
+		return secrets[name]
+	})
+}