add NewValidationConfig() func, initiate DisabledValidators when not defined -- as discussed by @steiler

Author: hansthienpondt

pkg/config/validation.go

@@ -1,15 +1,29 @@
 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"`
 }
 
 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(),

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/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

@@ -714,11 +714,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 {