Renamed Logical_Op to LogicalOp

Signed-off-by: joseacl <[email protected]>

Author: joseacl

charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentbitagents.yaml

@@ -1282,7 +1282,7 @@ spec:
                     items:
                       type: string
                     type: array
-                  Logical_Op:
+                  LogicalOp:
                     default: legacy
                     enum:
                     - legacy

charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml

@@ -2138,7 +2138,7 @@ spec:
                         items:
                           type: string
                         type: array
-                      Logical_Op:
+                      LogicalOp:
                         default: legacy
                         enum:
                         - legacy

charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml

@@ -1279,7 +1279,7 @@ spec:
                     items:
                       type: string
                     type: array
-                  Logical_Op:
+                  LogicalOp:
                     default: legacy
                     enum:
                     - legacy

charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml

@@ -2135,7 +2135,7 @@ spec:
                         items:
                           type: string
                         type: array
-                      Logical_Op:
+                      LogicalOp:
                         default: legacy
                         enum:
                         - legacy

config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml

@@ -1279,7 +1279,7 @@ spec:
                     items:
                       type: string
                     type: array
-                  Logical_Op:
+                  LogicalOp:
                     default: legacy
                     enum:
                     - legacy

config/crd/bases/logging.banzaicloud.io_loggings.yaml

@@ -2135,7 +2135,7 @@ spec:
                         items:
                           type: string
                         type: array
-                      Logical_Op:
+                      LogicalOp:
                         default: legacy
                         enum:
                         - legacy

docs/configuration/crds/v1beta1/fluentbit_types.md

@@ -860,7 +860,7 @@ FilterGrep The Grep Filter plugin
 Exclude records where the content of KEY matches the regular expression. 
 
 
-### Logical_Op (string, optional) {#filtergrep-logical_op}
+### LogicalOp (string, optional) {#filtergrep-logicalop}
 
 Specify a logical operator: AND, OR or legacy (default). In legacy mode the behavior is either AND or OR depending on whether the grep is including (uses AND) or excluding (uses OR). Available from 2.1 or higher. Default: "legacy"  
 

pkg/resources/fluentbit/config.go

@@ -77,8 +77,8 @@ var fluentBitConfigTemplate = `
     Name        grep
     Match       {{ .FluentdFilterGrep.Match }}
 
-    {{- if .FluentdFilterGrep.Logical_Op }}
-    Logical_Op  {{ .FluentdFilterGrep.Logical_Op }}
+    {{- if .FluentdFilterGrep.LogicalOp }}
+    Logical_Op  {{ .FluentdFilterGrep.LogicalOp }}
     {{- end }}
 
     {{- range $value := .FluentdFilterGrep.Regex }}

pkg/resources/fluentbit/configsecret.go

@@ -87,10 +87,10 @@ type fluentBitConfig struct {
 }
 
 type FluentdFilterGrep struct {
-	Match      string
-	Regex      []string
-	Exclude    []string
-	Logical_Op string
+	Match     string
+	Regex     []string
+	Exclude   []string
+	LogicalOp string
 }
 
 type fluentForwardOutputConfig struct {
@@ -474,15 +474,15 @@ func (r *Reconciler) configSecret() (runtime.Object, reconciler.DesiredState, er
 }
 
 func toFluentdFilterGrep(filterGrep *v1beta1.FilterGrep) (*FluentdFilterGrep, error) {
-	if filterGrep.Logical_Op != "legacy" && len(filterGrep.Regex) > 0 && len(filterGrep.Exclude) > 0 {
-		return nil, errors.New("failed to parse grep filter for fluentbit, Logical_Op is set, it's not possible to set both Regex and Exclude")
+	if filterGrep.LogicalOp != "legacy" && len(filterGrep.Regex) > 0 && len(filterGrep.Exclude) > 0 {
+		return nil, errors.New("failed to parse grep filter for fluentbit, LogicalOp is set, it's not possible to set both Regex and Exclude")
 	}
 
 	fluentdFilterGrep := &FluentdFilterGrep{
-		Match:      filterGrep.Match,
-		Regex:      filterGrep.Regex,
-		Exclude:    filterGrep.Exclude,
-		Logical_Op: filterGrep.Logical_Op,
+		Match:     filterGrep.Match,
+		Regex:     filterGrep.Regex,
+		Exclude:   filterGrep.Exclude,
+		LogicalOp: filterGrep.LogicalOp,
 	}
 
 	return fluentdFilterGrep, nil

pkg/resources/fluentbit/configsecret_test.go

@@ -23,32 +23,32 @@ import (
 
 func TestInvalidFilterGrepConfig(t *testing.T) {
 	invalidFilterGrep := &v1beta1.FilterGrep{
-		Match:      "*",
-		Regex:      []string{"regex", "reg2"},
-		Exclude:    []string{"exclude"},
-		Logical_Op: "AND",
+		Match:     "*",
+		Regex:     []string{"regex", "reg2"},
+		Exclude:   []string{"exclude"},
+		LogicalOp: "AND",
 	}
 
 	_, err := toFluentdFilterGrep(invalidFilterGrep)
 
-	assert.EqualError(t, err, "failed to parse grep filter for fluentbit, Logical_Op is set, it's not possible to set both Regex and Exclude")
+	assert.EqualError(t, err, "failed to parse grep filter for fluentbit, LogicalOp is set, it's not possible to set both Regex and Exclude")
 }
 
 func TestValidFilterGrepConfig(t *testing.T) {
 	filterGrep := &v1beta1.FilterGrep{
-		Match:      "*",
-		Regex:      []string{"regex1", "regex2"},
-		Logical_Op: "AND",
+		Match:     "*",
+		Regex:     []string{"regex1", "regex2"},
+		LogicalOp: "AND",
 	}
 
 	expectedFluentFilterGrep := &FluentdFilterGrep{
-		Match:      "*",
-		Regex:      []string{"regex1", "regex2"},
-		Logical_Op: "AND",
+		Match:     "*",
+		Regex:     []string{"regex1", "regex2"},
+		LogicalOp: "AND",
 	}
 
 	parserFluentdFilterGrep, err := toFluentdFilterGrep(filterGrep)
 
 	assert.NoError(t, err)
-	assert.EqualValues(t, parserFluentdfilterGrep, expectedFluentFilterGrep)
+	assert.EqualValues(t, parserFluentdFilterGrep, expectedFluentFilterGrep)
 }