ensure we build restCfg once

On-behalf-of: @SAP [email protected]
Signed-off-by: Artem Shcherbatiuk <[email protected]>

Author: vertex451

gateway/manager/targetcluster/cluster.go

@@ -62,34 +62,38 @@ type TargetCluster struct {
 	log           *logger.Logger
 }
 
-// NewTargetCluster creates a new TargetCluster from a schema file
+// NewTargetCluster creates a new TargetCluster from pre-parsed definitions and rest config
 func NewTargetCluster(
 	name string,
-	schemaFilePath string,
+	definitions map[string]any,
+	restCfg *rest.Config,
 	log *logger.Logger,
 	appCfg appConfig.Config,
 	roundTripperFactory func(http.RoundTripper, rest.TLSClientConfig) http.RoundTripper,
 	restMapper meta.RESTMapper,
 ) (*TargetCluster, error) {
-	fileData, err := readSchemaFile(schemaFilePath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read schema file: %w", err)
+	if restMapper == nil {
+		return nil, fmt.Errorf("rest mapper is required")
+	}
+	if restCfg == nil {
+		return nil, fmt.Errorf("rest config is required")
 	}
 
 	cluster := &TargetCluster{
 		appCfg:     appCfg,
 		name:       name,
 		log:        log,
 		restMapper: restMapper,
+		restCfg:    restCfg,
 	}
 
-	// Connect to cluster - use metadata if available, otherwise fall back to standard config
-	if err := cluster.connect(appCfg, fileData.ClusterMetadata, roundTripperFactory); err != nil {
+	// Connect to cluster
+	if err := cluster.connect(appCfg, roundTripperFactory); err != nil {
 		return nil, fmt.Errorf("failed to connect to cluster: %w", err)
 	}
 
 	// Create GraphQL schema and handler
-	if err := cluster.createHandler(fileData.Definitions, appCfg); err != nil {
+	if err := cluster.createHandler(definitions, appCfg); err != nil {
 		return nil, fmt.Errorf("failed to create GraphQL handler: %w", err)
 	}
 
@@ -101,24 +105,19 @@ func NewTargetCluster(
 	return cluster, nil
 }
 
-// connect establishes connection to the target cluster
-func (tc *TargetCluster) connect(appCfg appConfig.Config, metadata *ClusterMetadata, roundTripperFactory func(http.RoundTripper, rest.TLSClientConfig) http.RoundTripper) error {
-	// All clusters now use metadata from schema files to get kubeconfig
-	if metadata == nil {
-		return fmt.Errorf("cluster %s requires cluster metadata in schema file", tc.name)
+// connect establishes client connection for the target cluster using provided rest.Config
+func (tc *TargetCluster) connect(appCfg appConfig.Config, roundTripperFactory func(http.RoundTripper, rest.TLSClientConfig) http.RoundTripper) error {
+	if tc.restCfg == nil {
+		return fmt.Errorf("rest config is required")
 	}
 
 	tc.log.Info().
 		Str("cluster", tc.name).
-		Str("host", metadata.Host).
+		Str("host", tc.restCfg.Host).
 		Bool("isVirtualWorkspace", strings.HasPrefix(tc.name, tc.appCfg.Url.VirtualWorkspacePrefix)).
-		Msg("Using cluster metadata from schema file for connection")
+		Msg("Connecting to cluster with provided config")
 
 	var err error
-	tc.restCfg, err = buildConfigFromMetadata(metadata, tc.log)
-	if err != nil {
-		return fmt.Errorf("failed to build config from metadata: %w", err)
-	}
 
 	if roundTripperFactory != nil {
 		tc.restCfg.Wrap(func(rt http.RoundTripper) http.RoundTripper {
@@ -136,9 +135,8 @@ func (tc *TargetCluster) connect(appCfg appConfig.Config, metadata *ClusterMetad
 		return fmt.Errorf("failed to create cluster client: %w", err)
 	}
 
-	// Create RESTMapper if not provided
 	if tc.restMapper == nil {
-		return fmt.Errorf("rest mapper is required")
+		return fmt.Errorf("rest mapper is required (initialize before creating TargetCluster)")
 	}
 
 	return nil

gateway/manager/targetcluster/registry.go

@@ -14,8 +14,6 @@ import (
 	appConfig "github.com/openmfp/kubernetes-graphql-gateway/common/config"
 	"github.com/openmfp/kubernetes-graphql-gateway/gateway/manager/roundtripper"
 	"k8s.io/client-go/rest"
-
-	// mapper
 	apiutil "sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 )
 
@@ -64,7 +62,6 @@ func (cr *ClusterRegistry) LoadCluster(schemaFilePath string) error {
 		Str("file", schemaFilePath).
 		Msg("Loading target cluster")
 
-	// Build RESTMapper upfront to avoid hidden init
 	fileData, err := readSchemaFile(schemaFilePath)
 	if err != nil {
 		return fmt.Errorf("failed to read schema file: %w", err)
@@ -89,7 +86,7 @@ func (cr *ClusterRegistry) LoadCluster(schemaFilePath string) error {
 	}
 
 	// Create or update cluster
-	cluster, err := NewTargetCluster(name, schemaFilePath, cr.log, cr.appCfg, cr.roundTripperFactory, restMapper)
+	cluster, err := NewTargetCluster(name, fileData.Definitions, cfg, cr.log, cr.appCfg, cr.roundTripperFactory, restMapper)
 	if err != nil {
 		return fmt.Errorf("failed to create target cluster %s: %w", name, err)
 	}