fix tests

Author: tarokkk

pkg/resources/model/system.go

@@ -16,6 +16,7 @@ package model
 
 import (
 	"fmt"
+	"strconv"
 
 	"emperror.dev/errors"
 	"github.com/banzaicloud/logging-operator/pkg/resources/fluentd"
@@ -73,7 +74,11 @@ func (l *LoggingResources) CreateModel() (*types.Builder, error) {
 	if err != nil {
 		return nil, errors.WrapIf(err, "failed to create root input")
 	}
-	system := types.NewSystem(rootInput, types.NewRouter("main"))
+	router := types.NewRouter("main",
+		map[string]string{
+			"metrics": strconv.FormatBool(l.logging.Spec.FluentdSpec.Metrics != nil),
+		})
+	system := types.NewSystem(rootInput, router)
 	for _, flowCr := range l.Flows {
 		flow, err := l.CreateFlowFromCustomResource(flowCr)
 		if err != nil {

pkg/sdk/model/filter/concat_test.go

@@ -32,7 +32,7 @@ n_lines: 10
 	expected := `
 <filter **>
   @type concat
-  @id test_concat
+  @id test
   key message
   n_lines 10
   partial_key partial_message

pkg/sdk/model/filter/dedot_test.go

@@ -31,7 +31,7 @@ de_dot_nested: true
 	expected := `
 <filter **>
   @type dedot
-  @id test_dedot
+  @id test
   de_dot_nested true
   de_dot_separator -
 </filter>

pkg/sdk/model/filter/detect_exceptions_test.go

@@ -32,7 +32,7 @@ languages:
 	expected := `
 <match kubernetes.**>
   @type detect_exceptions
-  @id test_detect_exceptions
+  @id test
   languages ["java","python"]
   multiline_flush_interval 0.1
   remove_tag_prefix kubernetes

pkg/sdk/model/filter/geoip_test.go

@@ -35,7 +35,7 @@ records:
 	expected := `
 <filter **>
   @type geoip
-  @id test_geoip
+  @id test
   geoip_lookup_keys remote_addr
   skip_adding_null_record true
   <record>

pkg/sdk/model/filter/grep_test.go

@@ -31,7 +31,7 @@ regexp:
 	expected := `
 <filter **>
 @type grep
-@id test_grep
+@id test
 <regexp>
   key first
   pattern /^5\d\d$/
@@ -53,7 +53,7 @@ exclude:
 	expected := `
 <filter **>
 @type grep
-@id test_grep
+@id test
 <exclude>
   key first
   pattern /^5\d\d$/
@@ -78,7 +78,7 @@ or:
 	expected := `
 <filter **>
 @type grep
-@id test_grep
+@id test
 <or>
   <regexp>
 	key first
@@ -109,7 +109,7 @@ and:
 	expected := `
 <filter **>
 @type grep
-@id test_grep
+@id test
 <and>
   <exclude>
 	key first
@@ -145,7 +145,7 @@ and:
 	expected := `
 <filter **>
 @type grep
-@id test_grep
+@id test
 <exclude>
   key first
   pattern /^5\d\d$/

pkg/sdk/model/filter/parser_test.go

@@ -32,7 +32,7 @@ parse:
 	expected := `
 <filter **>
   @type parser
-  @id test_parser
+  @id test
   key_name message
   remove_key_name_field true
   reserve_data true
@@ -62,7 +62,7 @@ parse:
 	expected := `
 <filter **>
   @type parser
-  @id test_parser
+  @id test
   key_name message
   remove_key_name_field true
   reserve_data true

pkg/sdk/model/filter/prometheus_test.go

@@ -39,7 +39,7 @@ labels:
 	expected := `
 <filter **>
   @type prometheus
-  @id test_prometheus
+  @id test
 	<metric>
 	  desc The total number of foo in message.
 	  key foo

pkg/sdk/model/filter/record_modifier_test.go

@@ -30,7 +30,7 @@ records:
 	expected := `
 <filter **>
   @type record_modifier
-  @id test_record_modifier
+  @id test
   <record>
     foo bar
   </record>
@@ -58,7 +58,7 @@ records:
 	expected := `
 <filter **>
   @type record_modifier
-	@id test_record_modifier
+	@id test
 	char_encoding utf-8:euc-jp
 	prepare_value require 'foo'; @foo = Foo.new
 	remove_keys key1, key2

pkg/sdk/model/filter/record_transformer_test.go

@@ -30,7 +30,7 @@ records:
 	expected := `
 <filter **>
   @type record_transformer
-  @id test_record_transformer
+  @id test
   <record>
     foo bar
   </record>