validate fail for dupe skips+replaces channel entries

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

Author: grokspawn

alpha/declcfg/declcfg_to_model.go

@@ -2,6 +2,7 @@ package declcfg
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/blang/semver/v4"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -66,6 +67,14 @@ 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,6 +442,22 @@ 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 {

pkg/cache/cache_test.go

@@ -402,7 +402,7 @@ var validFS = fstest.MapFS{
 	"name": "clusterwide-alpha",
 	"entries": [
 		{"name": "etcdoperator.v0.9.0"},
-		{"name": "etcdoperator.v0.9.2-clusterwide", "replaces": "etcdoperator.v0.9.0", "skips": ["etcdoperator.v0.6.1","etcdoperator.v0.9.0"], "skipRange": ">=0.9.0 <=0.9.1"},
+		{"name": "etcdoperator.v0.9.2-clusterwide", "replaces": "etcdoperator.v0.9.0", "skips": ["etcdoperator.v0.6.1"], "skipRange": ">=0.9.0 <=0.9.1"},
 		{"name": "etcdoperator.v0.9.4-clusterwide", "replaces": "etcdoperator.v0.9.2-clusterwide"}
 	]
 }

pkg/cache/json_test.go

@@ -28,7 +28,7 @@ func TestJSON_StableDigest(t *testing.T) {
 	//
 	// If validFS needs to change DO NOT CHANGE the json cache implementation
 	// in the same pull request.
-	require.Equal(t, "9adad9ff6cf54e4f", actualDigest)
+	require.Equal(t, "563a1febb83cdbd6", actualDigest)
 }
 
 func TestJSON_CheckIntegrity(t *testing.T) {

pkg/cache/pogrebv1_test.go

@@ -28,7 +28,7 @@ func TestPogrebV1_StableDigest(t *testing.T) {
 	//
 	// If validFS needs to change DO NOT CHANGE the json cache implementation
 	// in the same pull request.
-	require.Equal(t, "485a767449dd66d4", actualDigest)
+	require.Equal(t, "badb5551e9b35e68", actualDigest)
 }
 
 func TestPogrebV1_CheckIntegrity(t *testing.T) {

pkg/cache/tar_test.go

@@ -43,7 +43,7 @@ func Test_fsToTar(t *testing.T) {
 				require.NoError(t, err)
 				hasher := fnv.New64a()
 				hasher.Write(i)
-				require.Equal(t, "6f9eec5b366c557f", fmt.Sprintf("%x", hasher.Sum(nil)))
+				require.Equal(t, "70c49ff8bb3476b0", fmt.Sprintf("%x", hasher.Sum(nil)))
 			},
 		},
 	}