amend me - make appregistry-server best-effort

Author: njhale

cmd/appregistry-server/main.go

@@ -57,7 +57,7 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 	}
 	err = log.AddDefaultWriterHooks(terminationLogPath)
 	if err != nil {
-		return err
+		logrus.WithError(err).Warn("unable to set termination log path")
 	}
 	kubeconfig, err := cmd.Flags().GetString("kubeconfig")
 	if err != nil {
@@ -90,17 +90,20 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 
 	loader, err := appregistry.NewLoader(kubeconfig, dbName, downloadPath, logger, legacy)
 	if err != nil {
-		logger.Fatalf("error initializing - %v", err)
+		logger.Fatalf("error initializing: %s", err)
 	}
 
 	store, err := loader.Load(sources, packages)
 	if err != nil {
-		logger.Fatalf("error loading manifest from remote registry - %v", err)
+		logger.WithError(err).Warn("error loading app registry manifests")
+	}
+	if store == nil {
+		logger.Fatal("store failed to initialize")
 	}
 
 	lis, err := net.Listen("tcp", ":"+port)
 	if err != nil {
-		logger.Fatalf("failed to listen: %v", err)
+		logger.Fatalf("failed to listen: %s", err)
 	}
 	s := grpc.NewServer()
 
@@ -110,7 +113,7 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
 
 	logger.Info("serving registry")
 	if err := s.Serve(lis); err != nil {
-		logger.Fatalf("failed to serve: %v", err)
+		logger.Fatalf("failed to serve: %s", err)
 	}
 
 	return nil

pkg/appregistry/appregistry.go

@@ -3,11 +3,13 @@ package appregistry
 import (
 	"fmt"
 
-	"github.com/operator-framework/operator-registry/pkg/registry"
 	"github.com/sirupsen/logrus"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+
+	"github.com/operator-framework/operator-registry/pkg/registry"
 )
 
 // NewLoader returns a new instance of AppregistryLoader.
@@ -71,13 +73,13 @@ func (a *AppregistryLoader) Load(csvSources []string, csvPackages string) (store
 	a.logger.Infof("operator source(s) specified are - %s", csvSources)
 	a.logger.Infof("package(s) specified are - %s", csvPackages)
 
+	var errs []error
 	input, err := a.input.Parse(csvSources, csvPackages)
 	if err != nil {
-		a.logger.Errorf("the following error(s) occurred while parsing input - %v", err)
-
+		errs = append(errs, fmt.Errorf("error parsing input: %s", err))
 		if input == nil || !input.IsGoodToProceed() {
 			a.logger.Info("can't proceed, bailing out")
-			return
+			return nil, utilerrors.NewAggregate(errs)
 		}
 	}
 
@@ -87,12 +89,7 @@ func (a *AppregistryLoader) Load(csvSources []string, csvPackages string) (store
 
 	rawManifests, err := a.downloader.Download(input)
 	if err != nil {
-		a.logger.Errorf("The following error occurred while downloading - %v", err)
-
-		if len(rawManifests) == 0 {
-			a.logger.Info("No package manifest downloaded")
-			return
-		}
+		errs = append(errs, fmt.Errorf("error downloading manifests: %s", err))
 	}
 
 	a.logger.Infof("download complete - %d repositories have been downloaded", len(rawManifests))
@@ -101,27 +98,25 @@ func (a *AppregistryLoader) Load(csvSources []string, csvPackages string) (store
 	// flattened single file yaml and nested operator bundle(s).
 	result, err := a.decoder.Decode(rawManifests)
 	if err != nil {
-		a.logger.Errorf("The following error occurred while decoding manifest - %v", err)
-
-		if result.IsEmpty() {
-			a.logger.Info("No operator manifest decoded")
-			return
-		}
+		errs = append(errs, fmt.Errorf("error decoding manifest: %s", err))
+	}
+	if result.IsEmpty() {
+		a.logger.Info("No operator manifest decoded")
 	}
 
 	a.logger.Infof("decoded %d flattened and %d nested operator manifest(s)", result.FlattenedCount, result.NestedCount)
 
 	if result.Flattened != nil {
 		a.logger.Info("loading flattened operator manifest(s) into sqlite")
 		if err = a.loader.LoadFlattenedToSQLite(result.Flattened); err != nil {
-			return
+			errs = append(errs, fmt.Errorf("error loading flattened operator manifests: %s", err))
 		}
 	}
 
 	if result.NestedCount > 0 {
 		a.logger.Infof("loading nested operator bundle(s) from %s into sqlite", result.NestedDirectory)
 		if err = a.loader.LoadBundleDirectoryToSQLite(result.NestedDirectory); err != nil {
-			return
+			errs = append(errs, fmt.Errorf("error loading nested operator manifests: %s", err))
 		}
 	}