updates

Signed-off-by: grokspawn <jordan@nimblewidget.com>

Author: grokspawn

alpha/model/model.go

@@ -341,33 +341,32 @@ func (b *Bundle) VersionString() string {
 
 func (b *Bundle) normalizeName() string {
 	// if the bundle has release versioning, then the name must include this in standard form:
-	// <package-name>-<version>-<release label>-<release version>
+	// <package-name>-v<version>-<release label>-<release version>
 	// if no release versioning exists, then just return the bundle name
 	if b.Release.Label != "" || (b.Release.Version.Major != 0 || b.Release.Version.Minor != 0 || b.Release.Version.Patch != 0) {
-		return strings.Join([]string{b.Package.Name, b.Version.String(), b.Release.String()}, "-")
+		return strings.Join([]string{b.Package.Name, "v" + b.Version.String(), b.Release.String()}, "-")
 	} else {
 		return b.Name
 	}
 }
 
-// order by release, if present
-//   - label first, if present;
-//   - then version, if present;
-//
-// then version
+// order by version, then
+// release, if present
+//   - label first, if present
+//   - then version, if present
 func (b *Bundle) Compare(other *Bundle) int {
 	if b.Name == other.Name {
 		return 0
 	}
+	if b.Version.NE(other.Version) {
+		return b.Version.Compare(other.Version)
+	}
 	if b.Release.Label != other.Release.Label {
 		return strings.Compare(b.Release.Label, other.Release.Label)
 	}
 	if b.Release.Version.NE(other.Release.Version) {
 		return b.Release.Version.Compare(other.Release.Version)
 	}
-	if b.Version.NE(other.Version) {
-		return b.Version.Compare(other.Version)
-	}
 	return 0
 }
 

alpha/model/model_test.go

@@ -280,6 +280,41 @@ func TestValidators(t *testing.T) {
 			},
 			assertion: hasError(`duplicate versions found in bundles: [{0.0.1: [anakin.v0.0.1, anakin.v0.0.2]} {1.0.1: [anakin.v1.0.1, anakin.v1.0.2]}]`),
 		},
+		{
+			name: "Package/Error/DuplicateBundleVersionsReleases",
+			v: &Package{
+				Name: "anakin",
+				Channels: map[string]*Channel{
+					"light": {
+						Package: pkg,
+						Name:    "light",
+						Bundles: map[string]*Bundle{
+							"anakin.v0.0.1":             {Name: "anakin.v0.0.1", Version: semver.MustParse("0.0.1")},
+							"anakin.v0.0.2":             {Name: "anakin.v0.0.2", Version: semver.MustParse("0.0.1")},
+							"anakin-v0.0.1-alpha-0.0.1": {Name: "anakin.v0.0.1", Version: semver.MustParse("0.0.1"), Release: property.Release{Label: "alpha", Version: semver.MustParse("0.0.1")}, Package: pkg},
+							"anakin-v0.0.2-alpha-0.0.1": {Name: "anakin.v0.0.2", Version: semver.MustParse("0.0.1"), Release: property.Release{Label: "alpha", Version: semver.MustParse("0.0.1")}, Package: pkg},
+						},
+					},
+				},
+			},
+			assertion: hasError(`duplicate versions found in bundles: [{0.0.1: [anakin.v0.0.1, anakin.v0.0.2]} {0.0.1-alpha-0.0.1: [anakin.v0.0.1, anakin.v0.0.2]}]`),
+		},
+		{
+			name: "Package/Error/BundleReleaseNormalizedName",
+			v: &Package{
+				Name: "anakin",
+				Channels: map[string]*Channel{
+					"light": {
+						Package: pkg,
+						Name:    "light",
+						Bundles: map[string]*Bundle{
+							"anakin.v0.0.1.alpha.0.0.1": {Name: "anakin.v0.0.1.alpha.0.0.1", Version: semver.MustParse("0.0.1"), Release: property.Release{Label: "alpha", Version: semver.MustParse("0.0.1")}, Package: pkg},
+						},
+					},
+				},
+			},
+			assertion: hasError(`name "anakin.v0.0.1.alpha.0.0.1" does not match normalized name "anakin-v0.0.1-alpha-0.0.1"`),
+		},
 		{
 			name: "Package/Error/NoDefaultChannel",
 			v: &Package{

alpha/property/property.go

@@ -8,9 +8,9 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/blang/semver/v4"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/blang/semver/v4"
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 )
 

alpha/template/substitutes/substitutes.go

@@ -15,16 +15,21 @@ type Template struct {
 	RenderBundle func(context.Context, string) (*declcfg.DeclarativeConfig, error)
 }
 
-type SubstitutesTemplate struct {
-	Schema      string          `json:"schema"`
-	Entries     []*declcfg.Meta `json:"entries"`
-	Substitutes []string        `json:"substitutes"`
+type Substitute struct {
+	Name string `json:"name"`
+	Base string `json:"base"`
+}
+
+type SubstitutesForTemplate struct {
+	Schema        string          `json:"schema"`
+	Entries       []*declcfg.Meta `json:"entries"`
+	Substitutions []Substitute    `json:"substitutions"`
 }
 
 const schema string = "olm.template.substitutes"
 
-func parseSpec(reader io.Reader) (*SubstitutesTemplate, error) {
-	st := &SubstitutesTemplate{}
+func parseSpec(reader io.Reader) (*SubstitutesForTemplate, error) {
+	st := &SubstitutesForTemplate{}
 	stDoc := json.RawMessage{}
 	stDecoder := yaml.NewYAMLOrJSONDecoder(reader, 4096)
 	err := stDecoder.Decode(&stDoc)

pkg/cache/cache.go

@@ -367,10 +367,6 @@ func (c *cache) processPackage(ctx context.Context, reader io.Reader) (packageIn
 	if err != nil {
 		return nil, err
 	}
-
-	// TODO: for each input channel, adjust the entries to respect re-ordering by release attributes as required
-	// do so as FBC so that the routine may be made common, and re-used for OLMv1
-
 	pkgModel, err := declcfg.ConvertToModel(*pkgFbc)
 	if err != nil {
 		return nil, err