make encoding inline and re-enable encoding lower|upper tests

observIQ · May 26, 2021 · 3fc4bd5 · 3fc4bd5
1 parent 9b89129
commit 3fc4bd5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/operator/builtin/input/file/config.go b/operator/builtin/input/file/config.go
@@ -48,7 +48,7 @@ type InputConfig struct {
 	FingerprintSize    helper.ByteSize        `json:"fingerprint_size,omitempty"     yaml:"fingerprint_size,omitempty"`
 	MaxLogSize         helper.ByteSize        `json:"max_log_size,omitempty"         yaml:"max_log_size,omitempty"`
 	MaxConcurrentFiles int                    `json:"max_concurrent_files,omitempty" yaml:"max_concurrent_files,omitempty"`
-	Encoding           helper.EncodingConfig  `json:"encoding,omitempty"             yaml:"encoding,omitempty"`
+	Encoding           helper.EncodingConfig  `json:",inline,omitempty"              yaml:",inline,omitempty"`
 }
 
 // Build will build a file input operator from the supplied configuration

diff --git a/operator/builtin/input/file/config_test.go b/operator/builtin/input/file/config_test.go
@@ -482,7 +482,7 @@ func TestConfig(t *testing.T) {
 				return cfg
 			}(),
 		},
-		/*{
+		{
 			Name:      "encoding_lower",
 			ExpectErr: false,
 			Expect: func() *InputConfig {
@@ -499,7 +499,7 @@ func TestConfig(t *testing.T) {
 				cfg.Encoding = helper.EncodingConfig{Encoding: "UTF-16lE"}
 				return cfg
 			}(),
-		},*/
+		},
 	}
 
 	for _, tc := range cases {