add/modify e2e and unit tests

* convert add bundle unit test to e2e test
* add registry bundle conversion unit  test

Signed-off-by: Anik Bhattacharjee <[email protected]>

Author: anik120

pkg/action/add_bundle_test.go

@@ -68,17 +68,3 @@ func (i imageBundleExtractor) ExtractBundle(ctx context.Context) (*registry.Bund
 	}
 	return img.Bundle, nil
 }
-
-type DirBundleExtractor string
-
-func NewDirBundleExtractor(path string) DirBundleExtractor {
-	return DirBundleExtractor(path)
-}
-func (d DirBundleExtractor) ExtractBundle(ctx context.Context) (*registry.Bundle, error) {
-
-	img, err := registry.NewImageInput(image.SimpleReference(""), string(d))
-	if err != nil {
-		return nil, fmt.Errorf("error creating registry bundle from %q: %v", d, err)
-	}
-	return img.Bundle, nil
-}

pkg/action/bundle_extractor.go

@@ -125,11 +125,11 @@ func convertRegistryBundleToModelProperties(b *Bundle) ([]property.Property, err
 			k := property.GVK{Group: v.Group, Kind: v.Kind, Version: v.Version}
 			providedGVKs[k] = struct{}{}
 		case property.TypePackage:
-			foundPackageProperty = true
-			out = append(out, property.Property{
-				Type:  property.TypePackage,
-				Value: json.RawMessage(p.Value),
-			})
+			var v property.Package
+			if err := json.Unmarshal(json.RawMessage(p.Value), &v); err != nil {
+				return nil, property.ParseError{Idx: i, Typ: p.Type, Err: err}
+			}
+			out = append(out, property.MustBuildPackageRequired(v.PackageName, v.Version))
 		default:
 			out = append(out, property.Property{
 				Type:  p.Type,

pkg/action/test-configs/etcd/etcd.json

@@ -0,0 +1,71 @@
+package registry
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/operator-framework/operator-registry/internal/model"
+	"github.com/operator-framework/operator-registry/internal/property"
+	"github.com/operator-framework/operator-registry/pkg/image"
+)
+
+func TestConvertRegistryBundleToModelBundle(t *testing.T) {
+	registryBundle, err := testRegistryBundle()
+	assert.NoError(t, err)
+	expected := testModelBundle()
+
+	actual, err := registryBundleToModelBundle(registryBundle)
+	require.NoError(t, err)
+	assertEqualsModelBundle(t, expected, *actual)
+
+	registryBundles, err := ConvertRegistryBundleToModelBundles(registryBundle)
+	assert.Equal(t, len(registryBundles), 2)
+}
+
+func testModelBundle() model.Bundle {
+	b := model.Bundle{
+		Name:     "etcdoperator.v0.9.2",
+		Image:    "quay.io/operatorhubio/etcd:v0.9.2",
+		Replaces: "etcdoperator.v0.9.0",
+		Skips:    []string{"etcdoperator.v0.9.1"},
+		Properties: []property.Property{
+			property.MustBuildChannel("alpha", "etcdoperator.v0.9.0"),
+			property.MustBuildChannel("stable", "etcdoperator.v0.9.0"),
+			property.MustBuildPackage("etcd", "0.9.2"),
+			property.MustBuildSkips("etcdoperator.v0.9.1"),
+			//TODO(anik120): check if etcdclusters. is supposed to be prefixed
+			property.MustBuildGVKRequired("etcd.database.coreos.com", "v1beta2", "EtcdCluster"),
+			property.MustBuildGVKRequired("testapi.coreos.com", "v1", "testapi"),
+			//TODO(anik120): check if etcdclusters. is supposed to be prefixed
+			property.MustBuildGVK("etcd.database.coreos.com", "v1beta2", "EtcdCluster"),
+			//TODO(anik120): check if etcdbackups. is supposed to be prefixed
+			property.MustBuildGVK("etcd.database.coreos.com", "v1beta2", "EtcdBackup"),
+			//TODO(anik120): check if etcdrestores. is supposed to be prefixed
+			property.MustBuildGVK("etcd.database.coreos.com", "v1beta2", "EtcdRestore"),
+		},
+	}
+	return b
+}
+
+func testRegistryBundle() (*Bundle, error) {
+	input, err := NewImageInput(image.SimpleReference("quay.io/operatorhubio/etcd:v0.9.2"), "../../bundles/etcd.0.9.2")
+	if err != nil {
+		return nil, err
+	}
+	return input.Bundle, nil
+}
+
+func assertEqualsModelBundle(t *testing.T, a, b model.Bundle) bool {
+	assert.ElementsMatch(t, a.Properties, b.Properties)
+	assert.ElementsMatch(t, a.Skips, b.Skips)
+	assert.ElementsMatch(t, a.RelatedImages, b.RelatedImages)
+
+	a.Properties, b.Properties = nil, nil
+	a.Objects, b.Objects = nil, nil
+	a.Skips, b.Skips = nil, nil
+	a.RelatedImages, b.RelatedImages = nil, nil
+
+	return assert.Equal(t, a, b)
+}