Rename allowedRootChildren field

ubavic · Aug 24, 2024 · e85fc09 · e85fc09
1 parent c0b92f2
commit e85fc09
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/schema/schema.go b/schema/schema.go
@@ -24,7 +24,7 @@ type Target struct {
 }
 
 type Source struct {
-	AllowedRootChildren string    `yaml:"allowedRootChildren"`
+	AllowedRootCommands string    `yaml:"allowedRootChildren"`
 	Commands            []Command `yaml:"commands"`
 	Groups              []Group   `yaml:"groups"`
 }

diff --git a/schema/validator.go b/schema/validator.go
@@ -22,8 +22,8 @@ func (s Schema) validate(document parser.Element, parent *string) error {
 	var err error
 
 	if parent == nil {
-		if s.Source.AllowedRootChildren != "" {
-			parentAllowedCommands, err = s.getGroup(s.Source.AllowedRootChildren)
+		if s.Source.AllowedRootCommands != "" {
+			parentAllowedCommands, err = s.getGroup(s.Source.AllowedRootCommands)
 			if err != nil {
 				return fmt.Errorf("%w: parent allowed commands", err)
 			}

diff --git a/schema/validator_test.go b/schema/validator_test.go
@@ -14,7 +14,7 @@ func TestSchemaValidator(t *testing.T) {
 		Commands            []schema.Command
 		Tokens              []parser.Token
 		Groups              []schema.Group
-		AllowedRootChildren string
+		AllowedRootCommands string
 		ExpectedError       error
 	}{
 		{
@@ -75,7 +75,7 @@ func TestSchemaValidator(t *testing.T) {
 				{Type: parser.Identifier, Content: "c1"},
 				{Type: parser.EOF, Content: ""},
 			},
-			AllowedRootChildren: "G1",
+			AllowedRootCommands: "G1",
 			Groups: []schema.Group{
 				{
 					Name:     "G1",
@@ -92,7 +92,7 @@ func TestSchemaValidator(t *testing.T) {
 				{Type: parser.Identifier, Content: "c1"},
 				{Type: parser.EOF, Content: ""},
 			},
-			AllowedRootChildren: "G1",
+			AllowedRootCommands: "G1",
 			Groups: []schema.Group{
 				{
 					Name:     "G1",
@@ -109,7 +109,7 @@ func TestSchemaValidator(t *testing.T) {
 			func(t *testing.T) {
 				sc := schema.Schema{
 					Source: schema.Source{
-						AllowedRootChildren: testCase.AllowedRootChildren,
+						AllowedRootCommands: testCase.AllowedRootCommands,
 						Commands:            testCase.Commands,
 						Groups:              testCase.Groups,
 					},