feat: tweak modpublish tag validation

Author: vanhtuan0409

cmd/cue/cmd/anduin/modpublish.go

@@ -0,0 +1,31 @@
+package anduin
+
+import (
+	"fmt"
+
+	"cuelang.org/go/internal/mod/semver"
+)
+
+// ValidatePublishTag check for semver compatible from publish tag
+// accept special latest tag
+// which will be transformed into empty tag in order to be compatible with cue internal
+func ValidatePublishTag(v, major, modPath string) (string, error) {
+	// accept special latest version
+	if v == "latest" {
+		return "", nil
+	}
+
+	// START original validation logic
+	if !semver.IsValid(v) {
+		return "", fmt.Errorf("invalid publish version %q; must be valid semantic version (see http://semver.org)", v)
+	}
+	if semver.Canonical(v) != v {
+		return "", fmt.Errorf("publish version %q is not in canonical form", v)
+	}
+	if semver.Major(v) != major {
+		return "", fmt.Errorf("publish version %q does not match the major version %q declared in %q; must be %s.N.N", v, major, modPath, major)
+	}
+	// END original validation logic
+
+	return v, nil
+}

cmd/cue/cmd/modpublish.go

@@ -36,6 +36,7 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/spf13/cobra"
 
+	"cuelang.org/go/cmd/cue/cmd/anduin"
 	"cuelang.org/go/internal/mod/modload"
 	"cuelang.org/go/internal/mod/semver"
 	"cuelang.org/go/internal/vcs"
@@ -134,22 +135,12 @@ func runModUpload(cmd *Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	if !semver.IsValid(args[0]) {
-		return fmt.Errorf("invalid publish version %q; must be valid semantic version (see http://semver.org)", args[0])
-	}
-	if semver.Canonical(args[0]) != args[0] {
-		return fmt.Errorf("publish version %q is not in canonical form", args[0])
-	}
-
-	if major := mf.MajorVersion(); semver.Major(args[0]) != major {
-		if _, _, ok := module.SplitPathVersion(mf.Module); ok {
-			return fmt.Errorf("publish version %q does not match the major version %q declared in %q; must be %s.N.N", args[0], major, modPath, major)
-		} else {
-			return fmt.Errorf("publish version %q does not match implied major version %q in %q; must be %s.N.N", args[0], major, modPath, major)
-		}
+	transformedTag, err := anduin.ValidatePublishTag(args[0], mf.MajorVersion(), modPath)
+	if err != nil {
+		return err
 	}
 
-	mv, err := module.NewVersion(mf.QualifiedModule(), args[0])
+	mv, err := module.NewVersion(mf.QualifiedModule(), transformedTag)
 	if err != nil {
 		return fmt.Errorf("cannot form module version: %v", err)
 	}

examples/anduin/multi-modules/module2/cue.mod/module.cue

@@ -7,6 +7,7 @@ source: {
 }
 deps: {
 	"anduin.com/module1@v1": {
-		v: "v1.0.1"
+		v:       "v1.0.1"
+		default: true
 	}
 }

mod/modregistry/anduin.go

@@ -16,6 +16,9 @@ import (
 	"strconv"
 	"strings"
 
+	"cuelang.org/go/internal/mod/semver"
+	"cuelang.org/go/mod/modfile"
+	"cuelang.org/go/mod/module"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -144,6 +147,21 @@ func moduleFileLayer(m *ocispec.Manifest) ocispec.Descriptor {
 	return m.Layers[layerLen-1]
 }
 
+func validateModVersion(mv module.Version, mf *modfile.File) (string, bool) {
+	major := mf.MajorVersion()
+	if mv.Version() == "" || mv.Version() == "latest" {
+		return major, true
+	}
+
+	// original validation logic
+	wantMajor := semver.Major(mv.Version())
+	if major != wantMajor {
+		return major, false
+	}
+
+	return major, true
+}
+
 func logf(f string, a ...any) {
 	if logging {
 		log.Printf("anduin: "+f, a...)

mod/modregistry/client.go

@@ -380,8 +380,7 @@ func checkModFile(m module.Version, f *zip.File) ([]byte, *modfile.File, error)
 	if mf.QualifiedModule() != m.Path() {
 		return nil, nil, fmt.Errorf("module path %q found in %s does not match module path being published %q", mf.QualifiedModule(), f.Name, m.Path())
 	}
-	wantMajor := semver.Major(m.Version())
-	if major := mf.MajorVersion(); major != wantMajor {
+	if major, ok := validateModVersion(m, mf); !ok {
 		// This can't actually happen because the zip checker checks the major version
 		// that's being published to, so the above path check also implicitly checks that.
 		return nil, nil, fmt.Errorf("major version %q found in %s does not match version being published %q", major, f.Name, m.Version())
@@ -451,7 +450,7 @@ func (c *Client) resolve(m module.Version) (RegistryLocation, error) {
 		return RegistryLocation{}, fmt.Errorf("module %v unexpectedly resolved to empty location", m)
 	}
 	if loc.Tag == "" {
-		return RegistryLocation{}, fmt.Errorf("module %v unexpectedly resolved to empty tag", m)
+		loc.Tag = "latest"
 	}
 	return loc, nil
 }