another round of refactoring improvement

Signed-off-by: Joe Lanford <[email protected]>

Author: joelanford

catalogd/internal/serverutil/serverutil.go

@@ -14,6 +14,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	catalogdmetrics "github.com/operator-framework/operator-controller/catalogd/internal/metrics"
 	"github.com/operator-framework/operator-controller/catalogd/internal/storage"
@@ -53,7 +54,7 @@ func AddCatalogServerToManager(mgr ctrl.Manager, cfg CatalogServerConfig, tlsFil
 		OnlyServeWhenLeader: true,
 		Server: &http.Server{
 			Addr:    cfg.CatalogAddr,
-			Handler: catalogdmetrics.AddMetricsToHandler(cfg.LocalStorage.StorageServerHandler()),
+			Handler: handler,
 			BaseContext: func(_ net.Listener) context.Context {
 				return log.IntoContext(context.Background(), mgr.GetLogger().WithName("http.catalogs"))
 			},

catalogd/internal/storage/index.go

@@ -51,20 +51,20 @@ func (i index) Size() int64 {
 	return int64(size)
 }
 
-func (i index) Get(r io.ReaderAt, schema, packageName, name string) (io.Reader, bool) {
+func (i index) Get(r io.ReaderAt, schema, packageName, name string) (io.ReadSeeker, bool) {
 	sectionSet := i.getSectionSet(schema, packageName, name)
 
 	sections := sectionSet.UnsortedList()
 	slices.SortFunc(sections, func(a, b section) int {
 		return cmp.Compare(a.offset, b.offset)
 	})
 
-	srs := make([]io.Reader, 0, len(sections))
+	srs := make([]io.ReadSeeker, 0, len(sections))
 	for _, s := range sections {
 		sr := io.NewSectionReader(r, s.offset, s.length)
 		srs = append(srs, sr)
 	}
-	return io.MultiReader(srs...), true
+	return newMultiReadSeeker(srs...), true
 }
 
 func (i *index) getSectionSet(schema, packageName, name string) sets.Set[section] {