Merge pull request #702 from joelanford/reapply-691

declcfg: validation should allow non-existent replaces value (re-apply #691)

Author: openshift-merge-robot

internal/model/model.go

@@ -232,13 +232,6 @@ func (b *Bundle) Validate() error {
 	if b.Channel != nil && b.Package != nil && b.Package != b.Channel.Package {
 		result.subErrors = append(result.subErrors, errors.New("package does not match channel's package"))
 	}
-	if b.Replaces != "" {
-		if b.Channel != nil && b.Channel.Bundles != nil {
-			if _, ok := b.Channel.Bundles[b.Replaces]; !ok {
-				result.subErrors = append(result.subErrors, fmt.Errorf("replaces %q not found in channel", b.Replaces))
-			}
-		}
-	}
 	props, err := property.Parse(b.Properties)
 	if err != nil {
 		result.subErrors = append(result.subErrors, err)

internal/model/model_test.go

@@ -378,6 +378,20 @@ func TestValidators(t *testing.T) {
 			},
 			assertion: require.NoError,
 		},
+		{
+			name: "Bundle/Success/ReplacesNotInChannel",
+			v: &Bundle{
+				Package:  pkg,
+				Channel:  ch,
+				Name:     "anakin.v0.1.0",
+				Image:    "registry.io/image",
+				Replaces: "anakin.v0.0.0",
+				Properties: []property.Property{
+					property.MustBuildPackage("anakin", "0.1.0"),
+				},
+			},
+			assertion: require.NoError,
+		},
 		{
 			name: "Bundle/Success/NoBundleImage/HaveBundleData",
 			v: &Bundle{
@@ -440,16 +454,6 @@ func TestValidators(t *testing.T) {
 			},
 			assertion: require.Error,
 		},
-		{
-			name: "Bundle/Error/ReplacesNotInChannel",
-			v: &Bundle{
-				Package:  pkg,
-				Channel:  ch,
-				Name:     "anakin.v0.1.0",
-				Replaces: "anakin.v0.0.0",
-			},
-			assertion: require.Error,
-		},
 		{
 			name: "Bundle/Error/InvalidProperty",
 			v: &Bundle{