refact pkg/acquisition: journalctl configuration (#4057)

Author: mmetc

cmd/crowdsec-cli/clisetup/setup/detect_test.go

@@ -390,7 +390,7 @@ detect:
         source: journalctl
         filename: /path/to/file.log`,
 			want:    nil,
-			wantErr: `invalid acquisition spec for foobar: cannot parse journalctl acquisition config: [1:1] unknown field "filename"`,
+			wantErr: `invalid acquisition spec for foobar: cannot parse: [1:1] unknown field "filename"`,
 		}, {
 			name: "source file: required fields",
 			config: `

pkg/acquisition/modules/journalctl/config.go

@@ -21,36 +21,58 @@ type Configuration struct {
 	since   string // set only by DSN
 }
 
-func (s *Source) UnmarshalConfig(yamlConfig []byte) error {
-	config := Configuration{}
+func ConfigurationFromYAML(y []byte) (Configuration, error) {
+	var cfg Configuration
 
-	// defaults
-	config.Mode = configuration.TAIL_MODE
+	if err := yaml.UnmarshalWithOptions(y, &cfg, yaml.Strict()); err != nil {
+		return cfg, fmt.Errorf("cannot parse: %s", yaml.FormatError(err, false, false))
+	}
 
-	err := yaml.UnmarshalWithOptions(yamlConfig, &config, yaml.Strict())
-	if err != nil {
-		return fmt.Errorf("cannot parse journalctl acquisition config: %s", yaml.FormatError(err, false, false))
+	cfg.SetDefaults()
+
+	if err := cfg.Validate(); err != nil {
+		return cfg, err
 	}
 
-	if len(config.Filters) == 0 {
+	return cfg, nil
+}
+
+func (c *Configuration) SetDefaults() {
+	if c.Mode == "" {
+		c.Mode = configuration.TAIL_MODE
+	}
+}
+
+func (c *Configuration) Validate() error {
+	if len(c.Filters) == 0 {
 		return errors.New("journalctl_filter is required")
 	}
 
-	s.config = config
+	return nil
+}
+
+func (s *Source) UnmarshalConfig(yamlConfig []byte) error {
+	cfg, err := ConfigurationFromYAML(yamlConfig)
+	if err != nil {
+		return err
+	}
+
+	s.config = cfg
+
 	s.setSrc(s.config.Filters)
 
 	return nil
 }
 
 func (s *Source) Configure(_ context.Context, yamlConfig []byte, logger *log.Entry, metricsLevel metrics.AcquisitionMetricsLevel) error {
-	s.metricsLevel = metricsLevel
-
 	if err := s.UnmarshalConfig(yamlConfig); err != nil {
 		return err
 	}
 
 	s.setLogger(logger, 0, s.src)
 
+	s.metricsLevel = metricsLevel
+
 	return nil
 }
 

pkg/acquisition/modules/journalctl/journalctl_test.go

@@ -33,7 +33,7 @@ func TestBadConfiguration(t *testing.T) {
 	}{
 		{
 			config:      `foobar: asd.log`,
-			expectedErr: `cannot parse journalctl acquisition config: [1:1] unknown field "foobar"`,
+			expectedErr: `cannot parse: [1:1] unknown field "foobar"`,
 		},
 		{
 			config: `