From cee6971ee9a1dd9504121e841699f94bf89f1095 Mon Sep 17 00:00:00 2001
From: Yann Hamon <yann.hamon@contentful.com>
Date: Tue, 2 Jun 2020 00:08:47 +0200
Subject: [PATCH] fix bug - cache was not being used

---
 main.go | 54 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/main.go b/main.go
index 43cf2c1..a97b79c 100644
--- a/main.go
+++ b/main.go
@@ -95,7 +95,7 @@ func ValidateStream(r io.Reader, regs []registry.Registry, k8sVersion string, c
 		cacheKey := ""
 
 		if c != nil {
-			cacheKey := cache.Key(sig.Kind, sig.Version, k8sVersion)
+			cacheKey = cache.Key(sig.Kind, sig.Version, k8sVersion)
 			schema, ok = c.Get(cacheKey)
 		}
 		if !ok {
@@ -156,6 +156,23 @@ func skipKindsMap(skipKindsCSV string) map[string]bool {
 	return skipKinds
 }
 
+func processResults(o output.Output, validationResults chan []validationResult, result chan<- bool ) {
+	success := true
+	for results := range validationResults {
+		for _, result := range results {
+			if result.err != nil {
+				success = false
+			}
+
+			if err := o.Write(result.filename, result.kind, result.version, result.err, result.skipped); err != nil {
+				fmt.Fprint(os.Stderr, "failed writing log\n")
+			}
+		}
+	}
+
+	result <- success
+}
+
 func realMain() int {
 	var files, dirs, schemas arrayParam
 	var skipKindsCSV, k8sVersion, outputFormat string
@@ -175,12 +192,6 @@ func realMain() int {
 	flag.BoolVar(&verbose, "verbose", false, "print results for all resources")
 	flag.Parse()
 
-	var o output.Output
-	if o, err = getLogger(outputFormat, summary, verbose); err != nil {
-		fmt.Println(err)
-		return 1
-	}
-
 	skipKinds := skipKindsMap(skipKindsCSV)
 
 	filter := func(signature resource.Signature) bool {
@@ -213,25 +224,16 @@ func realMain() int {
 		close(fileBatches)
 	}()
 
+
+	var o output.Output
+	if o, err = getLogger(outputFormat, summary, verbose); err != nil {
+		fmt.Println(err)
+		return 1
+	}
+
+	res := make (chan bool)
 	validationResults := make(chan []validationResult)
-	var logWG sync.WaitGroup
-	logWG.Add(1)
-
-	success := true
-	go func() {
-		defer logWG.Done()
-		for results := range validationResults {
-			for _, result := range results {
-				if result.err != nil {
-					success = false
-				}
-
-				if err = o.Write(result.filename, result.kind, result.version, result.err, result.skipped); err != nil {
-					fmt.Fprint(os.Stderr, "failed writing log\n")
-				}
-			}
-		}
-	}()
+	go processResults(o, validationResults, res)
 
 	c := cache.New()
 	var wg sync.WaitGroup
@@ -262,7 +264,7 @@ func realMain() int {
 
 	wg.Wait()
 	close(validationResults)
-	logWG.Wait()
+	success := <-res
 	if err = o.Flush(); err != nil {
 		fmt.Fprint(os.Stderr, "failed flushing output")
 	}