feat: integrate KCP support in manager and resolver components (#34)

* feat: integrate KCP support in manager and resolver components

* fix: failing tests

* fix: failing tests

* chore: testcoverage

Author: aaronschweig

Taskfile.yml

@@ -50,11 +50,11 @@ tasks:
         vars:
           ADDITIONAL_COMMAND_ARGS: -coverprofile=./cover.out -covermode=atomic -coverpkg=./...
   cover:
-    deps:
-      - task: setup:go-test-coverage
-      - task: test
+    deps: [setup:envtest]
     cmds:
-      - "{{.LOCAL_BIN}}/go-test-coverage --threshold-file 50 --threshold-package 51 --threshold-total 56 --profile cover.out --config ./.testcoverage.yml"
+      - task: envtest
+        vars:
+          ADDITIONAL_COMMAND_ARGS: -coverprofile=./cover.out -covermode=atomic -coverpkg=./...
   validate:
     cmds:
       - task: lint

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/graphql-go/graphql v0.8.1
 	github.com/graphql-go/handler v0.2.4
 	github.com/kcp-dev/kcp/sdk v0.26.1
+	github.com/kcp-dev/logicalcluster/v3 v3.0.5
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/openmfp/golang-commons v0.124.0
 	github.com/rs/zerolog v1.33.0
@@ -62,7 +63,6 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb // indirect
-	github.com/kcp-dev/logicalcluster/v3 v3.0.5 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect

internal/manager/manager.go

@@ -15,14 +15,18 @@ import (
 	"github.com/go-openapi/spec"
 	"github.com/graphql-go/graphql"
 	"github.com/graphql-go/handler"
+	"github.com/kcp-dev/logicalcluster/v3"
 	appConfig "github.com/openmfp/crd-gql-gateway/internal/config"
 	"github.com/openmfp/crd-gql-gateway/internal/gateway"
 	"github.com/openmfp/crd-gql-gateway/internal/resolver"
 	"github.com/openmfp/golang-commons/logger"
+	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/kcp"
+	"sigs.k8s.io/controller-runtime/pkg/kontext"
 )
 
 type Provider interface {
@@ -200,6 +204,7 @@ func (s *Service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	r = r.WithContext(context.WithValue(r.Context(), resolver.RuntimeClientKey{}, runtimeClient))
+	r = r.WithContext(kontext.WithCluster(r.Context(), logicalcluster.Name(workspace)))
 
 	switch endpoint {
 	case "graphql":
@@ -337,13 +342,27 @@ func setupK8sClients(ctx context.Context, cfg *rest.Config) (client.WithWatch, e
 		return nil, fmt.Errorf("failed to sync cache")
 	}
 
-	runtimeClient, err := client.NewWithWatch(cfg, client.Options{
+	opts := client.Options{
 		Scheme: scheme.Scheme,
 		Cache: &client.CacheOptions{
 			Reader:       k8sCache,
 			Unstructured: true,
 		},
-	})
+	}
+
+	if cluster, ok := kontext.ClusterFrom(ctx); ok && !cluster.Empty() {
+		httpClient, err := kcp.NewClusterAwareHTTPClient(cfg)
+		if err != nil {
+			return nil, err
+		}
+
+		opts.HTTPClient = httpClient
+		opts.MapperWithContext = func(ctx context.Context) (meta.RESTMapper, error) {
+			return kcp.NewClusterAwareMapperProvider(cfg, httpClient)(ctx)
+		}
+	}
+
+	runtimeClient, err := client.NewWithWatch(cfg, opts)
 
 	return runtimeClient, err
 }

internal/resolver/subscription.go

@@ -3,12 +3,13 @@ package resolver
 import (
 	"context"
 	"errors"
-	"github.com/graphql-go/graphql/language/ast"
-	"k8s.io/apimachinery/pkg/watch"
 	"reflect"
 	"sort"
 	"strings"
 
+	"github.com/graphql-go/graphql/language/ast"
+	"k8s.io/apimachinery/pkg/watch"
+
 	"github.com/graphql-go/graphql"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"