Revert "Do validation in parallel"

This reverts commit 158fee7.

Author: yolken-segment

cmd/kubeapply/subcmd/validate.go

@@ -23,9 +23,6 @@ var validateCmd = &cobra.Command{
 type validateFlags struct {
 	// Expand before validating.
 	expand bool
-
-	// Expand before validating.
-	quiet bool
 }
 
 var validateFlagValues validateFlags
@@ -103,16 +100,12 @@ func execValidation(ctx context.Context, clusterConfig *config.ClusterConfig) er
 	}
 
 	numInvalidResources := 0
-	numValidResources := 0
-	numSkippedResources := 0
 
 	for _, result := range results {
 		switch result.Status {
 		case validation.StatusValid:
-			numValidResources++
-			log.Debugf("Resource %s in file %s OK", result.PrettyName(), result.Filename)
+			log.Infof("Resource %s in file %s OK", result.PrettyName(), result.Filename)
 		case validation.StatusSkipped:
-			numSkippedResources++
 			log.Debugf("Resource %s in file %s was skipped", result.PrettyName(), result.Filename)
 		case validation.StatusError:
 			numInvalidResources++
@@ -133,19 +126,11 @@ func execValidation(ctx context.Context, clusterConfig *config.ClusterConfig) er
 
 	if numInvalidResources > 0 {
 		return fmt.Errorf(
-			"Validation failed for cluster %s; %d resources/files invalid, %d valid, %d skipped",
-			clusterConfig.DescriptiveName(),
+			"Validation failed for %d resources",
 			numInvalidResources,
-			numValidResources,
-			numSkippedResources,
 		)
 	}
 
-	log.Infof(
-		"Validation of cluster %s passed; %d resources valid, %d skipped",
-		clusterConfig.DescriptiveName(),
-		numValidResources,
-		numSkippedResources,
-	)
+	log.Infof("Validation of cluster %s passed", clusterConfig.DescriptiveName())
 	return nil
 }

go.mod

@@ -39,7 +39,7 @@ require (
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1
-	gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19 // indirect
+	gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19
 	gopkg.in/yaml.v2 v2.3.0
 	gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2 // indirect
 	gopkg.in/zorkian/go-datadog-api.v2 v2.28.0

pkg/validation/validation.go

@@ -3,16 +3,13 @@ package validation
 import (
 	"context"
 	"fmt"
-	"sync"
+	"os"
+	"path/filepath"
+	"strings"
 
-	"github.com/yannh/kubeconform/pkg/resource"
 	"github.com/yannh/kubeconform/pkg/validator"
 )
 
-const (
-	numWorkers = 6
-)
-
 // KubeValidator is a struct that validates the kube configs associated with a cluster.
 type KubeValidator struct {
 	validatorObj validator.Validator
@@ -77,88 +74,58 @@ func (k *KubeValidator) RunSchemaValidation(
 	ctx context.Context,
 	path string,
 ) ([]ValidationResult, error) {
-	kResults := []validator.Result{}
-	resourcesChan, errChan := resource.FromFiles(ctx, []string{path}, nil)
-	mut := sync.Mutex{}
-	wg := sync.WaitGroup{}
-
-	// Based on implementation in
-	// https://github.com/yannh/kubeconform/blob/master/cmd/kubeconform/main.go.
-	for i := 0; i < numWorkers; i++ {
-		wg.Add(1)
-		go func() {
-			for res := range resourcesChan {
-				mut.Lock()
-				kResults = append(kResults, k.validatorObj.ValidateResource(res))
-				mut.Unlock()
+	results := []ValidationResult{}
+
+	err := filepath.Walk(
+		path,
+		func(subPath string, info os.FileInfo, err error) error {
+			if err != nil {
+				return err
 			}
-			wg.Done()
-		}()
-	}
 
-	wg.Add(1)
-	go func() {
-		// Process errors while discovering resources
-		for err := range errChan {
-			if err == nil {
-				continue
+			if info.IsDir() || !strings.HasSuffix(subPath, ".yaml") {
+				return nil
 			}
 
-			var kResult validator.Result
+			file, err := os.Open(subPath)
+			if err != nil {
+				return err
+			}
 
-			if err, ok := err.(resource.DiscoveryError); ok {
-				kResult = validator.Result{
-					Resource: resource.Resource{Path: err.Path},
-					Err:      err.Err,
-					Status:   validator.Error,
+			for _, kResult := range k.validatorObj.ValidateWithContext(ctx, subPath, file) {
+				if kResult.Status == validator.Empty {
+					// Skip over empty results
+					continue
 				}
-			} else {
-				kResult = validator.Result{
-					Resource: resource.Resource{},
-					Err:      err,
-					Status:   validator.Error,
+
+				result := ValidationResult{
+					Filename: kResult.Resource.Path,
+					Status:   kubeconformStatusToStatus(kResult.Status),
 				}
-			}
-			mut.Lock()
-			kResults = append(kResults, kResult)
-			mut.Unlock()
-		}
-		wg.Done()
-	}()
-	wg.Wait()
 
-	results := []ValidationResult{}
+				if kResult.Err != nil {
+					result.Message = kResult.Err.Error()
+				}
 
-	for _, kResult := range kResults {
-		if kResult.Status == validator.Empty {
-			// Skip over empty results
-			continue
-		}
-
-		result := ValidationResult{
-			Filename: kResult.Resource.Path,
-			Status:   kStatusToStatus(kResult.Status),
-		}
-
-		if kResult.Err != nil {
-			result.Message = kResult.Err.Error()
-		}
-
-		sig, err := kResult.Resource.Signature()
-		if err == nil && sig != nil {
-			result.Kind = sig.Kind
-			result.Name = sig.Name
-			result.Namespace = sig.Namespace
-			result.Version = sig.Version
-		}
-
-		results = append(results, result)
-	}
+				sig, err := kResult.Resource.Signature()
+				if err == nil && sig != nil {
+					result.Kind = sig.Kind
+					result.Name = sig.Name
+					result.Namespace = sig.Namespace
+					result.Version = sig.Version
+				}
+
+				results = append(results, result)
+			}
+
+			return nil
+		},
+	)
 
-	return results, nil
+	return results, err
 }
 
-func kStatusToStatus(kStatus validator.Status) Status {
+func kubeconformStatusToStatus(kStatus validator.Status) Status {
 	switch kStatus {
 	case validator.Valid:
 		return StatusValid