bugfixes from testing

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

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"
 
@@ -144,6 +145,15 @@ func (t Template) processSubstitution(ctx context.Context, cfg *declcfg.Declarat
 				entry.Replaces = substituteBundle.Name
 				entry.Skips = append(entry.Skips, substitution.Base)
 			}
+
+			// If this entry skips substitution.base, update it to skip substitution.name
+			// and remove substitution.base from the skips list
+			if entry.Skips != nil && slices.Contains(entry.Skips, substitution.Base) {
+				entry.Skips = append(entry.Skips, substituteBundle.Name)
+				entry.Skips = slices.DeleteFunc(entry.Skips, func(skip string) bool {
+					return skip == substitution.Base
+				})
+			}
 		}
 	}
 

pkg/lib/validation/bundle.go

@@ -39,14 +39,10 @@ func validateBundle(bundle *registry.Bundle) errors.ManifestResult {
 		result.Add(errors.ErrInvalidParse("error getting bundle CSV version", err))
 		return result
 	}
-	if result.Name, err = csv.GetRelease(); err != nil {
+	if _, err = csv.GetRelease(); err != nil {
 		result.Add(errors.ErrInvalidParse("error getting bundle CSV release version", err))
 		return result
 	}
-	rel, _ := csv.GetRelease()
-	if rel == "" {
-		result.Add(errors.ErrInvalidParse("bundle CSV release version is not defined", errors.Error{}))
-	}
 	return result
 }
 

pkg/registry/parse.go

@@ -197,6 +197,8 @@ func (b *bundleParser) derivedProperties(bundle *Bundle) ([]Property, error) {
 		}
 	}
 
+	// nolint:nestif
+	// existing code triggering nested complexity, but at least will not make worse with release processing
 	if bundle.Annotations != nil && bundle.Annotations.PackageName != "" {
 		pkg := bundle.Annotations.PackageName
 		version, err := bundle.Version()
@@ -208,18 +210,9 @@ func (b *bundleParser) derivedProperties(bundle *Bundle) ([]Property, error) {
 			return nil, err
 		}
 		if release == "" && csv.GetSubstitutesFor() != "" {
-			// if the bundle expresses no release version, but
-			// includes the substitutesFor annotation, then we
-			// interpret any build metadata in the version as
-			// the release version.
-			// failure to parse build metadata under these conditions is fatal,
-			// though validation is later
-			parts := strings.SplitN(version, "+", 2)
-			if len(parts) == 2 {
-				version = parts[0]
-				release = parts[1]
-			} else {
-				return nil, fmt.Errorf("bundle %q with has substitutesFor annotation but release version not expressed as build metadata: %q", bundle.Name, version)
+			version, release, err = extractReleaseVersionFromBuildMetadata(version)
+			if err != nil {
+				return nil, fmt.Errorf("bundle %q error: %v", bundle.Name, err)
 			}
 		}
 
@@ -232,7 +225,7 @@ func (b *bundleParser) derivedProperties(bundle *Bundle) ([]Property, error) {
 			return nil, fmt.Errorf("failed to marshal package property: %s", err)
 		}
 
-		// Annotations file takes precedent over CSV annotations
+		// Annotations file takes precedence over CSV annotations
 		derived = append([]Property{{Type: PackageType, Value: value}}, derived...)
 	}
 
@@ -273,3 +266,21 @@ func propertySet(properties []Property) []Property {
 
 	return set
 }
+
+func extractReleaseVersionFromBuildMetadata(substitutesFor string) (string, string, error) {
+	var version, release string
+	// if the bundle expresses no release version, but
+	// includes the substitutesFor annotation, then we
+	// interpret any build metadata in the version as
+	// the release version.
+	// failure to parse build metadata under these conditions is fatal,
+	// though validation is later
+	parts := strings.SplitN(substitutesFor, "+", 2)
+	if len(parts) == 2 {
+		version = parts[0]
+		release = parts[1]
+	} else {
+		return "", "", fmt.Errorf("no release version expressed as build metadata: %q", version)
+	}
+	return version, release, nil
+}