OneShot() wineventlog

Author: mmetc

pkg/acquisition/modules/wineventlog/run_windows.go

@@ -119,7 +119,7 @@ func (s *Source) getEvents(out chan pipeline.Event, t *tomb.Tomb) error {
 	}
 }
 
-func (s *Source) OneShotAcquisition(ctx context.Context, out chan pipeline.Event, t *tomb.Tomb) error {
+func (s *Source) OneShot(ctx context.Context, out chan pipeline.Event) error {
 	handle, err := wevtapi.EvtQuery(localMachine, s.evtConfig.ChannelPath, s.evtConfig.Query, s.evtConfig.Flags)
 	if err != nil {
 		return fmt.Errorf("EvtQuery failed: %v", err)
@@ -137,7 +137,7 @@ func (s *Source) OneShotAcquisition(ctx context.Context, out chan pipeline.Event
 OUTER_LOOP:
 	for {
 		select {
-		case <-t.Dying():
+		case <-ctx.Done():
 			s.logger.Infof("wineventlog is dying")
 			return nil
 		default:

pkg/acquisition/modules/wineventlog/stub.go

@@ -41,7 +41,7 @@ func (*Source) SupportedModes() []string {
 	return []string{configuration.TAIL_MODE, configuration.CAT_MODE}
 }
 
-func (*Source) OneShotAcquisition(_ context.Context, _ chan pipeline.Event, _ *tomb.Tomb) error {
+func (*Source) OneShot(_ context.Context, _ chan pipeline.Event) error {
 	return nil
 }
 

pkg/acquisition/modules/wineventlog/wineventlog_windows_test.go

@@ -243,7 +243,7 @@ event_ids:
 	}
 }
 
-func TestOneShotAcquisition(t *testing.T) {
+func TestOneShot(t *testing.T) {
 	ctx := t.Context()
 
 	tests := []struct {
@@ -289,7 +289,6 @@ func TestOneShotAcquisition(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			lineCount := 0
-			to := &tomb.Tomb{}
 			c := make(chan pipeline.Event)
 			f := Source{}
 
@@ -304,13 +303,13 @@ func TestOneShotAcquisition(t *testing.T) {
 					select {
 					case <-c:
 						lineCount++
-					case <-to.Dying():
+					case <-ctx.Done():
 						return
 					}
 				}
 			}()
 
-			err = f.OneShotAcquisition(ctx, c, to)
+			err = f.OneShot(ctx, c)
 			cstest.RequireErrorContains(t, err, test.expectedErr)
 
 			if test.expectedErr != "" {

pkg/acquisition/wineventlog.go

@@ -10,7 +10,7 @@ var (
 	// verify interface compliance
 	_ DataSource      = (*wineventlogacquisition.Source)(nil)
 	_ DSNConfigurer   = (*wineventlogacquisition.Source)(nil)
-	_ Fetcher         = (*wineventlogacquisition.Source)(nil)
+	_ BatchFetcher    = (*wineventlogacquisition.Source)(nil)
 	_ Tailer          = (*wineventlogacquisition.Source)(nil)
 	_ MetricsProvider = (*wineventlogacquisition.Source)(nil)
 )