Merge pull request #294 from sdcio/fixValidatorConfig

Fix Validator Config

Author: hansthienpondt

pkg/config/validation.go

@@ -1,14 +1,36 @@
 package config
 
+func NewValidationConfig() *Validation {
+	return &Validation{
+		DisabledValidators: &Validators{},
+		DisableConcurrency: bool(false),
+	}
+}
+
 type Validation struct {
-	DisabledValidators Validators `yaml:"disabled-validators,omitempty" json:"disabled-validators,omitempty"`
-	DisableConcurrency bool       `yaml:"disable-concurrency,omitempty" json:"disable-concurrency,omitempty"`
+	DisabledValidators *Validators `yaml:"disabled-validators,omitempty" json:"disabled-validators,omitempty"`
+	DisableConcurrency bool        `yaml:"disable-concurrency,omitempty" json:"disable-concurrency,omitempty"`
 }
 
 func (v *Validation) validateSetDefaults() error {
+	// no change required, all the bools default to false
+	if v.DisabledValidators == nil {
+		v.DisabledValidators = &Validators{}
+	}
 	return nil
 }
 
+func (v *Validation) SetDisableConcurrency(b bool) {
+	v.DisableConcurrency = b
+}
+
+func (v *Validation) DeepCopy() *Validation {
+	return &Validation{
+		DisabledValidators: v.DisabledValidators.DeepCopy(),
+		DisableConcurrency: v.DisableConcurrency,
+	}
+}
+
 type Validators struct {
 	Mandatory               bool `yaml:"mandatory,omitempty" json:"mandatory,omitempty"`
 	Leafref                 bool `yaml:"leafref,omitempty" json:"leafref,omitempty"`
@@ -30,3 +52,16 @@ func (v *Validators) DisableAll() {
 	v.Pattern = true
 	v.Range = true
 }
+
+func (v *Validators) DeepCopy() *Validators {
+	return &Validators{
+		Mandatory:               v.Mandatory,
+		Leafref:                 v.Leafref,
+		LeafrefMinMaxAttributes: v.LeafrefMinMaxAttributes,
+		Pattern:                 v.Pattern,
+		MustStatement:           v.MustStatement,
+		Length:                  v.Length,
+		Range:                   v.Range,
+		MaxElements:             v.MaxElements,
+	}
+}

pkg/datastore/transaction_rpc.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/sdcio/data-server/pkg/config"
 	"github.com/sdcio/data-server/pkg/datastore/types"
 	"github.com/sdcio/data-server/pkg/tree"
 	treeproto "github.com/sdcio/data-server/pkg/tree/importer/proto"
@@ -23,10 +22,6 @@ var (
 	ErrValidationError = errors.New("validation error")
 )
 
-const (
-	ConcurrentValidate = false
-)
-
 // SdcpbTransactionIntentToInternalTI converts sdcpb.TransactionIntent to types.TransactionIntent
 func (d *Datastore) SdcpbTransactionIntentToInternalTI(ctx context.Context, req *sdcpb.TransactionIntent) (*types.TransactionIntent, error) {
 
@@ -96,7 +91,7 @@ func (d *Datastore) replaceIntent(ctx context.Context, transaction *types.Transa
 	log.TraceFn(func() []interface{} { return []interface{}{root.String()} })
 
 	// perform validation
-	validationResult := root.Validate(ctx, &config.Validation{DisableConcurrency: !ConcurrentValidate})
+	validationResult := root.Validate(ctx, d.config.Validation)
 	validationResult.ErrorsStr()
 	if validationResult.HasErrors() {
 		return nil, validationResult.JoinErrors()
@@ -126,7 +121,7 @@ func (d *Datastore) replaceIntent(ctx context.Context, transaction *types.Transa
 func (d *Datastore) LoadAllButRunningIntents(ctx context.Context, root *tree.RootEntry) ([]string, error) {
 
 	intentNames := []string{}
-	IntentChan := make(chan *tree_persist.Intent, 0)
+	IntentChan := make(chan *tree_persist.Intent)
 	ErrChan := make(chan error, 1)
 
 	go d.cacheClient.IntentGetAll(ctx, []string{"running"}, IntentChan, ErrChan)
@@ -223,7 +218,7 @@ func (d *Datastore) lowlevelTransactionSet(ctx context.Context, transaction *typ
 	log.Debug(root.String())
 
 	// perform validation
-	validationResult := root.Validate(ctx, &config.Validation{DisableConcurrency: !ConcurrentValidate})
+	validationResult := root.Validate(ctx, d.config.Validation)
 
 	// prepare the response struct
 	result := &sdcpb.TransactionSetResponse{

pkg/datastore/tree_operation_test.go

@@ -35,10 +35,15 @@ import (
 
 var (
 	// TypedValue Bool True and false
-	TypedValueTrue  = &sdcpb.TypedValue{Value: &sdcpb.TypedValue_BoolVal{BoolVal: true}}
-	TypedValueFalse = &sdcpb.TypedValue{Value: &sdcpb.TypedValue_BoolVal{BoolVal: false}}
+	TypedValueTrue   = &sdcpb.TypedValue{Value: &sdcpb.TypedValue_BoolVal{BoolVal: true}}
+	TypedValueFalse  = &sdcpb.TypedValue{Value: &sdcpb.TypedValue_BoolVal{BoolVal: false}}
+	validationConfig = config.NewValidationConfig()
 )
 
+func init() {
+	validationConfig.SetDisableConcurrency(true)
+}
+
 func TestDatastore_populateTree(t *testing.T) {
 	prio15 := int32(15)
 	prio10 := int32(10)
@@ -818,7 +823,7 @@ func TestDatastore_populateTree(t *testing.T) {
 			}
 			fmt.Println(root.String())
 
-			validationResult := root.Validate(ctx, &config.Validation{DisableConcurrency: true})
+			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

@@ -23,7 +23,6 @@ import (
 
 	"github.com/openconfig/ygot/ygot"
 	"github.com/sdcio/data-server/pkg/cache"
-	"github.com/sdcio/data-server/pkg/config"
 	schemaClient "github.com/sdcio/data-server/pkg/datastore/clients/schema"
 	"github.com/sdcio/data-server/pkg/tree"
 	json_importer "github.com/sdcio/data-server/pkg/tree/importer/json"
@@ -206,7 +205,7 @@ func TestDatastore_validateTree(t *testing.T) {
 				t.Error(err)
 			}
 
-			validationResult := root.Validate(ctx, &config.Validation{DisableConcurrency: true})
+			validationResult := root.Validate(ctx, validationConfig)
 
 			t.Log(root.String())
 

pkg/server/datastore.go

@@ -132,7 +132,8 @@ func (s *Server) CreateDataStore(ctx context.Context, req *sdcpb.CreateDataStore
 			Vendor:  req.GetSchema().GetVendor(),
 			Version: req.GetSchema().GetVersion(),
 		},
-		SBI: sbi,
+		SBI:        sbi,
+		Validation: s.config.Validation.DeepCopy(),
 	}
 	if req.GetSync() != nil {
 		dsConfig.Sync = &config.Sync{

pkg/tree/default_value_test.go

@@ -149,7 +149,7 @@ func TestDefaultValueRetrieve(t *testing.T) {
 				return rsp.GetSchema()
 			},
 			wanterr: false,
-			want:    types.NewUpdate(types.PathSlice{}, &sdcpb.TypedValue{Value: &sdcpb.TypedValue_LeaflistVal{LeaflistVal: &sdcpb.ScalarArray{Element: []*sdcpb.TypedValue{&sdcpb.TypedValue{Value: &sdcpb.TypedValue_StringVal{StringVal: "foo"}}, &sdcpb.TypedValue{Value: &sdcpb.TypedValue_StringVal{StringVal: "bar"}}}}}}, 5, "owner1", 0),
+			want:    types.NewUpdate(types.PathSlice{}, &sdcpb.TypedValue{Value: &sdcpb.TypedValue_LeaflistVal{LeaflistVal: &sdcpb.ScalarArray{Element: []*sdcpb.TypedValue{{Value: &sdcpb.TypedValue_StringVal{StringVal: "foo"}}, {Value: &sdcpb.TypedValue_StringVal{StringVal: "bar"}}}}}}, 5, "owner1", 0),
 		},
 	}
 	for _, tt := range tests {

pkg/tree/entry_test.go

@@ -18,13 +18,14 @@ import (
 var (
 	flagsNew         *types.UpdateInsertFlags
 	flagsExisting    *types.UpdateInsertFlags
-	validationConfig = &config.Validation{DisableConcurrency: true}
+	validationConfig = config.NewValidationConfig()
 )
 
 func init() {
 	flagsNew = types.NewUpdateInsertFlags()
 	flagsNew.SetNewFlag()
 	flagsExisting = types.NewUpdateInsertFlags()
+	validationConfig.SetDisableConcurrency(true)
 }
 
 func Test_Entry(t *testing.T) {

pkg/tree/sharedEntryAttributes_test.go

@@ -716,11 +716,12 @@ func Test_sharedEntryAttributes_validateMandatory(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			root := tt.r(t)
 
-			dv := &config.Validators{}
-			dv.DisableAll()
-			dv.Mandatory = false
+			validationConfig := config.NewValidationConfig()
+			validationConfig.SetDisableConcurrency(true)
+			validationConfig.DisabledValidators.DisableAll()
+			validationConfig.DisabledValidators.Mandatory = false
 
-			validationResults := root.Validate(ctx, &config.Validation{DisableConcurrency: true, DisabledValidators: *dv})
+			validationResults := root.Validate(ctx, validationConfig)
 
 			results := []string{}
 			for _, e := range validationResults {