fix: fix previous commit

Some commands had the verification before reading the configuration. Fuck.
little-angry-clouds · Jul 7, 2021 · 28473c2 · 28473c2
1 parent e5f881a
commit 28473c2
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 37 deletions.
diff --git a/cmd/cleanup.go b/cmd/cleanup.go
@@ -22,8 +22,6 @@ func cleanup(cmd *cobra.Command, args []string) {
 	logger := helpers.GetLogger(debug)
 	scenario, _ = cmd.Flags().GetString("scenario")
 
-	logger.Info("Begin cleanup")
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 
@@ -34,9 +32,13 @@ func cleanup(cmd *cobra.Command, args []string) {
 		"linter":      strings.Replace(configuration.Linter, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 
+	logger.Info("Syntax")
+
 	err = cli.Syntax(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 
+	logger.Info("Begin cleanup")
+
 	err = cli.Cleanup(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 

diff --git a/cmd/converge.go b/cmd/converge.go
@@ -22,8 +22,6 @@ func converge(cmd *cobra.Command, args []string) {
 	logger := helpers.GetLogger(debug)
 	scenario, _ = cmd.Flags().GetString("scenario")
 
-	logger.Info("Begin converge")
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 
@@ -34,9 +32,13 @@ func converge(cmd *cobra.Command, args []string) {
 		"linter":      strings.Replace(configuration.Linter, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 
+	logger.Info("Syntax")
+
 	err = cli.Syntax(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 
+	logger.Info("Begin converge")
+
 	err = cli.Converge(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 

diff --git a/cmd/create.go b/cmd/create.go
@@ -22,8 +22,6 @@ func create(cmd *cobra.Command, args []string) {
 	logger := helpers.GetLogger(debug)
 	scenario, _ = cmd.Flags().GetString("scenario")
 
-	logger.Info("Begin create")
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 
@@ -34,9 +32,13 @@ func create(cmd *cobra.Command, args []string) {
 		"linter":      strings.Replace(configuration.Linter, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 
+	logger.Info("Syntax")
+
 	err = cli.Syntax(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 
+	logger.Info("Begin create")
+
 	err = cli.Create(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 

diff --git a/cmd/dependency.go b/cmd/dependency.go
@@ -21,11 +21,6 @@ func dependency(cmd *cobra.Command, args []string) {
 	logger := helpers.GetLogger(debug)
 	scenario, _ = cmd.Flags().GetString("scenario")
 
-	logger.Info("Begin dependency")
-
-	err = cli.Syntax(scenario, configuration, logger)
-	customError.CheckGenericError(logger, err)
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 
@@ -36,6 +31,13 @@ func dependency(cmd *cobra.Command, args []string) {
 		"linter":      strings.Replace(configuration.Linter, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 
+	logger.Info("Syntax")
+
+	err = cli.Syntax(scenario, configuration, logger)
+	customError.CheckGenericError(logger, err)
+
+	logger.Info("Begin dependency")
+
 	err = cli.Dependency(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 

diff --git a/cmd/destroy.go b/cmd/destroy.go
@@ -22,11 +22,6 @@ func destroy(cmd *cobra.Command, args []string) {
 	logger := helpers.GetLogger(debug)
 	scenario, _ = cmd.Flags().GetString("scenario")
 
-	logger.Info("Begin destroy")
-
-	err = cli.Syntax(scenario, configuration, logger)
-	customError.CheckGenericError(logger, err)
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 
@@ -37,6 +32,13 @@ func destroy(cmd *cobra.Command, args []string) {
 		"linter":      strings.Replace(configuration.Linter, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 
+	logger.Info("Syntax")
+
+	err = cli.Syntax(scenario, configuration, logger)
+	customError.CheckGenericError(logger, err)
+
+	logger.Info("Begin destroy")
+
 	err = cli.Destroy(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 

diff --git a/cmd/lint.go b/cmd/lint.go
@@ -22,11 +22,6 @@ func lint(cmd *cobra.Command, args []string) {
 	logger := helpers.GetLogger(debug)
 	scenario, _ = cmd.Flags().GetString("scenario")
 
-	logger.Info("Begin linting")
-
-	err = cli.Syntax(scenario, configuration, logger)
-	customError.CheckGenericError(logger, err)
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 
@@ -37,6 +32,13 @@ func lint(cmd *cobra.Command, args []string) {
 		"linter":      strings.Replace(configuration.Linter, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 
+	logger.Info("Syntax")
+
+	err = cli.Syntax(scenario, configuration, logger)
+	customError.CheckGenericError(logger, err)
+
+	logger.Info("Begin linting")
+
 	err = cli.Lint(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 

diff --git a/cmd/prepare.go b/cmd/prepare.go
@@ -21,11 +21,6 @@ func prepare(cmd *cobra.Command, args []string) {
 	logger := helpers.GetLogger(debug)
 	scenario, _ = cmd.Flags().GetString("scenario")
 
-	logger.Info("Begin prepare")
-
-	err = cli.Syntax(scenario, configuration, logger)
-	customError.CheckGenericError(logger, err)
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 
@@ -36,6 +31,13 @@ func prepare(cmd *cobra.Command, args []string) {
 		"linter":      strings.Replace(configuration.Linter, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 
+	logger.Info("Syntax")
+
+	err = cli.Syntax(scenario, configuration, logger)
+	customError.CheckGenericError(logger, err)
+
+	logger.Info("Begin prepare")
+
 	err = cli.Prepare(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)
 

diff --git a/cmd/syntax.go b/cmd/syntax.go
@@ -24,9 +24,6 @@ func syntax(cmd *cobra.Command, args []string) {
 
 	logger.Info("Begin syntax")
 
-	err = cli.Syntax(scenario, configuration, logger)
-	customError.CheckGenericError(logger, err)
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 

diff --git a/cmd/test.go b/cmd/test.go
@@ -22,9 +22,6 @@ func test(cmd *cobra.Command, args []string) {
 	logger := helpers.GetLogger(debug)
 	scenario, _ = cmd.Flags().GetString("scenario")
 
-	err = cli.Syntax(scenario, configuration, logger)
-	customError.CheckGenericError(logger, err)
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 

diff --git a/cmd/verify.go b/cmd/verify.go
@@ -22,11 +22,6 @@ func verify(cmd *cobra.Command, args []string) {
 	logger := helpers.GetLogger(debug)
 	scenario, _ = cmd.Flags().GetString("scenario")
 
-	logger.Info("Begin verify")
-
-	err = cli.Syntax(scenario, configuration, logger)
-	customError.CheckGenericError(logger, err)
-
 	configuration, err = config.ReadConfiguration(scenario)
 	customError.CheckGenericError(logger, err)
 
@@ -37,6 +32,13 @@ func verify(cmd *cobra.Command, args []string) {
 		"linter":      strings.Replace(configuration.Linter, "\n", " && ", -1),
 	}).Debug("Configuration to use")
 
+	logger.Info("Syntax")
+
+	err = cli.Syntax(scenario, configuration, logger)
+	customError.CheckGenericError(logger, err)
+
+	logger.Info("Begin verify")
+
 	err = cli.Verify(scenario, configuration, logger)
 	customError.CheckGenericError(logger, err)