update to include errors to stdout

Signed-off-by: Emily McMullan <[email protected]>
konveyor · Feb 21, 2024 · 7e51e0b · 7e51e0b
1 parent 05d245e
commit 7e51e0b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/cmd/analyzer/main.go b/cmd/analyzer/main.go
@@ -89,6 +89,7 @@ func main() {
 
 	err := validateFlags()
 	if err != nil {
+		log.Error(err, "failed to validate flags")
 		errLog.Error(err, "failed to validate flags")
 		os.Exit(1)
 	}
@@ -100,6 +101,7 @@ func main() {
 	if labelSelector != "" {
 		selector, err := labels.NewLabelSelector[*engine.RuleMeta](labelSelector, nil)
 		if err != nil {
+			log.Error(err, "failed to create label selector from expression", "selector", labelSelector)
 			errLog.Error(err, "failed to create label selector from expression", "selector", labelSelector)
 			os.Exit(1)
 		}
@@ -110,6 +112,7 @@ func main() {
 	if depLabelSelector != "" {
 		dependencyLabelSelector, err = labels.NewLabelSelector[*konveyor.Dep](depLabelSelector, nil)
 		if err != nil {
+			log.Error(err, "failed to create label selector from expression", "selector", labelSelector)
 			errLog.Error(err, "failed to create label selector from expression", "selector", labelSelector)
 			os.Exit(1)
 		}
@@ -121,6 +124,7 @@ func main() {
 	}
 	tp, err := tracing.InitTracerProvider(log, tracerOptions)
 	if err != nil {
+		log.Error(err, "failed to initialize tracing")
 		errLog.Error(err, "failed to initialize tracing")
 		os.Exit(1)
 	}
@@ -133,6 +137,7 @@ func main() {
 	// Get the configs
 	configs, err := provider.GetConfig(settingsFile)
 	if err != nil {
+		log.Error(err, "unable to get configuration")
 		errLog.Error(err, "unable to get configuration")
 		os.Exit(1)
 	}
@@ -162,12 +167,14 @@ func main() {
 		}
 		prov, err := lib.GetProviderClient(config, log)
 		if err != nil {
+			log.Error(err, "unable to create provider client")
 			errLog.Error(err, "unable to create provider client")
 			os.Exit(1)
 		}
 		providers[config.Name] = prov
 		if s, ok := prov.(provider.Startable); ok {
 			if err := s.Start(ctx); err != nil {
+				log.Error(err, "unable to create provider client")
 				errLog.Error(err, "unable to create provider client")
 				os.Exit(1)
 			}
@@ -196,6 +203,7 @@ func main() {
 	for name, provider := range needProviders {
 		err := provider.ProviderInit(ctx)
 		if err != nil {
+			log.Error(err, "unable to init the providers", "provider", name)
 			errLog.Error(err, "unable to init the providers", "provider", name)
 			os.Exit(1)
 		}
@@ -221,6 +229,7 @@ func main() {
 
 	err = os.WriteFile(outputViolations, b, 0644)
 	if err != nil {
+		log.Error(err, "error writing output file", "file", outputViolations)
 		errLog.Error(err, "error writing output file", "file", outputViolations)
 		os.Exit(1) // Treat the error as a fatal error
 	}

diff --git a/cmd/dep/main.go b/cmd/dep/main.go
@@ -54,6 +54,7 @@ func main() {
 
 	err := validateFlags()
 	if err != nil {
+		log.Error(err, "failed to validate input flags")
 		errLog.Error(err, "failed to validate input flags")
 		os.Exit(1)
 	}
@@ -62,6 +63,7 @@ func main() {
 	if depLabelSelector != "" {
 		labelSelector, err = labels.NewLabelSelector[*konveyor.Dep](depLabelSelector, nil)
 		if err != nil {
+			log.Error(err, "invalid label selector")
 			errLog.Error(err, "invalid label selector")
 			os.Exit(1)
 		}
@@ -75,18 +77,21 @@ func main() {
 	// Get the configs
 	configs, err := provider.GetConfig(providerSettings)
 	if err != nil {
+		log.Error(err, "unable to get configuration")
 		errLog.Error(err, "unable to get configuration")
 		os.Exit(1)
 	}
 
 	for _, config := range configs {
 		prov, err := lib.GetProviderClient(config, log)
 		if err != nil {
+			log.Error(err, "unable to create provider client")
 			errLog.Error(err, "unable to create provider client")
 			os.Exit(1)
 		}
 		if s, ok := prov.(provider.Startable); ok {
 			if err := s.Start(ctx); err != nil {
+				log.Error(err, "unable to create provider client")
 				errLog.Error(err, "unable to create provider client")
 				os.Exit(1)
 			}
@@ -158,6 +163,7 @@ func main() {
 	}
 
 	if depsFlat == nil && depsTree == nil {
+		log.Info("failed to get dependencies from all given providers")
 		errLog.Info("failed to get dependencies from all given providers")
 		os.Exit(1)
 	}
@@ -166,6 +172,7 @@ func main() {
 	if treeOutput {
 		b, err = yaml.Marshal(depsTree)
 		if err != nil {
+			log.Error(err, "failed to marshal dependency data as yaml")
 			errLog.Error(err, "failed to marshal dependency data as yaml")
 			os.Exit(1)
 		}
@@ -181,13 +188,15 @@ func main() {
 
 		b, err = yaml.Marshal(depsFlat)
 		if err != nil {
+			log.Error(err, "failed to marshal dependency data as yaml")
 			errLog.Error(err, "failed to marshal dependency data as yaml")
 			os.Exit(1)
 		}
 	}
 
 	err = os.WriteFile(outputFile, b, 0644)
 	if err != nil {
+		log.Error(err, "failed to write dependencies to output file", "file", outputFile)
 		errLog.Error(err, "failed to write dependencies to output file", "file", outputFile)
 		os.Exit(1)
 	}