Replace log...Fatal() calls with returned errors. (#1143)

apigee · Apr 6, 2023 · 2b74ea4 · 2b74ea4
1 parent e9340da
commit 2b74ea4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/cmd/registry/cmd/compute/lintstats/lintstats.go b/cmd/registry/cmd/compute/lintstats/lintstats.go
@@ -65,7 +65,7 @@ func Command() *cobra.Command {
 
 			adminClient, err := connection.NewAdminClientWithSettings(ctx, c)
 			if err != nil {
-				log.FromContext(ctx).WithError(err).Fatal("Failed to get client")
+				return err
 			}
 
 			return matchAndHandleLintStatsCmd(ctx, client, adminClient, args[0], filter, linter, dryRun)

diff --git a/cmd/registry/cmd/delete/delete.go b/cmd/registry/cmd/delete/delete.go
@@ -39,7 +39,7 @@ func Command() *cobra.Command {
 			ctx := cmd.Context()
 			c, err := connection.ActiveConfig()
 			if err != nil {
-				log.FromContext(ctx).WithError(err).Fatal("Failed to get config")
+				return err
 			}
 			pattern := c.FQName(args[0])
 			registryClient, err := connection.NewRegistryClientWithSettings(ctx, c)

diff --git a/cmd/registry/cmd/get/get.go b/cmd/registry/cmd/get/get.go
@@ -23,7 +23,6 @@ import (
 	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/pkg/connection"
 	"github.com/apigee/registry/pkg/encoding"
-	"github.com/apigee/registry/pkg/log"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
@@ -46,7 +45,7 @@ func Command() *cobra.Command {
 			ctx := cmd.Context()
 			c, err := connection.ActiveConfig()
 			if err != nil {
-				log.FromContext(ctx).WithError(err).Fatal("Failed to get config")
+				return err
 			}
 			pattern := c.FQName(args[0])
 			registryClient, err := connection.NewRegistryClientWithSettings(ctx, c)

diff --git a/cmd/registry/cmd/upload/discovery.go b/cmd/registry/cmd/upload/discovery.go
@@ -62,7 +62,7 @@ func discoveryCommand() *cobra.Command {
 			}
 			client, err := connection.NewRegistryClient(ctx)
 			if err != nil {
-				log.FromContext(ctx).WithError(err).Fatal("Failed to get client")
+				return err
 			}
 			if err := visitor.VerifyLocation(ctx, client, parent); err != nil {
 				return fmt.Errorf("parent does not exist (%s)", err)
@@ -73,7 +73,7 @@ func discoveryCommand() *cobra.Command {
 
 			discoveryResponse, err := fetchDiscoveryList(service)
 			if err != nil {
-				log.FromContext(ctx).WithError(err).Fatal("Failed to fetch discovery list")
+				return fmt.Errorf("failed to fetch discovery list: %s", err)
 			}
 
 			// Create an upload job for each API.

diff --git a/cmd/registry/cmd/upload/openapi.go b/cmd/registry/cmd/upload/openapi.go
@@ -53,7 +53,7 @@ func openAPICommand() *cobra.Command {
 			}
 			client, err := connection.NewRegistryClient(ctx)
 			if err != nil {
-				log.FromContext(ctx).WithError(err).Fatal("Failed to get client")
+				return err
 			}
 			if err := visitor.VerifyLocation(ctx, client, parent); err != nil {
 				return fmt.Errorf("parent does not exist (%s)", err)
@@ -65,7 +65,7 @@ func openAPICommand() *cobra.Command {
 			for _, arg := range args {
 				path, err := filepath.Abs(arg)
 				if err != nil {
-					log.FromContext(ctx).WithError(err).Fatal("Invalid path")
+					return fmt.Errorf("invalid path: %s", err)
 				}
 				scanDirectoryForOpenAPI(ctx, client, parent, baseURI, path, taskQueue)
 			}

diff --git a/cmd/registry/cmd/upload/protos.go b/cmd/registry/cmd/upload/protos.go
@@ -70,7 +70,7 @@ func protosCommand() *cobra.Command {
 			}
 			client, err := connection.NewRegistryClient(ctx)
 			if err != nil {
-				log.FromContext(ctx).WithError(err).Fatal("Failed to get client")
+				return err
 			}
 			if err := visitor.VerifyLocation(ctx, client, parent); err != nil {
 				return fmt.Errorf("parent does not exist (%s)", err)
@@ -82,15 +82,15 @@ func protosCommand() *cobra.Command {
 			for _, arg := range args {
 				path, err := filepath.Abs(arg)
 				if err != nil {
-					log.FromContext(ctx).WithError(err).Fatal("Invalid path")
+					return fmt.Errorf("invalid path: %s", err)
 				}
 
 				if root == "" {
 					root = path
 				}
 				root, err := filepath.Abs(root)
 				if err != nil {
-					log.FromContext(ctx).WithError(err).Fatal("Invalid path")
+					return fmt.Errorf("invalid path: %s", err)
 				}
 
 				if err := scanDirectoryForProtos(client, parent, baseURI, path, root, taskQueue); err != nil {