Maint. Leaving some notes

Signed-off-by: Julius Liu <[email protected]>

registry/extension/extension.go

@@ -57,23 +57,24 @@ type InitExtensionNamespace func(ctx c.Context, storageDriver driver.StorageDriv
 
 var extensions map[string]InitExtensionNamespace
 
-func EnumerateRegistered() []v2.RouteDescriptor {
-	descs := make([]v2.RouteDescriptor, 0)
+func EnumerateRegistered(ctx context.Context) (repositoryRoutes []v2.RouteDescriptor, registryRoutes []v2.RouteDescriptor) {
 	for _, ext := range extensions {
-		namespace, err := ext(context.TODO(), nil, nil)
+		// TODO: It's probably okay to pass a nil storage driver, but should probably figure out where the extension config is stored and pass that here
+		namespace, err := ext(ctx, nil, nil)
 		if err != nil {
 			registryScoped := namespace.GetRegistryRoutes()
 			for _, regScoped := range registryScoped {
-				descs = append(descs, regScoped.Descriptor)
+				registryRoutes = append(registryRoutes, regScoped.Descriptor)
 			}
 
 			repositoryScoped := namespace.GetRepositoryRoutes()
 			for _, repScoped := range repositoryScoped {
-				descs = append(descs, repScoped.Descriptor)
+				repositoryRoutes = append(repositoryRoutes, repScoped.Descriptor)
 			}
 		}
 	}
-	return descs
+
+	return repositoryRoutes, registryRoutes
 }
 
 // Register is used to register an InitExtensionNamespace for

registry/extension/oci/discover.go

@@ -31,10 +31,11 @@ func (th *extensionHandler) getExtensions(w http.ResponseWriter, r *http.Request
 
 	w.Header().Set("Content-Type", "application/json")
 
-	registered := extension.EnumerateRegistered()
+	// TODO: currently this is only handling repository_routes
+	repository_routes, _ := extension.EnumerateRegistered(r.Context())
 
-	extensions := make([]ociExtension, len(registered))
-	for _, e := range registered {
+	extensions := make([]ociExtension, len(repository_routes))
+	for _, e := range repository_routes {
 		extensions = append(extensions, ociExtension{Name: e.Name, Description: e.Description, Url: e.Path})
 	}
 

registry/extension/oci/oci.go

@@ -31,7 +31,6 @@ type distributionOptions struct {
 
 // newOciNamespace creates a new extension namespace with the name "oci"
 func newOciNamespace(ctx context.Context, storageDriver driver.StorageDriver, options configuration.ExtensionConfig) (extension.Namespace, error) {
-
 	optionsYaml, err := yaml.Marshal(options)
 	if err != nil {
 		return nil, err