fix custom unmarshalling

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

auditor/validator/validation.field.go

@@ -9,28 +9,28 @@ import (
 type (
 	AuditConfigValidationRuleField struct {
 		// general
-		Not      bool `yaml:"bool,omitempty"`
-		Required bool `yaml:"required,omitempty"`
+		Not      bool `json:"bool,omitempty"`
+		Required bool `json:"required,omitempty"`
 
 		// CAST
-		ParseAs *string `yaml:"castTo,omitempty"`
+		ParseAs *string `json:"castTo,omitempty"`
 
 		// STRING type
-		Match  *string        `yaml:"match,omitempty"`
-		Regexp *string        `yaml:"regexp,omitempty"`
-		regexp *regexp.Regexp `yaml:"-"`
+		Match  *string        `json:"match,omitempty"`
+		Regexp *string        `json:"regexp,omitempty"`
+		regexp *regexp.Regexp `json:"-"`
 
 		// STRINGLIST type
-		AllOf *[]string `yaml:"allOf,omitempty,flow"`
-		AnyOf *[]string `yaml:"anyOf,omitempty,flow"`
+		AllOf *[]string `json:"allOf,omitempty,flow"`
+		AnyOf *[]string `json:"anyOf,omitempty,flow"`
 
 		// NUMERIC
-		Min *float64 `yaml:"min,omitempty"`
-		Max *float64 `yaml:"max,omitempty"`
+		Min *float64 `json:"min,omitempty"`
+		Max *float64 `json:"max,omitempty"`
 
 		// DURATION
-		MinDuration *time.Duration `yaml:"minDuration,omitempty"`
-		MaxDuration *time.Duration `yaml:"maxDuration,omitempty"`
+		MinDuration *time.Duration `json:"minDuration,omitempty"`
+		MaxDuration *time.Duration `json:"maxDuration,omitempty"`
 	}
 )
 

auditor/validator/validation.go

@@ -10,35 +10,35 @@ import (
 
 type (
 	AuditConfigValidation struct {
-		Enabled              bool                                    `yaml:"enabled"`
-		Metrics              *bool                                   `yaml:"metrics"`
-		Query                *string                                 `yaml:"query,omitempty"`
-		Timespan             *string                                 `yaml:"timespan,omitempty"`
-		Workspaces           *[]string                               `yaml:"workspaces,omitempty"`
-		AdditionalWorkspaces *[]string                               `yaml:"additionalWorkspaces,omitempty"`
-		Rules                []*AuditConfigValidationRule            `yaml:"rules,omitempty"`
-		Prometheus           AuditConfigValidationPrometheus         `yaml:"prometheus,omitempty"`
-		Report               AuditConfigValidationReport             `yaml:"report,omitempty"`
-		Mapping              *map[string]string                      `yaml:"mapping,omitempty"`
-		Enrich               bool                                    `yaml:"enrich,omitempty"`
-		ScopeRules           map[string][]*AuditConfigValidationRule `yaml:"scopeRules,omitempty"`
+		Enabled              bool                                    `json:"enabled"`
+		Metrics              *bool                                   `json:"metrics"`
+		Query                *string                                 `json:"query,omitempty"`
+		Timespan             *string                                 `json:"timespan,omitempty"`
+		Workspaces           *[]string                               `json:"workspaces,omitempty"`
+		AdditionalWorkspaces *[]string                               `json:"additionalWorkspaces,omitempty"`
+		Rules                []*AuditConfigValidationRule            `json:"rules,omitempty"`
+		Prometheus           AuditConfigValidationPrometheus         `json:"prometheus,omitempty"`
+		Report               AuditConfigValidationReport             `json:"report,omitempty"`
+		Mapping              *map[string]string                      `json:"mapping,omitempty"`
+		Enrich               bool                                    `json:"enrich,omitempty"`
+		ScopeRules           map[string][]*AuditConfigValidationRule `json:"scopeRules,omitempty"`
 	}
 
 	AuditConfigValidationPrometheus struct {
-		Labels map[string]string `yaml:"labels,omitempty"`
+		Labels map[string]string `json:"labels,omitempty"`
 	}
 
 	AuditConfigValidationReport struct {
 		Filter struct {
-			Status   string `yaml:"status,omitempty"`
-			Resource string `yaml:"resource,omitempty"`
-			Rule     string `yaml:"rule,omitempty"`
-		} `yaml:"filter,omitempty"`
+			Status   string `json:"status,omitempty"`
+			Resource string `json:"resource,omitempty"`
+			Rule     string `json:"rule,omitempty"`
+		} `json:"filter,omitempty"`
 
 		Settings struct {
-			GroupBy string `yaml:"groupBy,omitempty"`
-			Fields  string `yaml:"fields,omitempty"`
-		} `yaml:"settings,omitempty"`
+			GroupBy string `json:"groupBy,omitempty"`
+			Fields  string `json:"fields,omitempty"`
+		} `json:"settings,omitempty"`
 	}
 )
 

auditor/validator/validation.rule.go

@@ -1,6 +1,7 @@
 package validator
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"regexp"
@@ -20,19 +21,19 @@ import (
 
 type (
 	AuditConfigValidationRule struct {
-		Rule   string `yaml:"rule"`
+		Rule   string `json:"rule"`
 		Fields map[string]AuditConfigValidationRuleField
-		Action string `yaml:"action"`
+		Action string `json:"action"`
 
 		// FUNC
-		CustomFunction *string `yaml:"func,omitempty"`
+		CustomFunction *string `json:"func,omitempty"`
 		customFunction *otto.Script
 
-		Stats AuditConfigValidationRuleStats `yaml:"stats,flow"`
+		Stats AuditConfigValidationRuleStats `json:"stats,flow"`
 	}
 
 	AuditConfigValidationRuleStats struct {
-		Matches int64 `yaml:"matches"`
+		Matches int64 `json:"matches"`
 	}
 )
 
@@ -42,9 +43,9 @@ var (
 	Logger *zap.SugaredLogger
 )
 
-func (matcher *AuditConfigValidationRule) UnmarshalYAML(unmarshal func(interface{}) error) error {
+func (matcher *AuditConfigValidationRule) UnmarshalJSON(b []byte) error {
 	config := map[string]interface{}{}
-	err := unmarshal(&config)
+	err := json.Unmarshal(b, &config)
 	if err == nil {
 		matcher.Fields = map[string]AuditConfigValidationRuleField{}
 		matcher.Action = "allow"

auditor/validator/validator_test.go

@@ -9,7 +9,7 @@ import (
 
 type (
 	TestValidator struct {
-		Test *AuditConfigValidation `yaml:"test"`
+		Test *AuditConfigValidation `json:"test"`
 	}
 )