test(directory): add bad manifests test

Author: njhale

go.mod

@@ -29,6 +29,7 @@ require (
 	github.com/operator-framework/go-appr v0.0.0-20180917210448-f2aef88446f2
 	github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190125151539-1e295784b30a
 	github.com/operator-framework/operator-marketplace v0.0.0-20190216021216-57300a3ef3ba
+	github.com/otiai10/copy v1.0.1
 	github.com/sirupsen/logrus v1.2.0
 	github.com/soheilhy/cmux v0.1.4 // indirect
 	github.com/spf13/cobra v0.0.3
@@ -40,6 +41,7 @@ require (
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
 	golang.org/x/tools v0.0.0-20181207222222-4c874b978acb // indirect
 	google.golang.org/grpc v1.17.0
+	gopkg.in/yaml.v2 v2.2.1
 	k8s.io/api v0.0.0-20190118113203-912cbe2bfef3
 	k8s.io/apiextensions-apiserver v0.0.0-20181204003618-e419c5771cdc
 	k8s.io/apimachinery v0.0.0-20190118094746-1525e4dadd2d

go.sum

@@ -1,4 +1,5 @@
 bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c/go.mod h1:1vhO7Mn/FZMgOgDVGLy5X1mE6rq1HbkBdkF/yj8zkcg=
+bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/NYTimes/gziphandler v1.0.1/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
@@ -141,6 +142,9 @@ github.com/operator-framework/operator-marketplace v0.0.0-20190216021216-57300a3
 github.com/operator-framework/operator-marketplace v0.0.0-20190216021216-57300a3ef3ba/go.mod h1:msZSL8pXwzQjB+hU+awVrZQw94IwJi3sNZVD3NoESIs=
 github.com/operator-framework/operator-registry v1.0.1/go.mod h1:1xEdZjjUg2hPEd52LG3YQ0jtwiwEGdm98S1TH5P4RAA=
 github.com/operator-framework/operator-registry v1.0.4/go.mod h1:hve6YwcjM2nGVlscLtNsp9sIIBkNZo6jlJgzWw7vP9s=
+github.com/otiai10/copy v1.0.1 h1:gtBjD8aq4nychvRZ2CyJvFWAw0aja+VHazDdruZKGZA=
+github.com/otiai10/copy v1.0.1/go.mod h1:8bMCJrAqOtN/d9oyh5HR7HhLQMvcGMpGdwRDYsfOCHc=
+github.com/otiai10/mint v1.2.3/go.mod h1:YnfyPNhBvnY8bW4SGQHCs/aAFhkgySlMZbrF5U0bOVw=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod h1:HUpKUBZnpzkdx0kD/+Yfuft+uD3zHGtXF/XJB14TUr4=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=

pkg/registry/types.go

@@ -26,15 +26,15 @@ type DefinitionKey struct {
 // channels under a single package.
 type PackageManifest struct {
 	// PackageName is the name of the overall package, ala `etcd`.
-	PackageName string `json:"packageName"`
+	PackageName string `json:"packageName" yaml:"packageName"`
 
 	// Channels are the declared channels for the package, ala `stable` or `alpha`.
-	Channels []PackageChannel `json:"channels"`
+	Channels []PackageChannel `json:"channels" yaml:"channels"`
 
 	// DefaultChannelName is, if specified, the name of the default channel for the package. The
 	// default channel will be installed if no other channel is explicitly given. If the package
 	// has a single channel, then that channel is implicitly the default.
-	DefaultChannelName string `json:"defaultChannel"`
+	DefaultChannelName string `json:"defaultChannel" yaml:"defaultChannel"`
 }
 
 // GetDefaultChannel gets the default channel or returns the only one if there's only one. returns empty string if it
@@ -53,11 +53,11 @@ func (m PackageManifest) GetDefaultChannel() string {
 // package.
 type PackageChannel struct {
 	// Name is the name of the channel, e.g. `alpha` or `stable`
-	Name string `json:"name"`
+	Name string `json:"name" yaml:"name"`
 
 	// CurrentCSVName defines a reference to the CSV holding the version of this package currently
 	// for the channel.
-	CurrentCSVName string `json:"currentCSV"`
+	CurrentCSVName string `json:"currentCSV" yaml:"currentCSV"`
 }
 
 // IsDefaultChannel returns true if the PackageChennel is the default for the PackageManifest

pkg/sqlite/directory_test.go

@@ -2,11 +2,15 @@ package sqlite
 
 import (
 	"context"
+	"io/ioutil"
 	"os"
+	"path/filepath"
 	"testing"
 
+	"github.com/otiai10/copy"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v2"
 
 	"github.com/operator-framework/operator-registry/pkg/registry"
 )
@@ -26,6 +30,47 @@ func TestDirectoryLoader(t *testing.T) {
 	require.NoError(t, loader.Populate())
 }
 
+func TestDirectoryLoaderWithBadManifests(t *testing.T) {
+	logrus.SetLevel(logrus.DebugLevel)
+
+	store, err := NewSQLLiteLoader("test.db")
+	require.NoError(t, err)
+	defer func() {
+		if err := os.Remove("test.db"); err != nil {
+			t.Fatal(err)
+		}
+	}()
+
+	// Copy golden manifests to a temp dir
+	dir, err := ioutil.TempDir("testdata", "manifests-")
+	require.NoError(t, err)
+	defer func() {
+		if err := os.RemoveAll(dir); err != nil {
+			t.Fatal(err)
+		}
+	}()
+	require.NoError(t, copy.Copy("../../manifests", dir))
+
+	// Point the first channel at a CSV that doesn't exist
+	path := filepath.Join(dir, "etcd/etcd.package.yaml")
+	r, err := os.Open(path)
+	require.NoError(t, err)
+
+	pkg := new(registry.PackageManifest)
+	require.NoError(t, yaml.NewDecoder(r).Decode(pkg))
+	require.True(t, len(pkg.Channels) > 1)
+	pkg.Channels[0].CurrentCSVName = "imaginary"
+
+	// Replace file contents
+	w, err := os.Create(path)
+	require.NoError(t, err)
+	require.NoError(t, yaml.NewEncoder(w).Encode(pkg))
+
+	// Load and expect error
+	loader := NewSQLLoaderForDirectory(store, dir)
+	require.Error(t, loader.Populate(), "error loading package into db: no bundle found for csv imaginary")
+}
+
 func TestQuerierForDirectory(t *testing.T) {
 	load, err := NewSQLLiteLoader("test.db")
 	require.NoError(t, err)
@@ -77,7 +122,7 @@ func TestQuerierForDirectory(t *testing.T) {
 
 	etcdChannelEntries, err := store.GetChannelEntriesThatReplace(context.TODO(), "etcdoperator.v0.9.0")
 	require.NoError(t, err)
-	require.ElementsMatch(t, []*registry.ChannelEntry{{"etcd", "alpha", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"},{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"}, }, etcdChannelEntries)
+	require.ElementsMatch(t, []*registry.ChannelEntry{{"etcd", "alpha", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"}, {"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"}}, etcdChannelEntries)
 
 	etcdBundleByReplaces, err := store.GetBundleThatReplaces(context.TODO(), "etcdoperator.v0.9.0", "etcd", "alpha")
 	require.NoError(t, err)
@@ -94,13 +139,13 @@ func TestQuerierForDirectory(t *testing.T) {
 		{"etcd", "stable", "etcdoperator.v0.6.1", ""},
 		{"etcd", "stable", "etcdoperator.v0.9.0", "etcdoperator.v0.6.1"},
 		{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.1"},
-		{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"},}, etcdChannelEntriesThatProvide)
+		{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"}}, etcdChannelEntriesThatProvide)
 
 	etcdLatestChannelEntriesThatProvide, err := store.GetLatestChannelEntriesThatProvide(context.TODO(), "etcd.database.coreos.com", "v1beta2", "EtcdCluster")
 	require.NoError(t, err)
 	require.ElementsMatch(t, []*registry.ChannelEntry{{"etcd", "alpha", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"},
-		                                              {"etcd", "beta", "etcdoperator.v0.9.0", "etcdoperator.v0.6.1"},
-		                                              {"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"}}, etcdLatestChannelEntriesThatProvide)
+		{"etcd", "beta", "etcdoperator.v0.9.0", "etcdoperator.v0.6.1"},
+		{"etcd", "stable", "etcdoperator.v0.9.2", "etcdoperator.v0.9.0"}}, etcdLatestChannelEntriesThatProvide)
 
 	etcdBundleByProvides, entry, err := store.GetBundleThatProvides(context.TODO(), "etcd.database.coreos.com", "v1beta2", "EtcdCluster")
 	require.NoError(t, err)

pkg/sqlite/testdata/.gitignore

@@ -0,0 +1 @@
+manifests-*

vendor/github.com/otiai10/copy/.gitignore

@@ -113,6 +113,8 @@ github.com/operator-framework/operator-marketplace/pkg/client/clientset/versione
 github.com/operator-framework/operator-marketplace/pkg/apis/marketplace/v1alpha1
 github.com/operator-framework/operator-marketplace/pkg/client/clientset/versioned/scheme
 github.com/operator-framework/operator-marketplace/pkg/apis
+# github.com/otiai10/copy v1.0.1
+github.com/otiai10/copy
 # github.com/peterbourgon/diskv v2.0.1+incompatible
 github.com/peterbourgon/diskv
 # github.com/pmezard/go-difflib v1.0.0
@@ -152,13 +154,13 @@ google.golang.org/genproto/googleapis/rpc/status
 # google.golang.org/grpc v1.17.0
 google.golang.org/grpc
 google.golang.org/grpc/reflection
+google.golang.org/grpc/connectivity
 google.golang.org/grpc/codes
 google.golang.org/grpc/credentials
 google.golang.org/grpc/health/grpc_health_v1
 google.golang.org/grpc/status
 google.golang.org/grpc/balancer
 google.golang.org/grpc/balancer/roundrobin
-google.golang.org/grpc/connectivity
 google.golang.org/grpc/encoding
 google.golang.org/grpc/encoding/proto
 google.golang.org/grpc/grpclog
@@ -205,10 +207,10 @@ k8s.io/api/batch/v1
 k8s.io/api/batch/v1beta1
 k8s.io/api/batch/v2alpha1
 k8s.io/api/certificates/v1beta1
-k8s.io/api/events/v1beta1
 k8s.io/api/extensions/v1beta1
-k8s.io/api/networking/v1
 k8s.io/api/policy/v1beta1
+k8s.io/api/events/v1beta1
+k8s.io/api/networking/v1
 k8s.io/api/rbac/v1
 k8s.io/api/rbac/v1alpha1
 k8s.io/api/rbac/v1beta1
@@ -262,8 +264,8 @@ k8s.io/apimachinery/third_party/forked/golang/reflect
 k8s.io/apimachinery/pkg/util/wait
 k8s.io/apimachinery/pkg/version
 k8s.io/apimachinery/pkg/util/clock
-k8s.io/apimachinery/pkg/util/strategicpatch
 k8s.io/apimachinery/pkg/util/framer
+k8s.io/apimachinery/pkg/util/strategicpatch
 k8s.io/apimachinery/pkg/apis/meta/v1beta1
 k8s.io/apimachinery/pkg/util/mergepatch
 k8s.io/apimachinery/third_party/forked/golang/json
@@ -273,7 +275,6 @@ k8s.io/apiserver/pkg/util/feature
 k8s.io/client-go/kubernetes
 k8s.io/client-go/rest
 k8s.io/client-go/tools/clientcmd
-k8s.io/client-go/kubernetes/scheme
 k8s.io/client-go/discovery
 k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1
 k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1
@@ -316,6 +317,7 @@ k8s.io/client-go/tools/auth
 k8s.io/client-go/tools/clientcmd/api/latest
 k8s.io/client-go/util/homedir
 k8s.io/client-go/tools/record
+k8s.io/client-go/kubernetes/scheme
 k8s.io/client-go/tools/reference
 k8s.io/client-go/util/integer
 k8s.io/client-go/pkg/apis/clientauthentication