switch tactics

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

Author: grokspawn

alpha/declcfg/declcfg_to_model.go

@@ -2,7 +2,6 @@ package declcfg
 
 import (
 	"fmt"
-	"slices"
 
 	"github.com/blang/semver/v4"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -67,14 +66,6 @@ func ConvertToModel(cfg DeclarativeConfig) (model.Model, error) {
 			//   This API is in alpha stage and it is subject to change.
 			Properties: c.Properties,
 		}
-		for _, entry := range c.Entries {
-			// invalid if there is a skips edge which matches a replacement edge
-			if entry.Replaces != "" && len(entry.Skips) > 0 {
-				if slices.Contains(entry.Skips, entry.Replaces) {
-					return nil, fmt.Errorf("invalid package %q, channel %q: entry %q has identical replaces and skips: %q", c.Package, c.Name, entry.Name, entry.Replaces)
-				}
-			}
-		}
 
 		cde := sets.Set[string]{}
 		for _, entry := range c.Entries {

alpha/declcfg/declcfg_to_model_test.go

@@ -442,22 +442,6 @@ func TestConvertToModel(t *testing.T) {
 				},
 			},
 		},
-		{
-			name:      "Error/DuplicateSkipsReplaces",
-			assertion: hasError(`invalid package "foo", channel "alpha": entry "foo.v0.1.0" has identical replaces and skips: "foo.v0.0.1"`),
-			cfg: DeclarativeConfig{
-				Packages: []Package{
-					addPackageProperties(
-						newTestPackage("foo", "alpha", svgSmallCircle),
-						[]property.Property{
-							{Type: "owner", Value: json.RawMessage("{\"group\":\"abc.com\",\"name\":\"admin\"}")},
-						},
-					),
-				},
-				Channels: []Channel{newTestChannel("foo", "alpha", ChannelEntry{Name: "foo.v0.1.0", Replaces: "foo.v0.0.1", Skips: []string{"foo.v0.0.1"}})},
-				Bundles:  []Bundle{newTestBundle("foo", "0.1.0")},
-			},
-		},
 	}
 
 	for _, s := range specs {

alpha/model/model.go

@@ -288,6 +288,10 @@ func (c *Channel) validateReplacesChain() error {
 		if _, ok := chainFrom[cur.Name]; !ok {
 			chainFrom[cur.Name] = []string{cur.Name}
 		}
+		// if the replaces edge is known to be skipped, disregard it
+		if skippedBundles.Has(cur.Replaces) {
+			break
+		}
 		for k := range chainFrom {
 			chainFrom[k] = append(chainFrom[k], cur.Replaces)
 		}

alpha/model/model_test.go

@@ -164,7 +164,15 @@ func TestValidReplacesChain(t *testing.T) {
 			}},
 			assertion: hasError(`channel contains one or more stranded bundles: anakin.v0.0.1`),
 		},
-	}
+		{
+			name: "Error/SkippedReplacesStranded",
+			ch: Channel{Bundles: map[string]*Bundle{
+				"anakin.v0.0.1": {Name: "anakin.v0.0.1"},
+				"anakin.v0.0.2": {Name: "anakin.v0.0.2", Replaces: "anakin.v0.0.1"},
+				"anakin.v0.0.3": {Name: "anakin.v0.0.3", Replaces: "anakin.v0.0.2", Skips: []string{"anakin.v0.0.2"}},
+			}},
+			assertion: hasError(`channel contains one or more stranded bundles: anakin.v0.0.1`),
+		}}
 	for _, s := range specs {
 		t.Run(s.name, func(t *testing.T) {
 			err := s.ch.validateReplacesChain()