From 7639bbbb1ae1c8f85c6ea7337141baff2ef6806b Mon Sep 17 00:00:00 2001
From: Marius Kimmina <mar.kimmina@gmail.com>
Date: Sun, 4 Jun 2023 10:32:05 +0200
Subject: [PATCH] :bug: fix fail if config file not found

Signed-off-by: Marius Kimmina <mar.kimmina@gmail.com>
---
 apps/cnspec/cmd/bundle.go    | 4 ++++
 apps/cnspec/cmd/login.go     | 4 ++++
 apps/cnspec/cmd/logout.go    | 4 ++++
 apps/cnspec/cmd/scan.go      | 6 +++++-
 apps/cnspec/cmd/serve.go     | 4 ++++
 apps/cnspec/cmd/serve_api.go | 4 ++++
 apps/cnspec/cmd/status.go    | 4 ++++
 7 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/apps/cnspec/cmd/bundle.go b/apps/cnspec/cmd/bundle.go
index d005cc41..86eff549 100644
--- a/apps/cnspec/cmd/bundle.go
+++ b/apps/cnspec/cmd/bundle.go
@@ -158,6 +158,10 @@ var policyPublishCmd = &cobra.Command{
 		if optsErr != nil {
 			log.Fatal().Err(optsErr).Msg("could not load configuration")
 		}
+		err := config.ValidateUserProvidedConfigPath()
+		if err != nil {
+			log.Fatal().Err(err).Msg("Could not load user provided config")
+		}
 		config.DisplayUsedConfig()
 
 		filename := args[0]
diff --git a/apps/cnspec/cmd/login.go b/apps/cnspec/cmd/login.go
index ab87c66c..ab64c522 100644
--- a/apps/cnspec/cmd/login.go
+++ b/apps/cnspec/cmd/login.go
@@ -150,6 +150,10 @@ func register(token string) {
 		}
 
 		// print the used config to the user
+		err := config.ValidateUserProvidedConfigPath()
+		if err != nil {
+			log.Fatal().Err(err).Msg("Could not load user provided config")
+		}
 		config.DisplayUsedConfig()
 
 		httpClient, err = opts.GetHttpClient()
diff --git a/apps/cnspec/cmd/logout.go b/apps/cnspec/cmd/logout.go
index 2f572f67..81b2197b 100644
--- a/apps/cnspec/cmd/logout.go
+++ b/apps/cnspec/cmd/logout.go
@@ -41,6 +41,10 @@ the credentials cannot be used in future anymore.
 		}
 
 		// print the used config to the user
+		err = config.ValidateUserProvidedConfigPath()
+		if err != nil {
+			log.Fatal().Err(err).Msg("Could not load user provided config")
+		}
 		config.DisplayUsedConfig()
 
 		// determine information about the client
diff --git a/apps/cnspec/cmd/scan.go b/apps/cnspec/cmd/scan.go
index 8bd9f59d..e986328a 100644
--- a/apps/cnspec/cmd/scan.go
+++ b/apps/cnspec/cmd/scan.go
@@ -476,6 +476,11 @@ func getCobraScanConfig(cmd *cobra.Command, args []string, provider providers.Pr
 	if optsErr != nil {
 		log.Fatal().Err(optsErr).Msg("could not load configuration")
 	}
+	var err error
+	err = config.ValidateUserProvidedConfigPath()
+	if err != nil {
+		log.Fatal().Err(err).Msg("Could not load user provided config")
+	}
 	config.DisplayUsedConfig()
 
 	// display activated features
@@ -484,7 +489,6 @@ func getCobraScanConfig(cmd *cobra.Command, args []string, provider providers.Pr
 	}
 
 	props := map[string]string{}
-	var err error
 	propsFlag := cmd.Flags().Lookup("props")
 	if propsFlag != nil {
 		props, err = cmd.Flags().GetStringToString("props")
diff --git a/apps/cnspec/cmd/serve.go b/apps/cnspec/cmd/serve.go
index b6a581af..e617a305 100644
--- a/apps/cnspec/cmd/serve.go
+++ b/apps/cnspec/cmd/serve.go
@@ -109,6 +109,10 @@ func getServeConfig() (*scanConfig, error) {
 	if optsErr != nil {
 		log.Fatal().Err(optsErr).Msg("could not load configuration")
 	}
+	err := config.ValidateUserProvidedConfigPath()
+	if err != nil {
+		log.Fatal().Err(err).Msg("Could not load user provided config")
+	}
 	config.DisplayUsedConfig()
 
 	logClientInfo(opts.SpaceMrn, opts.AgentMrn, opts.ServiceAccountMrn)
diff --git a/apps/cnspec/cmd/serve_api.go b/apps/cnspec/cmd/serve_api.go
index 3cb97c68..f86ac3f5 100644
--- a/apps/cnspec/cmd/serve_api.go
+++ b/apps/cnspec/cmd/serve_api.go
@@ -54,6 +54,10 @@ var serveApiCmd = &cobra.Command{
 		if optsErr != nil {
 			log.Fatal().Err(optsErr).Msg("could not load configuration")
 		}
+		err := config.ValidateUserProvidedConfigPath()
+		if err != nil {
+			log.Fatal().Err(err).Msg("Could not load user provided config")
+		}
 		config.DisplayUsedConfig()
 
 		serviceAccount := opts.GetServiceCredential()
diff --git a/apps/cnspec/cmd/status.go b/apps/cnspec/cmd/status.go
index 9ced644e..7722e878 100644
--- a/apps/cnspec/cmd/status.go
+++ b/apps/cnspec/cmd/status.go
@@ -46,6 +46,10 @@ Status sends a ping to Mondoo Platform to verify the credentials.
 			log.Fatal().Err(optsErr).Msg("could not load configuration")
 		}
 
+		err := config.ValidateUserProvidedConfigPath()
+		if err != nil {
+			log.Fatal().Err(err).Msg("Could not load user provided config")
+		}
 		config.DisplayUsedConfig()
 
 		s := Status{