Merge pull request #309 from sdcio/configdiffadjustments

Config diff adjustments

Author: hansthienpondt

pkg/datastore/transaction_rpc.go

@@ -91,14 +91,14 @@ func (d *Datastore) replaceIntent(ctx context.Context, transaction *types.Transa
 	log.TraceFn(func() []interface{} { return []interface{}{root.String()} })
 
 	// perform validation
-	validationResult := root.Validate(ctx, d.config.Validation)
+	validationResult, validationStats := root.Validate(ctx, d.config.Validation)
 	validationResult.ErrorsStr()
 	if validationResult.HasErrors() {
 		return nil, validationResult.JoinErrors()
 	}
 
 	warnings := validationResult.WarningsStr()
-
+	log.Debugf("Transaction: %s - validation stats - %s", transaction.GetTransactionId(), validationStats.String())
 	log.Infof("Transaction: %s - validation passed", transaction.GetTransactionId())
 
 	// we use the TargetSourceReplace, that adjustes the tree results in a way
@@ -218,7 +218,9 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 	log.Debug(root.String())
 
 	// perform validation
-	validationResult := root.Validate(ctx, d.config.Validation)
+	validationResult, validationStats := root.Validate(ctx, d.config.Validation)
+
+	log.Debugf("Transaction: %s - Validation Stats: %s", transaction.GetTransactionId(), validationStats.String())
 
 	// prepare the response struct
 	result := &sdcpb.TransactionSetResponse{

pkg/datastore/tree_operation_test.go

@@ -823,7 +823,7 @@ func TestDatastore_populateTree(t *testing.T) {
 			}
 			fmt.Println(root.String())
 
-			validationResult := root.Validate(ctx, validationConfig)
+			validationResult, _ := root.Validate(ctx, validationConfig)
 
 			fmt.Printf("Validation Errors:\n%v\n", strings.Join(validationResult.ErrorsStr(), "\n"))
 			fmt.Printf("Tree:%s\n", root.String())

pkg/datastore/tree_operation_validation_test.go

@@ -205,7 +205,7 @@ func TestDatastore_validateTree(t *testing.T) {
 				t.Error(err)
 			}
 
-			validationResult := root.Validate(ctx, validationConfig)
+			validationResult, _ := root.Validate(ctx, validationConfig)
 
 			t.Log(root.String())
 

pkg/tree/entry.go

@@ -75,11 +75,11 @@ type Entry interface {
 	// GetDeletes returns the cache-updates that are not updated, have no lower priority value left and hence should be deleted completely
 	GetDeletes(entries []types.DeleteEntry, aggregatePaths bool) ([]types.DeleteEntry, error)
 	// Walk takes the EntryVisitor and applies it to every Entry in the tree
-	Walk(f EntryVisitor) error
+	Walk(ctx context.Context, v EntryVisitor) error
 	// Validate kicks off validation
-	Validate(ctx context.Context, resultChan chan<- *types.ValidationResultEntry, vCfg *config.Validation)
+	Validate(ctx context.Context, resultChan chan<- *types.ValidationResultEntry, statChan chan<- *types.ValidationStat, vCfg *config.Validation)
 	// validateMandatory the Mandatory schema field
-	validateMandatory(ctx context.Context, resultChan chan<- *types.ValidationResultEntry)
+	validateMandatory(ctx context.Context, resultChan chan<- *types.ValidationResultEntry, statChan chan<- *types.ValidationStat)
 	// validateMandatoryWithKeys is an internally used function that us called by validateMandatory in case
 	// the container has keys defined that need to be skipped before the mandatory attributes can be checked
 	validateMandatoryWithKeys(ctx context.Context, level int, attributes []string, choiceName string, resultChan chan<- *types.ValidationResultEntry)
@@ -157,4 +157,7 @@ type Entry interface {
 	BlameConfig(includeDefaults bool) (*sdcpb.BlameTreeElement, error)
 }
 
-type EntryVisitor func(s *sharedEntryAttributes) error
+type EntryVisitor interface {
+	Visit(ctx context.Context, s *sharedEntryAttributes) error
+	Up()
+}

pkg/tree/entry_test.go

@@ -531,7 +531,7 @@ func Test_Validation_Leaflist_Min_Max(t *testing.T) {
 
 			t.Log(root.String())
 
-			validationResult := root.Validate(context.TODO(), validationConfig)
+			validationResult, _ := root.Validate(context.TODO(), validationConfig)
 
 			// check if errors are received
 			// If so, join them and return the cumulated errors
@@ -571,7 +571,7 @@ func Test_Validation_Leaflist_Min_Max(t *testing.T) {
 				}
 			}
 
-			validationResult := root.Validate(context.TODO(), validationConfig)
+			validationResult, _ := root.Validate(context.TODO(), validationConfig)
 
 			// check if errors are received
 			// If so, join them and return the cumulated errors
@@ -617,7 +617,7 @@ func Test_Validation_Leaflist_Min_Max(t *testing.T) {
 				}
 			}
 
-			validationResult := root.Validate(context.TODO(), validationConfig)
+			validationResult, _ := root.Validate(context.TODO(), validationConfig)
 
 			// check if errors are received
 			// If so, join them and return the cumulated errors
@@ -1213,7 +1213,7 @@ func Test_Validation_String_Pattern(t *testing.T) {
 				t.Error(err)
 			}
 
-			validationResult := root.Validate(context.TODO(), validationConfig)
+			validationResult, _ := root.Validate(context.TODO(), validationConfig)
 
 			// check if errors are received
 			// If so, join them and return the cumulated errors
@@ -1250,7 +1250,7 @@ func Test_Validation_String_Pattern(t *testing.T) {
 				t.Error(err)
 			}
 
-			validationResult := root.Validate(context.TODO(), validationConfig)
+			validationResult, _ := root.Validate(context.TODO(), validationConfig)
 
 			// check if errors are received
 			// If so, join them and return the cumulated errors
@@ -1346,7 +1346,7 @@ func Test_Validation_Deref(t *testing.T) {
 				t.Error(err)
 			}
 
-			validationResult := root.Validate(context.TODO(), validationConfig)
+			validationResult, _ := root.Validate(context.TODO(), validationConfig)
 
 			// check if errors are received
 			// If so, join them and return the cumulated errors

pkg/tree/root_entry.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"sync"
 
 	"github.com/sdcio/data-server/pkg/config"
 	"github.com/sdcio/data-server/pkg/tree/importer"
@@ -88,26 +89,44 @@ func (r *RootEntry) ImportConfig(ctx context.Context, basePath types.PathSlice,
 	return e.ImportConfig(ctx, importer, intentName, intentPrio, flags)
 }
 
-func (r *RootEntry) Validate(ctx context.Context, vCfg *config.Validation) types.ValidationResults {
+func (r *RootEntry) Validate(ctx context.Context, vCfg *config.Validation) (types.ValidationResults, *types.ValidationStatOverall) {
 	// perform validation
 	// we use a channel and cumulate all the errors
 	validationResultEntryChan := make(chan *types.ValidationResultEntry, 10)
+	validationStatChan := make(chan *types.ValidationStat, 10)
 
 	// start validation in a seperate goroutine
 	go func() {
-		r.sharedEntryAttributes.Validate(ctx, validationResultEntryChan, vCfg)
+		r.sharedEntryAttributes.Validate(ctx, validationResultEntryChan, validationStatChan, vCfg)
 		close(validationResultEntryChan)
+		close(validationStatChan)
 	}()
 
 	// create a ValidationResult struct
 	validationResult := types.ValidationResults{}
+	validationStatOverall := types.NewValidationStatOverall()
 
-	// read from the validationResult channel
-	for e := range validationResultEntryChan {
-		validationResult.AddEntry(e)
-	}
+	syncWait := &sync.WaitGroup{}
+	syncWait.Add(1)
+	go func() {
+		// read from the validationResult channel
+		for e := range validationResultEntryChan {
+			validationResult.AddEntry(e)
+		}
+		syncWait.Done()
+	}()
+
+	syncWait.Add(1)
+	go func() {
+		// read from the validationResult channel
+		for e := range validationStatChan {
+			validationStatOverall.MergeStat(e)
+		}
+		syncWait.Done()
+	}()
 
-	return validationResult
+	syncWait.Wait()
+	return validationResult, validationStatOverall
 }
 
 // String returns the string representation of the Tree.