Osquerybeat: Fix the configuration poll interval setting (#26739)

aleksmaus · mergify-bot · commit 637cb8da2420 · 2021-07-06T16:30:54.000Z
* Fix the configuration poll interval setting * Unit tests (cherry picked from commit 1e4971f)
diff --git a/x-pack/osquerybeat/internal/osqd/osqueryd.go b/x-pack/osquerybeat/internal/osqd/osqueryd.go
@@ -65,7 +65,7 @@ func WithBinaryPath(binPath string) Option {
 
 func WithConfigRefresh(refreshInterval int) Option {
 	return func(q *OSQueryD) {
-		q.extensionsTimeout = refreshInterval
+		q.configRefreshInterval = refreshInterval
 	}
 }
 
diff --git a/x-pack/osquerybeat/internal/osqd/osqueryd_test.go b/x-pack/osquerybeat/internal/osqd/osqueryd_test.go
@@ -0,0 +1,48 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License;
+// you may not use this file except in compliance with the Elastic License.
+
+package osqd
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+func TestNew(t *testing.T) {
+
+	socketPath := "/var/run/foobar"
+
+	extensionsTimeout := 5
+	configurationRefreshIntervalSecs := 12
+	configPluginName := "config_plugin_test"
+	loggerPluginName := "logger_plugin_test"
+
+	osq := New(
+		socketPath,
+		WithExtensionsTimeout(extensionsTimeout),
+		WithConfigRefresh(configurationRefreshIntervalSecs),
+		WithConfigPlugin(configPluginName),
+		WithLoggerPlugin(loggerPluginName),
+	)
+
+	diff := cmp.Diff(extensionsTimeout, osq.extensionsTimeout)
+	if diff != "" {
+		t.Error(diff)
+	}
+
+	diff = cmp.Diff(configurationRefreshIntervalSecs, osq.configRefreshInterval)
+	if diff != "" {
+		t.Error(diff)
+	}
+	diff = cmp.Diff(configPluginName, osq.configPlugin)
+	if diff != "" {
+		t.Error(diff)
+	}
+
+	diff = cmp.Diff(loggerPluginName, osq.loggerPlugin)
+	if diff != "" {
+		t.Error(diff)
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func WithBinaryPath(binPath string) Option {`
`65`	`65`
`66`	`66`	`func WithConfigRefresh(refreshInterval int) Option {`
`67`	`67`	`return func(q *OSQueryD) {`
`68`		`- q.extensionsTimeout = refreshInterval`
	`68`	`+ q.configRefreshInterval = refreshInterval`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`