fix test

elastic · Nov 23, 2023 · 053fbed · 053fbed
1 parent 96bdb42
commit 053fbed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/internal/pkg/api/handleAck.go b/internal/pkg/api/handleAck.go
@@ -452,7 +452,7 @@ func (ack *AckT) updateAPIKey(ctx context.Context,
 		outputBulk := ack.bulk.GetBulker(outputName)
 		if outputBulk != nil {
 			zlog.Debug().Str("outputName", outputName).Msg("Using output bulker in updateAPIKey")
-			bulk = *outputBulk
+			bulk = outputBulk
 		}
 	}
 	if apiKeyID != "" {
@@ -598,15 +598,14 @@ func (ack *AckT) invalidateAPIKeys(ctx context.Context, zlog zerolog.Logger, toR
 			if err != nil || policy == nil {
 				zlog.Debug().Str("outputName", outputName).Msg("Output policy not found")
 			} else {
-				blk, _, err := ack.bulk.CreateAndGetBulker(ctx, zlog, outputName, policy.Data.Outputs)
-				outputBulk = &blk
+				outputBulk, _, err = ack.bulk.CreateAndGetBulker(ctx, zlog, outputName, policy.Data.Outputs)
 				if err != nil {
 					zlog.Debug().Str("outputName", outputName).Msg("Failed to recreate output bulker")
 				}
 			}
 		}
 		if outputBulk != nil {
-			if err := (*outputBulk).APIKeyInvalidate(ctx, outputIds...); err != nil {
+			if err := outputBulk.APIKeyInvalidate(ctx, outputIds...); err != nil {
 				zlog.Info().Err(err).Strs("ids", outputIds).Str("outputName", outputName).Msg("Failed to invalidate API keys")
 			}
 		}

diff --git a/internal/pkg/bulk/engine.go b/internal/pkg/bulk/engine.go
@@ -69,7 +69,7 @@ type Bulk interface {
 	Client() *elasticsearch.Client
 
 	CreateAndGetBulker(ctx context.Context, zlog zerolog.Logger, outputName string, outputMap map[string]map[string]interface{}) (Bulk, bool, error)
-	GetBulker(outputName string) *Bulk
+	GetBulker(outputName string) Bulk
 	GetBulkerMap() map[string]Bulk
 	CancelFn() context.CancelFunc
 
@@ -123,9 +123,8 @@ func NewBulker(es esapi.Transport, tracer *apm.Tracer, opts ...BulkOpt) *Bulker
 	}
 }
 
-func (b *Bulker) GetBulker(outputName string) *Bulk {
-	blk := b.bulkerMap[outputName]
-	return &blk
+func (b *Bulker) GetBulker(outputName string) Bulk {
+	return b.bulkerMap[outputName]
 }
 
 func (b *Bulker) GetBulkerMap() map[string]Bulk {

diff --git a/internal/pkg/testing/bulk.go b/internal/pkg/testing/bulk.go
@@ -80,12 +80,12 @@ func (m *MockBulk) Client() *elasticsearch.Client {
 	return args.Get(0).(*elasticsearch.Client)
 }
 
-func (m *MockBulk) GetBulker(outputName string) *bulk.Bulk {
+func (m *MockBulk) GetBulker(outputName string) bulk.Bulk {
 	args := m.Called(outputName)
 	if args.Get(0) == nil {
 		return nil
 	}
-	return args.Get(0).(*bulk.Bulk)
+	return args.Get(0).(bulk.Bulk)
 }
 
 func (m *MockBulk) GetBulkerMap() map[string]bulk.Bulk {