re-apply

Author: orestisfl

filebeat/input/filestream/identifier_nonwindows_test.go

@@ -48,9 +48,9 @@ func TestFileIdentifierInodeMarker(t *testing.T) {
 		}
 		require.NoError(t, markerFile.Sync())
 
-		c := conf.MustNewConfigFrom(map[string]interface{}{
-			"identifier": map[string]interface{}{
-				"inode_marker": map[string]interface{}{
+		c := conf.MustNewConfigFrom(map[string]any{
+			"identifier": map[string]any{
+				"inode_marker": map[string]any{
 					"path": markerFile.Name(),
 				},
 			},

libbeat/processors/add_docker_metadata/add_docker_metadata.go

@@ -402,7 +402,7 @@ func (d *addDockerMetadata) resolveCIDFromPdata(body pcommon.Map) (string, error
 // resolveCIDFromSourcePath runs the configured source processor against a
 // synthetic event carrying only the log.file.path value, returning the
 // container ID
-func (d *addDockerMetadata) resolveCIDFromSourcePath(logFilePath interface{}) (string, error) {
+func (d *addDockerMetadata) resolveCIDFromSourcePath(logFilePath any) (string, error) {
 	miniEvent := &beat.Event{Fields: mapstr.M{"log": mapstr.M{"file": mapstr.M{"path": logFilePath}}}}
 	result, err := d.sourceProcessor.Run(miniEvent)
 	if err != nil {

x-pack/libbeat/cmd/instance/receiver_test.go

@@ -152,7 +152,7 @@ type fakeActionDiagExtension struct {
 	registeredDiagName  string
 	registeredActionFor string
 	unregisteredFor     string
-	actionHandler       func(ctx context.Context, params map[string]interface{}) (map[string]interface{}, error)
+	actionHandler       func(ctx context.Context, params map[string]any) (map[string]any, error)
 }
 
 func (f *fakeActionDiagExtension) Start(context.Context, component.Host) error { return nil }
@@ -164,7 +164,7 @@ func (f *fakeActionDiagExtension) RegisterDiagnosticHook(name, _, _, _ string, _
 	f.registeredDiagName = name
 }
 
-func (f *fakeActionDiagExtension) RegisterActionHandler(name string, handler func(ctx context.Context, params map[string]interface{}) (map[string]interface{}, error)) error {
+func (f *fakeActionDiagExtension) RegisterActionHandler(name string, handler func(ctx context.Context, params map[string]any) (map[string]any, error)) error {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 	f.registeredActionFor = name
@@ -196,9 +196,9 @@ type fakeAction struct {
 
 func (a *fakeAction) Name() string { return a.name }
 
-func (a *fakeAction) Execute(_ context.Context, _ map[string]interface{}) (map[string]interface{}, error) {
+func (a *fakeAction) Execute(_ context.Context, _ map[string]any) (map[string]any, error) {
 	a.executed.Store(true)
-	return map[string]interface{}{"ok": true}, nil
+	return map[string]any{"ok": true}, nil
 }
 
 // TestBeatReceiverStart_WiresActionAndDiagnosticExtensions verifies that Start
@@ -271,9 +271,9 @@ func TestBeatReceiverStart_WiresActionAndDiagnosticExtensions(t *testing.T) {
 	ext.mu.Unlock()
 	require.NotNil(t, handler, "action handler should have been registered with the extension")
 
-	res, err := handler(t.Context(), map[string]interface{}{"id": "abc"})
+	res, err := handler(t.Context(), map[string]any{"id": "abc"})
 	require.NoError(t, err)
-	assert.Equal(t, map[string]interface{}{"ok": true}, res)
+	assert.Equal(t, map[string]any{"ok": true}, res)
 	assert.True(t, act.executed.Load(), "invoking the registered handler should execute the underlying action")
 
 	b.Manager.UnregisterAction(act)

x-pack/otel/otelmanager/manager_test.go

@@ -19,12 +19,12 @@ import (
 // forwarding of RegisterAction/UnregisterAction.
 type fakeActionExtension struct {
 	registeredName   string
-	handler          func(ctx context.Context, params map[string]interface{}) (map[string]interface{}, error)
+	handler          func(ctx context.Context, params map[string]any) (map[string]any, error)
 	unregisteredName string
 	registerErr      error
 }
 
-func (f *fakeActionExtension) RegisterActionHandler(name string, handler func(ctx context.Context, params map[string]interface{}) (map[string]interface{}, error)) error {
+func (f *fakeActionExtension) RegisterActionHandler(name string, handler func(ctx context.Context, params map[string]any) (map[string]any, error)) error {
 	f.registeredName = name
 	f.handler = handler
 	return f.registerErr
@@ -43,7 +43,7 @@ type fakeAction struct {
 
 func (a *fakeAction) Name() string { return a.name }
 
-func (a *fakeAction) Execute(_ context.Context, params map[string]interface{}) (map[string]interface{}, error) {
+func (a *fakeAction) Execute(_ context.Context, params map[string]any) (map[string]any, error) {
 	a.executed = true
 	return params, nil
 }
@@ -64,9 +64,9 @@ func TestOtelManager_RegisterAction(t *testing.T) {
 	assert.Equal(t, "osquerybeatreceiver/_agent-component/osquery-default/stream", ext.registeredName)
 	require.NotNil(t, ext.handler)
 
-	res, err := ext.handler(t.Context(), map[string]interface{}{"id": "abc"})
+	res, err := ext.handler(t.Context(), map[string]any{"id": "abc"})
 	require.NoError(t, err)
-	assert.Equal(t, map[string]interface{}{"id": "abc"}, res)
+	assert.Equal(t, map[string]any{"id": "abc"}, res)
 	assert.True(t, action.executed, "invoking the registered handler should execute the underlying action")
 
 	m.UnregisterAction(action)