updates

Signed-off-by: grokspawn <[email protected]>

Author: grokspawn

alpha/model/model.go

@@ -350,24 +350,23 @@ func (b *Bundle) normalizeName() string {
 	}
 }
 
-// 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/template/substitutes/substitutes.go

@@ -15,16 +15,16 @@ 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 SubstitutesForTemplate struct {
+	Schema        string          `json:"schema"`
+	Entries       []*declcfg.Meta `json:"entries"`
+	Substitutions []string        `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

@@ -368,9 +368,6 @@ func (c *cache) processPackage(ctx context.Context, reader io.Reader) (packageIn
 		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