Merge pull request #704 from prizov/master

exit when env variables substitution fails
Praqma · Aug 23, 2022 · 1abb8d4 · 1abb8d4
2 parents 3796260 + ce7fc8f
commit 1abb8d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/internal/app/logging.go b/internal/app/logging.go
@@ -30,11 +30,6 @@ func (l *Logger) Error(message string) {
 	l.Logger.Error(message)
 }
 
-func (l *Logger) Critical(message string) {
-	l.notifyAboutFailureUsingWebhooks(message)
-	l.Logger.Critical(message)
-}
-
 func (l *Logger) Fatal(message string) {
 	l.notifyAboutFailureUsingWebhooks(message)
 	l.Logger.Fatal(message)

diff --git a/internal/app/utils.go b/internal/app/utils.go
@@ -57,7 +57,7 @@ func substituteVarsInYaml(file string) string {
 	yamlFile := string(rawYamlFile)
 	if !flags.noEnvSubst && flags.substEnvValues {
 		if err := validateEnvVars(yamlFile, file); err != nil {
-			log.Critical(err.Error())
+			log.Fatal(err.Error())
 		}
 		yamlFile = substituteEnv(yamlFile)
 	}
@@ -207,7 +207,7 @@ func validateEnvVars(s string, filename string) error {
 			}
 		}
 		if err := scanner.Err(); err != nil {
-			log.Critical(err.Error())
+			log.Fatal(err.Error())
 		}
 	}
 	return nil