initial commit for graphql refactoring and handler

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

Author: joelanford

cmd/catalogd/main.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"net/http"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -54,6 +55,7 @@ import (
 	corecontrollers "github.com/operator-framework/operator-controller/internal/catalogd/controllers/core"
 	"github.com/operator-framework/operator-controller/internal/catalogd/features"
 	"github.com/operator-framework/operator-controller/internal/catalogd/garbagecollection"
+	"github.com/operator-framework/operator-controller/internal/catalogd/handlers"
 	catalogdmetrics "github.com/operator-framework/operator-controller/internal/catalogd/metrics"
 	"github.com/operator-framework/operator-controller/internal/catalogd/serverutil"
 	"github.com/operator-framework/operator-controller/internal/catalogd/storage"
@@ -341,10 +343,24 @@ func run(ctx context.Context) error {
 		return err
 	}
 
+	indexer := storage.NewIndexer()
+	handlersMap := map[string]http.Handler{
+		"/all": handlers.V1AllHandler(indexer),
+	}
+
+	if features.CatalogdFeatureGate.Enabled(features.APIV1MetasHandler) {
+		handlersMap["/metas"] = handlers.V1MetasHandler(indexer)
+	}
+
+	if features.CatalogdFeatureGate.Enabled(features.APIV1GraphQLHandler) {
+		handlersMap["/graphql"] = handlers.V1GraphQLHandler()
+	}
+
 	localStorage = &storage.LocalDirV1{
-		RootDir:            storeDir,
-		RootURL:            baseStorageURL,
-		EnableMetasHandler: features.CatalogdFeatureGate.Enabled(features.APIV1MetasHandler),
+		Indexer:  indexer,
+		Handlers: handlersMap,
+		RootDir:  storeDir,
+		RootURL:  baseStorageURL,
 	}
 
 	// Config for the catalogd web server

config/components/base/experimental/kustomization.yaml

@@ -12,6 +12,7 @@ components:
 - ../../features/single-own-namespace
 - ../../features/preflight-permissions
 - ../../features/apiv1-metas-handler
+- ../../features/apiv1-graphql-handler
 - ../../features/helm-chart
 # This one is downstream only, so we shant use it
 # - ../../features/webhook-provider-openshift-serviceca

config/components/features/apiv1-graphql-handler/kustomization.yaml

@@ -0,0 +1,9 @@
+# kustomization file for catalogd APIv1 metas handler
+# DO NOT ADD A NAMESPACE HERE
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+patches:
+ - target:
+      kind: Deployment
+      name: catalogd-controller-manager
+   path: patches/enable-featuregate.yaml

config/components/features/apiv1-graphql-handler/patches/enable-featuregate.yaml

@@ -0,0 +1,4 @@
+# enable APIv1 meta handler feature gate
+- op: add
+  path: /spec/template/spec/containers/0/args/-
+  value: "--feature-gates=APIV1GraphQLHandler=true"

config/overlays/tilt-local-dev/patches/catalogd.yaml

@@ -7,4 +7,4 @@
   value: null
 - op: remove
   # remove --leader-elect so container doesn't restart during breakpoints
-  path: /spec/template/spec/containers/0/args/2
+  path: /spec/template/spec/containers/0/args/0

go.mod

@@ -16,6 +16,9 @@ require (
 	github.com/google/go-containerregistry v0.20.6
 	github.com/google/renameio/v2 v2.0.0
 	github.com/gorilla/handlers v1.5.2
+	github.com/graphql-go/graphql v0.8.1
+	github.com/graphql-go/handler v0.2.4
+	github.com/itchyny/gojq v0.12.17
 	github.com/klauspost/compress v1.18.0
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.1
@@ -28,6 +31,7 @@ require (
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
 	golang.org/x/mod v0.26.0
 	golang.org/x/sync v0.16.0
+	golang.org/x/text v0.27.0
 	golang.org/x/tools v0.35.0
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.18.4
@@ -133,6 +137,7 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/itchyny/timefmt-go v0.1.6 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jmoiron/sqlx v1.4.0 // indirect
 	github.com/joelanford/ignore v0.1.1 // indirect
@@ -221,7 +226,6 @@ require (
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sys v0.34.0 // indirect
 	golang.org/x/term v0.33.0 // indirect
-	golang.org/x/text v0.27.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

go.sum

@@ -246,6 +246,10 @@ github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5T
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
 github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY=
 github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
+github.com/graphql-go/graphql v0.8.1 h1:p7/Ou/WpmulocJeEx7wjQy611rtXGQaAcXGqanuMMgc=
+github.com/graphql-go/graphql v0.8.1/go.mod h1:nKiHzRM0qopJEwCITUuIsxk9PlVlwIiiI8pnJEhordQ=
+github.com/graphql-go/handler v0.2.4 h1:gz9q11TUHPNUpqzV8LMa+rkqM5NUuH/nkE3oF2LS3rI=
+github.com/graphql-go/handler v0.2.4/go.mod h1:gsQlb4gDvURR0bgN8vWQEh+s5vJALM2lYL3n3cf6OxQ=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 h1:JYghRBlGCZyCF2wNUJ8W0cwaQdtpcssJ4CgC406g+WU=
@@ -269,6 +273,10 @@ github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI
 github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/itchyny/gojq v0.12.17 h1:8av8eGduDb5+rvEdaOO+zQUjA04MS0m3Ps8HiD+fceg=
+github.com/itchyny/gojq v0.12.17/go.mod h1:WBrEMkgAfAGO1LUcGOckBl5O726KPp+OlkKug0I/FEY=
+github.com/itchyny/timefmt-go v0.1.6 h1:ia3s54iciXDdzWzwaVKXZPbiXzxxnv1SPGFfM/myJ5Q=
+github.com/itchyny/timefmt-go v0.1.6/go.mod h1:RRDZYC5s9ErkjQvTvvU7keJjxUYzIISJGxm9/mAERQg=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jmhodges/clock v1.2.0 h1:eq4kys+NI0PLngzaHEe7AmPT90XMGIEySD1JfV1PDIs=

internal/catalogd/features/features.go

@@ -9,11 +9,13 @@ import (
 )
 
 const (
-	APIV1MetasHandler = featuregate.Feature("APIV1MetasHandler")
+	APIV1MetasHandler   = featuregate.Feature("APIV1MetasHandler")
+	APIV1GraphQLHandler = featuregate.Feature("APIV1GraphQLHandler")
 )
 
 var catalogdFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
-	APIV1MetasHandler: {Default: false, PreRelease: featuregate.Alpha},
+	APIV1MetasHandler:   {Default: false, PreRelease: featuregate.Alpha},
+	APIV1GraphQLHandler: {Default: false, PreRelease: featuregate.Alpha},
 }
 
 var CatalogdFeatureGate featuregate.MutableFeatureGate = featuregate.NewFeatureGate()

internal/catalogd/handlers/all.go

@@ -0,0 +1,35 @@
+package handlers
+
+import (
+	"github.com/operator-framework/operator-controller/internal/catalogd/handlers/internal/handlerutil"
+	"net/http"
+
+	"k8s.io/klog/v2"
+
+	"github.com/operator-framework/operator-controller/internal/catalogd/storage"
+)
+
+func V1AllHandler(indexer *storage.Indexer) http.Handler {
+	return handlerutil.AllowedMethodsHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		catalog := r.PathValue("catalog")
+		logger := klog.FromContext(r.Context()).WithValues("catalog", catalog)
+
+		idx, err := indexer.GetIndex(catalog)
+		if err != nil {
+			logger.Error(err, "error getting index")
+			http.Error(w, "Not found", http.StatusNotFound)
+			return
+		}
+
+		catalogFile := idx.All()
+		catalogStat, err := idx.Stat()
+		if err != nil {
+			logger.Error(err, "error stat-ing index")
+			http.Error(w, "Internal server error", http.StatusInternalServerError)
+			return
+		}
+
+		w.Header().Add("Content-Type", "application/jsonl")
+		http.ServeContent(w, r, "", catalogStat.ModTime(), catalogFile)
+	}), http.MethodGet, http.MethodHead)
+}

internal/catalogd/handlers/graphql.go

@@ -0,0 +1,62 @@
+package handlers
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/http"
+	"sync"
+
+	"k8s.io/klog/v2"
+
+	"github.com/operator-framework/operator-registry/alpha/declcfg"
+
+	"github.com/operator-framework/operator-controller/internal/catalogd/handlers/internal/graphql"
+	"github.com/operator-framework/operator-controller/internal/catalogd/storage"
+)
+
+type GraphQLHandler struct {
+	catalogHandlers map[string]http.Handler
+	mu              sync.RWMutex
+}
+
+var (
+	_ storage.MetaProcessor = (*GraphQLHandler)(nil)
+	_ http.Handler          = (*GraphQLHandler)(nil)
+)
+
+func V1GraphQLHandler() *GraphQLHandler {
+	return &GraphQLHandler{
+		catalogHandlers: make(map[string]http.Handler),
+	}
+}
+
+func (h *GraphQLHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	catalog := r.PathValue("catalog")
+	logger := klog.FromContext(r.Context()).WithValues("catalog", catalog)
+
+	h.mu.RLock()
+	defer h.mu.RUnlock()
+
+	handler, ok := h.catalogHandlers[catalog]
+	if !ok {
+		logger.Error(errors.New("no handler found for catalog"), "catalog not found")
+		http.Error(w, "Not found", http.StatusNotFound)
+		return
+	}
+	r = r.WithContext(graphql.NewRequestContext(r.Context()))
+	handler.ServeHTTP(w, r)
+}
+
+func (h *GraphQLHandler) ProcessMetas(ctx context.Context, catalog string, idx *storage.Index, metasChan <-chan *declcfg.Meta) error {
+	handler, err := graphql.NewHandler(ctx, idx, metasChan)
+	if err != nil {
+		return fmt.Errorf("failed to create graphql handler: %w", err)
+	}
+
+	h.mu.Lock()
+	defer h.mu.Unlock()
+
+	h.catalogHandlers[catalog] = handler
+	return nil
+}