fix(spec): properly translate v0 into v1

pkg/jsonnetfile/jsonnetfile.go

@@ -23,7 +23,6 @@ import (
 
 	v0 "github.com/jsonnet-bundler/jsonnet-bundler/spec/v0"
 	v1 "github.com/jsonnet-bundler/jsonnet-bundler/spec/v1"
-	depsv1 "github.com/jsonnet-bundler/jsonnet-bundler/spec/v1/deps"
 )
 
 const (
@@ -63,39 +62,20 @@ func Unmarshal(bytes []byte) (v1.JsonnetFile, error) {
 		return m, err
 	}
 
-	if versions.Version > v1.Version {
+	switch versions.Version {
-		return m, ErrUpdateJB
+	case v0.Version:
-	}
-
-	if versions.Version == v1.Version {
-		if err := json.Unmarshal(bytes, &m); err != nil {
-			return m, errors.Wrap(err, "failed to unmarshal v1 file")
-		}
-
-		return m, nil
-	} else {
 		var mv0 v0.JsonnetFile
 		if err := json.Unmarshal(bytes, &mv0); err != nil {
 			return m, errors.Wrap(err, "failed to unmarshal jsonnetfile")
 		}
-
+		return v1.FromV0(mv0)
-		for name, dep := range mv0.Dependencies {
+	case v1.Version:
-			var d depsv1.Dependency
+		if err := json.Unmarshal(bytes, &m); err != nil {
-			if dep.Source.GitSource != nil {
+			return m, errors.Wrap(err, "failed to unmarshal v1 file")
-				d = *depsv1.Parse("", dep.Source.GitSource.Remote)
-				d.Source.GitSource.Subdir = dep.Source.GitSource.Subdir
 		}
-			if dep.Source.LocalSource != nil {
-				d = *depsv1.Parse(dep.Source.LocalSource.Directory, dep.Source.GitSource.Remote)
-			}
-
-			d.Sum = dep.Sum
-			d.Version = dep.Version
-
-			m.Dependencies[name] = d
-		}
-
 		return m, nil
+	default:
+		return m, ErrUpdateJB
 	}
 }
 

pkg/jsonnetfile/jsonnetfile_test.go

@@ -58,31 +58,33 @@ const v0JSON = `{
 
 var v0Jsonnetfile = v1.JsonnetFile{
 	Dependencies: map[string]deps.Dependency{
-		"grafana-builder": {
+		"github.com/grafana/jsonnet-libs/grafana-builder": {
 			Source: deps.Source{
 				GitSource: &deps.Git{
 					Scheme: deps.GitSchemeHTTPS,
 					Host:   "github.com",
 					User:   "grafana",
 					Repo:   "jsonnet-libs",
-					Subdir: "grafana-builder",
+					Subdir: "/grafana-builder",
 				},
 			},
 			Version:          "54865853ebc1f901964e25a2e7a0e4d2cb6b9648",
 			Sum:              "ELsYwK+kGdzX1mee2Yy+/b2mdO4Y503BOCDkFzwmGbE=",
+			LegacyNameCompat: "grafana-builder",
 		},
-		"prometheus-mixin": {
+		"github.com/prometheus/prometheus/documentation/prometheus-mixin": {
 			Source: deps.Source{
 				GitSource: &deps.Git{
 					Scheme: deps.GitSchemeHTTPS,
 					Host:   "github.com",
 					User:   "prometheus",
 					Repo:   "prometheus",
-					Subdir: "documentation/prometheus-mixin",
+					Subdir: "/documentation/prometheus-mixin",
 				},
 			},
 			Version:          "7c039a6b3b4b2a9d7c613ac8bd3fc16e8ca79684",
 			Sum:              "bVGOsq3hLOw2irNPAS91a5dZJqQlBUNWy3pVwM4+kIY=",
+			LegacyNameCompat: "prometheus-mixin",
 		},
 	},
 	LegacyImports: true,

spec/v0/spec.go

@@ -19,6 +19,8 @@ import (
 	"sort"
 )
 
+const Version = 0
+
 // JsonnetFile is the structure of a `.json` file describing a set of jsonnet
 // dependencies. It is used for both, the jsonnetFile and the lockFile.
 type JsonnetFile struct {

spec/v1/v0.go

@@ -0,0 +1,36 @@
+package spec
+
+import (
+	"path/filepath"
+
+	v0 "github.com/jsonnet-bundler/jsonnet-bundler/spec/v0"
+	"github.com/jsonnet-bundler/jsonnet-bundler/spec/v1/deps"
+)
+
+func FromV0(mv0 v0.JsonnetFile) (JsonnetFile, error) {
+	m := New()
+	m.LegacyImports = true
+
+	for name, old := range mv0.Dependencies {
+		var d deps.Dependency
+
+		switch {
+		case old.Source.GitSource != nil:
+			d = *deps.Parse("", old.Source.GitSource.Remote)
+
+			subdir := filepath.Clean("/" + old.Source.GitSource.Subdir)
+			d.Source.GitSource.Subdir = subdir
+
+		case old.Source.LocalSource != nil:
+			d = *deps.Parse("", old.Source.LocalSource.Directory)
+		}
+
+		d.Sum = old.Sum
+		d.Version = old.Version
+		d.LegacyNameCompat = name
+
+		m.Dependencies[d.Name()] = d
+	}
+
+	return m, nil
+}