cue/load: make Config.Registry an ociregistry.Interface

We want to allow using cue/load with a registry implementation
that doesn't have to be exposed via an HTTP server.

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: I2cc33b7d08d93a06dae561d5debce3d72ba65261
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1169977
TryBot-Result: CUEcueckoo <[email protected]>
Reviewed-by: Paul Jolly <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>
Reviewed-by: Roger Peppe <[email protected]>

Author: mvdan

cue/load/config.go

@@ -15,13 +15,12 @@
 package load
 
 import (
-	"fmt"
 	"io"
-	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"cuelabs.dev/go/oci/ociregistry"
 	"cuelang.org/go/cue/ast"
 	"cuelang.org/go/cue/build"
 	"cuelang.org/go/cue/errors"
@@ -276,9 +275,13 @@ type Config struct {
 	// the corresponding build.File will be associated with the full buffer.
 	Stdin io.Reader
 
-	// Registry holds the URL of the CUE registry. If it has no scheme, https:// is assumed
-	// as a prefix. THIS IS EXPERIMENTAL FOR NOW. DO NOT USE.
-	Registry string
+	// Registry is used to fetch CUE module dependencies.
+	//
+	// When nil, dependencies will be resolved in legacy mode:
+	// reading from cue.mod/pkg, cue.mod/usr, and cue.mod/gen.
+	//
+	// THIS IS EXPERIMENTAL FOR NOW. DO NOT USE.
+	Registry ociregistry.Interface
 
 	fileSystem fileSystem
 }
@@ -365,17 +368,6 @@ func (c Config) complete() (cfg *Config, err error) {
 	} else if !filepath.IsAbs(c.ModuleRoot) {
 		c.ModuleRoot = filepath.Join(c.Dir, c.ModuleRoot)
 	}
-	//c.Registry = "registry.cue.works"
-	if c.Registry != "" {
-		u, err := url.Parse(c.Registry)
-		if err != nil {
-			return nil, fmt.Errorf("invalid registry URL %q: %v", c.Registry, err)
-		}
-		if u.Scheme == "" {
-			u.Scheme = "https"
-			c.Registry = u.String()
-		}
-	}
 	if err := c.loadModule(); err != nil {
 		return nil, err
 	}

cue/load/import.go

@@ -389,7 +389,7 @@ func (l *loader) absDirFromImportPath(pos token.Pos, p importPath) (absDir, name
 
 	default:
 		// TODO predicate registry-aware lookup on module.cue-declared CUE version?
-		if l.cfg.Registry != "" {
+		if l.cfg.Registry != nil {
 			var err error
 			absDir, err = l.externalPackageDir(p)
 			if err != nil {

cue/load/instances.go

@@ -51,7 +51,7 @@ func Instances(args []string, c *Config) []*build.Instance {
 	// TODO use predictable location
 	var deps *dependencies
 	var regClient *registryClient
-	if c.Registry != "" {
+	if c.Registry != nil {
 		// TODO use configured cache directory.
 		tmpDir, err := os.MkdirTemp("", "cue-load-")
 		if err != nil {

cue/load/module.go

@@ -40,7 +40,7 @@ func (c *Config) loadModule() error {
 		return err
 	}
 	parseModFile := modfile.ParseNonStrict
-	if c.Registry == "" {
+	if c.Registry == nil {
 		parseModFile = modfile.ParseLegacy
 	}
 	mf, err := parseModFile(data, mod)

cue/load/module_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"testing"
 
+	"cuelabs.dev/go/oci/ociregistry/ociclient"
 	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/cue/errors"
 	"cuelang.org/go/internal/cuetxtar"
@@ -21,7 +22,7 @@ func TestModuleFetch(t *testing.T) {
 			t.Fatal(err)
 		}
 		defer r.Close()
-		t.LoadConfig.Registry = r.URL()
+		t.LoadConfig.Registry = ociclient.New(r.URL(), nil)
 		ctx := cuecontext.New()
 		insts := t.RawInstances()
 		if len(insts) != 1 {

cue/load/registry.go

@@ -8,6 +8,7 @@ import (
 	"path"
 	"path/filepath"
 
+	"cuelabs.dev/go/oci/ociregistry"
 	"cuelang.org/go/internal/mod/modfile"
 	"cuelang.org/go/internal/mod/modregistry"
 	"cuelang.org/go/internal/mod/module"
@@ -27,8 +28,8 @@ type registryClient struct {
 // in the given cache directory. It assumes that information
 // in the registry is immutable, so if it's in the cache, a module
 // will not be downloaded again.
-func newRegistryClient(registryHost string, cacheDir string) (*registryClient, error) {
-	client, err := modregistry.NewClient(registryHost, "cue/") // TODO configurable prefix
+func newRegistryClient(registry ociregistry.Interface, cacheDir string) (*registryClient, error) {
+	client, err := modregistry.NewClient(registry, "cue/") // TODO configurable prefix
 	if err != nil {
 		return nil, err
 	}

internal/mod/modregistry/client.go

@@ -25,7 +25,6 @@ import (
 	"strings"
 
 	"cuelabs.dev/go/oci/ociregistry"
-	"cuelabs.dev/go/oci/ociregistry/ociclient"
 	"cuelang.org/go/internal/mod/semver"
 	digest "github.com/opencontainers/go-digest"
 	specs "github.com/opencontainers/image-spec/specs-go"
@@ -58,10 +57,9 @@ const (
 // TODO pass in an ociregistry.Interface instead of a URL,
 // thus allowing a locally defined composition of registries
 // rather than always assuming everything is behind a single host.
-func NewClient(registryURL string, prefix string) (*Client, error) {
-	r := ociclient.New(registryURL, nil)
+func NewClient(registry ociregistry.Interface, prefix string) (*Client, error) {
 	return &Client{
-		registry: r,
+		registry: registry,
 		prefix:   prefix,
 	}, nil
 }

internal/mod/modregistry/client_test.go

@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"net/http/httptest"
 	"os"
 	"path"
 	"testing"
@@ -29,17 +28,13 @@ import (
 	"golang.org/x/tools/txtar"
 
 	"cuelabs.dev/go/oci/ociregistry/ocimem"
-	"cuelabs.dev/go/oci/ociregistry/ociserver"
 
 	"cuelang.org/go/internal/mod/module"
 	modzip "cuelang.org/go/internal/mod/zip"
 )
 
 func newTestClient(t *testing.T) *Client {
-	srv := httptest.NewServer(ociserver.New(ocimem.New(), nil))
-	t.Cleanup(srv.Close)
-
-	c, err := NewClient(srv.URL, "")
+	c, err := NewClient(ocimem.New(), "")
 	qt.Assert(t, qt.IsNil(err))
 	return c
 }

internal/registrytest/registry.go

@@ -10,6 +10,7 @@ import (
 	"net/http/httptest"
 	"strings"
 
+	"cuelabs.dev/go/oci/ociregistry/ociclient"
 	"cuelabs.dev/go/oci/ociregistry/ocimem"
 	"cuelabs.dev/go/oci/ociregistry/ociserver"
 	"golang.org/x/tools/txtar"
@@ -23,7 +24,7 @@ import (
 )
 
 // New starts a registry instance that serves modules found inside the
-// _registry path inside ar. It serves the OCI registry protocol.
+// _registry path inside fsys. It serves the OCI registry protocol.
 //
 // Each module should be inside a directory named path_vers, where
 // slashes in path have been replaced with underscores and should
@@ -32,7 +33,7 @@ import (
 // The Registry should be closed after use.
 func New(fsys fs.FS) (*Registry, error) {
 	srv := httptest.NewServer(ociserver.New(ocimem.New(), nil))
-	client, err := modregistry.NewClient(srv.URL, "cue/")
+	client, err := modregistry.NewClient(ociclient.New(srv.URL, nil), "cue/")
 	if err != nil {
 		return nil, fmt.Errorf("cannot make client: %v", err)
 	}

internal/registrytest/registry_test.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"testing"
 
+	"cuelabs.dev/go/oci/ociregistry"
+	"cuelabs.dev/go/oci/ociregistry/ociclient"
 	"golang.org/x/tools/txtar"
 
 	"cuelang.org/go/internal/mod/modregistry"
@@ -37,12 +39,12 @@ func TestRegistry(t *testing.T) {
 				t.Fatal(err)
 			}
 			defer r.Close()
-			runTest(t, r.URL(), string(ar.Comment), ar)
+			runTest(t, ociclient.New(r.URL(), nil), string(ar.Comment), ar)
 		})
 	}
 }
 
-func runTest(t *testing.T, registry string, script string, ar *txtar.Archive) {
+func runTest(t *testing.T, registry ociregistry.Interface, script string, ar *txtar.Archive) {
 	ctx := context.Background()
 	client, err := modregistry.NewClient(registry, "cue/")
 	if err != nil {