Revert "Feat: Listener: Expose scope information in x-openmfp-scope schema extension (#92)"

This reverts commit ba7977b.

Author: aaronschweig

listener/apischema/crd_resolver.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/openapi"
@@ -24,11 +23,10 @@ var (
 
 type CRDResolver struct {
 	*discovery.DiscoveryClient
-	meta.RESTMapper
 }
 
 func (cr *CRDResolver) Resolve() ([]byte, error) {
-	return resolveSchema(cr.DiscoveryClient, cr.RESTMapper)
+	return resolveSchema(cr.DiscoveryClient)
 }
 
 func (cr *CRDResolver) ResolveApiSchema(crd *apiextensionsv1.CustomResourceDefinition) ([]byte, error) {
@@ -47,7 +45,7 @@ func (cr *CRDResolver) ResolveApiSchema(crd *apiextensionsv1.CustomResourceDefin
 		return nil, fmt.Errorf("failed to filter server preferred resources: %w", err)
 	}
 
-	return resolveForPaths(cr.OpenAPIV3(), preferredApiGroups, cr.RESTMapper)
+	return resolveForPaths(cr.OpenAPIV3(), preferredApiGroups)
 }
 
 func errorIfCRDNotInPreferredApiGroups(gvk *metav1.GroupVersionKind, apiResLists []*metav1.APIResourceList) ([]string, error) {
@@ -114,7 +112,7 @@ func getSchemaForPath(preferredApiGroups []string, path string, gv openapi.Group
 	return resp.Components.Schemas, nil
 }
 
-func resolveForPaths(oc openapi.Client, preferredApiGroups []string, rm meta.RESTMapper) ([]byte, error) {
+func resolveForPaths(oc openapi.Client, preferredApiGroups []string) ([]byte, error) {
 	apiv3Paths, err := oc.Paths()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get OpenAPI paths: %w", err)
@@ -129,29 +127,23 @@ func resolveForPaths(oc openapi.Client, preferredApiGroups []string, rm meta.RES
 		}
 		maps.Copy(schemas, schema)
 	}
-
-	scopedSchemas, err := addScopeInfo(schemas, rm)
-	if err != nil {
-		return nil, fmt.Errorf("failed to add scope info to v3 schema: %w", err)
-	}
-
 	v3JSON, err := json.Marshal(&schemaResponse{
 		Components: schemasComponentsWrapper{
-			Schemas: scopedSchemas,
+			Schemas: schemas,
 		},
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal openAPI v3 schema: %w", err)
 	}
-	v2JSON, err := convertJSON(v3JSON)
+	v2JSON, err := ConvertJSON(v3JSON)
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert openAPI v3 schema to v2: %w", err)
 	}
 
 	return v2JSON, nil
 }
 
-func resolveSchema(dc discovery.DiscoveryInterface, rm meta.RESTMapper) ([]byte, error) {
+func resolveSchema(dc discovery.DiscoveryInterface) ([]byte, error) {
 	preferredApiGroups := []string{}
 	apiResList, err := dc.ServerPreferredResources()
 	if err != nil {
@@ -161,5 +153,5 @@ func resolveSchema(dc discovery.DiscoveryInterface, rm meta.RESTMapper) ([]byte,
 		preferredApiGroups = append(preferredApiGroups, apiRes.GroupVersion)
 	}
 
-	return resolveForPaths(dc.OpenAPIV3(), preferredApiGroups, rm)
+	return resolveForPaths(dc.OpenAPIV3(), preferredApiGroups)
 }

listener/apischema/json_converter.go

@@ -20,7 +20,7 @@ type v2RootWrapper struct {
 	Definitions map[string]any `json:"definitions"`
 }
 
-func convertJSON(v3JSON []byte) ([]byte, error) {
+func ConvertJSON(v3JSON []byte) ([]byte, error) {
 	data := &v3RootWrapper{}
 	if err := json.Unmarshal(v3JSON, data); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal JSON: %w", err)

listener/apischema/resolver.go

@@ -1,9 +1,6 @@
 package apischema
 
 import (
-	"errors"
-
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/client-go/discovery"
 	"k8s.io/kube-openapi/pkg/validation/spec"
 )
@@ -24,17 +21,13 @@ type Resolver interface {
 	Resolve(dc discovery.DiscoveryInterface) ([]byte, error)
 }
 
-func NewResolver(rm meta.RESTMapper) (*ResolverImpl, error) {
-	if rm == nil {
-		return nil, errors.New("rest mapper might not be nil")
-	}
-	return &ResolverImpl{RESTMapper: rm}, nil
+func NewResolver() *ResolverImpl {
+	return &ResolverImpl{}
 }
 
 type ResolverImpl struct {
-	meta.RESTMapper
 }
 
 func (r *ResolverImpl) Resolve(dc discovery.DiscoveryInterface) ([]byte, error) {
-	return resolveSchema(dc, r.RESTMapper)
+	return resolveSchema(dc)
 }

listener/apischema/scope_resolver.go

@@ -10,13 +10,11 @@ import (
 	"github.com/openmfp/crd-gql-gateway/listener/discoveryclient"
 	"github.com/openmfp/crd-gql-gateway/listener/flags"
 	"github.com/openmfp/crd-gql-gateway/listener/workspacefile"
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 )
 
 const kubernetesClusterName = "kubernetes"
@@ -58,14 +56,8 @@ func NewReconciler(opts ReconcilerOpts) (CustomReconciler, error) {
 		return nil, fmt.Errorf("failed to create IO Handler: %w", err)
 	}
 
-	rm, err := restMapperFromConfig(opts.Config)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create rest mapper from config: %w", err)
-	}
-
 	schemaResolver := &apischema.CRDResolver{
 		DiscoveryClient: dc,
-		RESTMapper:      rm,
 	}
 
 	if err := preReconcile(schemaResolver, ioHandler); err != nil {
@@ -104,33 +96,11 @@ func NewKcpReconciler(opts ReconcilerOpts) (CustomReconciler, error) {
 		return nil, fmt.Errorf("failed to create Discovery client factory: %w", err)
 	}
 
-	rm, err := restMapperFromConfig(opts.Config)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create rest mapper from config: %w", err)
-	}
-
-	sc, err := apischema.NewResolver(rm)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create schema resolver: %w", err)
-	}
-
 	return controller.NewAPIBindingReconciler(
-		ioHandler, df, sc, &clusterpath.Resolver{
+		ioHandler, df, apischema.NewResolver(), &clusterpath.Resolver{
 			Scheme:       opts.Scheme,
 			Config:       opts.Config,
 			ResolverFunc: clusterpath.Resolve,
 		},
 	), nil
 }
-
-func restMapperFromConfig(cfg *rest.Config) (meta.RESTMapper, error) {
-	httpClt, err := rest.HTTPClientFor(cfg)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create http client: %w", err)
-	}
-	rm, err := apiutil.NewDynamicRESTMapper(cfg, httpClt)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create rest mapper: %w", err)
-	}
-	return rm, nil
-}