Fix a few minor issues

1. Improve helm chart validation
2. Return right away if annotations file is not found

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

pkg/lib/bundle/generate.go

@@ -10,6 +10,8 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"gopkg.in/yaml.v2"
+	"helm.sh/helm/v3/pkg/chartutil"
+
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	k8syaml "k8s.io/apimachinery/pkg/util/yaml"
 )
@@ -128,15 +130,13 @@ func GetMediaType(directory string) (string, error) {
 		return "", fmt.Errorf("The directory %s contains no yaml files", directory)
 	}
 
+	// Validate if bundle is helm chart type
+	if _, err := chartutil.IsChartDir(directory); err == nil {
+		return HelmType, nil
+	}
+
 	// Validate the files to determine media type
 	for _, fileName := range files {
-		// TODO: be more robust here, we should validate the format of helm charts
-		// instead of file name
-		fmt.Println(fileName)
-		if fileName == "Chart.yaml" {
-			return HelmType, nil
-		}
-
 		// Check if one of the k8s files is a CSV
 		if k8sFile, ok := k8sFiles[fileName]; ok {
 			if k8sFile.GetObjectKind().GroupVersionKind().Kind == "ClusterServiceVersion" {

pkg/lib/bundle/validate.go

@@ -74,6 +74,7 @@ func (i imageValidator) ValidateBundle(directory string) error {
 	if err != nil {
 		fmtErr := fmt.Errorf("Unable to read annotations.yaml file: %s", err.Error())
 		formatErrors = append(formatErrors, fmtErr)
+		return NewValidationError(annotationErrors, formatErrors)
 	}
 
 	var fileAnnotations AnnotationMetadata

test/e2e/bundle_image_test.go

@@ -678,7 +678,7 @@ spec:
 }
 
 func buildContainer(tag, dockerfilePath, context string) {
-	err:= bundle.ValidateFunc(tag,builderCmd)
+	err := bundle.ValidateFunc(tag, builderCmd)
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
 	cmd := exec.Command(builderCmd, "build", "-t", tag, "-f", dockerfilePath, context)