cli/cmd: consistently use diags.HasErrors() for checking diagnostics

Part of #994. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
kinvolk · Sep 25, 2020 · 9a25a8e · 9a25a8e
1 parent 4be26f0
commit 9a25a8e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go
@@ -45,7 +45,7 @@ func init() {
 // and returns created objects to the caller for further use.
 func initialize(contextLogger *log.Entry) (*terraform.Executor, platform.Platform, *config.Config, string) {
 	lokoConfig, diags := getLokoConfig()
-	if len(diags) > 0 {
+	if diags.HasErrors() {
 		contextLogger.Fatal(diags)
 	}
 

diff --git a/cli/cmd/component-apply.go b/cli/cmd/component-apply.go
@@ -62,12 +62,11 @@ func runApply(cmd *cobra.Command, args []string) {
 	}
 
 	lokoConfig, diags := getLokoConfig()
-	if len(diags) > 0 {
+	if diags.HasErrors() {
 		contextLogger.Fatal(diags)
 	}
 
 	componentsToApply := args
-
 	if len(componentsToApply) == 0 {
 		for _, component := range lokoConfig.RootConfig.Components {
 			componentsToApply = append(componentsToApply, component.Name)
@@ -96,7 +95,7 @@ func applyComponents(lokoConfig *config.Config, kubeconfig []byte, componentName
 
 		componentConfigBody := lokoConfig.LoadComponentConfigBody(componentName)
 
-		if diags := component.LoadConfig(componentConfigBody, lokoConfig.EvalContext); len(diags) > 0 {
+		if diags := component.LoadConfig(componentConfigBody, lokoConfig.EvalContext); diags.HasErrors() {
 			fmt.Printf("%v\n", diags)
 			return diags
 		}

diff --git a/cli/cmd/component-delete.go b/cli/cmd/component-delete.go
@@ -63,7 +63,7 @@ func runDelete(cmd *cobra.Command, args []string) {
 	}
 
 	lokoConfig, diags := getLokoConfig()
-	if len(diags) > 0 {
+	if diags.HasErrors() {
 		contextLogger.Fatal(diags)
 	}