bugfixes from testing

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

Author: grokspawn

alpha/declcfg/declcfg_to_model.go

@@ -142,8 +142,9 @@ func ConvertToModel(cfg DeclarativeConfig) (model.Model, error) {
 			if err != nil {
 				return nil, fmt.Errorf("error parsing bundle %q release version %q: %v", b.Name, props.Packages[0].Release, err)
 			}
-			if relver.Major != 0 || relver.Minor != 0 || relver.Patch != 0 || len(relver.Build) != 0 {
-				return nil, fmt.Errorf("bundle %q release version %q must only contain prerelease", b.Name, props.Packages[0].Release)
+			// only need to check for build metadata since we are using explicit zero major, minor, and patch versions above
+			if len(relver.Build) != 0 {
+				return nil, fmt.Errorf("bundle %q release version %q cannot contain build metadata", b.Name, props.Packages[0].Release)
 			}
 		}
 

alpha/template/substitutes/substitutes.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"slices"
 
 	"k8s.io/apimachinery/pkg/util/yaml"
 
@@ -143,6 +144,13 @@ func (t Template) processSubstitution(ctx context.Context, cfg *declcfg.Declarat
 			if entry.Replaces == substitution.Base {
 				entry.Replaces = substituteBundle.Name
 				entry.Skips = append(entry.Skips, substitution.Base)
+			} else if entry.Skips != nil && slices.Contains(entry.Skips, substitution.Base) {
+				// If this entry skips substitution.base, update it to skip substitution.name
+				// and remove substitution.base from the skips list
+				entry.Skips = append(entry.Skips, substituteBundle.Name)
+				entry.Skips = slices.DeleteFunc(entry.Skips, func(skip string) bool {
+					return skip == substitution.Base
+				})
 			}
 		}
 	}