Merge pull request operator-framework#125 from anik120/opm-bundle-extract-bug

Bug 1771850: Error logging for opm alpha bundle extract command

Author: openshift-merge-robot

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/onsi/gomega v1.5.0
 	github.com/otiai10/copy v1.0.1
 	github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect
+	github.com/pkg/errors v0.8.1
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
 	github.com/stretchr/testify v1.3.0

go.sum

@@ -175,6 +175,7 @@ github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09Vjb
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/golang-migrate/migrate/v4 v4.6.2 h1:LDDOHo/q1W5UDj6PbkxdCv7lv9yunyZHXvxuwDkGo3k=
 github.com/golang-migrate/migrate/v4 v4.6.2/go.mod h1:JYi6reN3+Z734VZ0akNuyOJNcrg45ZL7LDBMW3WGJL0=
+github.com/golang/dep v0.5.4 h1:WfV5qbGwsBNUDhk+pfI6emWm7SdDFsnSWkqCMNG3BRs=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=
@@ -326,6 +327,7 @@ github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+v
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

pkg/configmap/configmap_writer.go

@@ -1,17 +1,20 @@
 package configmap
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"regexp"
 
 	"github.com/ghodss/yaml"
 	_ "github.com/mattn/go-sqlite3"
+	errorwrap "github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/operator-framework/operator-registry/pkg/client"
@@ -63,6 +66,32 @@ func TranslateInvalidChars(input string) string {
 	return validConfigMapKey
 }
 
+func validateConfigmapAnnotations(annotations map[string]string) error {
+	errs := []error{}
+	if annotations[bundle.ManifestsLabel] == "" {
+		errs = append(errs, errors.New(bundle.ManifestsLabel))
+	}
+	if annotations[bundle.MediatypeLabel] == "" {
+		errs = append(errs, errors.New(bundle.MediatypeLabel))
+	}
+	if annotations[bundle.MetadataLabel] == "" {
+		errs = append(errs, errors.New(bundle.MetadataLabel))
+	}
+	if annotations[bundle.PackageLabel] == "" {
+		errs = append(errs, errors.New(bundle.PackageLabel))
+	}
+	if annotations[bundle.ChannelsLabel] == "" {
+		errs = append(errs, errors.New(bundle.ChannelsLabel))
+	}
+	if annotations[bundle.ChannelDefaultLabel] == "" {
+		errs = append(errs, errors.New(bundle.ChannelDefaultLabel))
+	}
+	if len(errs) > 0 {
+		return utilerrors.NewAggregate(errs)
+	}
+	return nil
+}
+
 func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
 	subDirs := []string{"manifests/", "metadata/"}
 
@@ -121,7 +150,10 @@ func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
 			}
 		}
 	}
-
+	err = validateConfigmapAnnotations(configMapPopulate.GetAnnotations())
+	if err != nil {
+		return errorwrap.Wrap(err, "annotation validation failed, missing or empty values")
+	}
 	if sourceImage := os.Getenv(EnvContainerImage); sourceImage != "" {
 		annotations := configMapPopulate.GetAnnotations()
 		annotations[ConfigMapImageAnnotationKey] = sourceImage

vendor/github.com/pkg/errors/.gitignore

@@ -96,6 +96,8 @@ github.com/onsi/gomega/types
 github.com/opencontainers/go-digest
 # github.com/otiai10/copy v1.0.1
 github.com/otiai10/copy
+# github.com/pkg/errors v0.8.1
+github.com/pkg/errors
 # github.com/pmezard/go-difflib v1.0.0
 github.com/pmezard/go-difflib/difflib
 # github.com/sirupsen/logrus v1.4.2