Use new benthos path

alexthecarp · May 29, 2024 · 9a212ee · 9a212ee
1 parent 46322e0
commit 9a212ee
Show file tree

Hide file tree

Showing 289 changed files with 357 additions and 355 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -20,8 +20,8 @@ linters-settings:
       - name: superfluous-else
   errcheck:
     exclude-functions:
-      - (*github.com/benthosdev/benthos/v4/internal/batch.Error).Failed
-      - (*github.com/benthosdev/benthos/v4/public/service.BatchError).Failed
+      - (*github.com/redpanda-data/benthos/v4/internal/batch.Error).Failed
+      - (*github.com/redpanda-data/benthos/v4/public/service.BatchError).Failed
   govet:
     enable-all: true
     disable:

diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ all: $(APPS)
 
 install: $(APPS)
 	@install -d $(INSTALL_DIR)
-	@rm -f $(INSTALL_DIR)/benthos
+	@rm -f $(INSTALL_DIR)/redpanda-connect
 	@cp $(PATHINSTBIN)/* $(INSTALL_DIR)/
 
 deps:

diff --git a/cmd/redpanda-connect/main.go b/cmd/redpanda-connect/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"log/slog"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/kafka"
 

diff --git a/internal/impl/amqp09/input.go b/internal/impl/amqp09/input.go
@@ -14,7 +14,7 @@ import (
 
 	amqp "github.com/rabbitmq/amqp091-go"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 func amqp09InputSpec() *service.ConfigSpec {

diff --git a/internal/impl/amqp09/integration_test.go b/internal/impl/amqp09/integration_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service/integration"
+	"github.com/redpanda-data/benthos/v4/public/service/integration"
 )
 
 func doSetupAndAssertions(setQueueDeclareAutoDelete bool, t *testing.T) {

diff --git a/internal/impl/amqp09/output.go b/internal/impl/amqp09/output.go
@@ -13,7 +13,7 @@ import (
 
 	amqp "github.com/rabbitmq/amqp091-go"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 func amqp09OutputSpec() *service.ConfigSpec {

diff --git a/internal/impl/amqp1/config.go b/internal/impl/amqp1/config.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/Azure/go-amqp"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 const (

diff --git a/internal/impl/amqp1/input.go b/internal/impl/amqp1/input.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/Azure/go-amqp"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 //go:embed input_description.adoc

diff --git a/internal/impl/amqp1/integration_service_bus_test.go b/internal/impl/amqp1/integration_service_bus_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service"
-	"github.com/benthosdev/benthos/v4/public/service/integration"
+	"github.com/redpanda-data/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service/integration"
 )
 
 func TestIntegrationAzureServiceBus(t *testing.T) {

diff --git a/internal/impl/amqp1/integration_test.go b/internal/impl/amqp1/integration_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service/integration"
+	"github.com/redpanda-data/benthos/v4/public/service/integration"
 )
 
 func TestIntegrationAMQP1(t *testing.T) {

diff --git a/internal/impl/amqp1/output.go b/internal/impl/amqp1/output.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/Azure/go-amqp"
 
-	"github.com/benthosdev/benthos/v4/public/bloblang"
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/bloblang"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 func amqp1OutputSpec() *service.ConfigSpec {

diff --git a/internal/impl/avro/processor.go b/internal/impl/avro/processor.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/linkedin/goavro/v2"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 func avroConfigSpec() *service.ConfigSpec {

diff --git a/internal/impl/avro/processor_test.go b/internal/impl/avro/processor_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 func TestAvroBasic(t *testing.T) {

diff --git a/internal/impl/avro/scanner.go b/internal/impl/avro/scanner.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/linkedin/goavro/v2"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 const (

diff --git a/internal/impl/awk/processor.go b/internal/impl/awk/processor.go
@@ -15,7 +15,7 @@ import (
 	"github.com/benhoyt/goawk/interp"
 	"github.com/benhoyt/goawk/parser"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 var varInvalidRegexp *regexp.Regexp

diff --git a/internal/impl/awk/processor_test.go b/internal/impl/awk/processor_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 func testAwk(confStr string, args ...any) (service.Processor, error) {

diff --git a/internal/impl/aws/cache_dynamodb.go b/internal/impl/aws/cache_dynamodb.go
@@ -14,7 +14,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
 	"github.com/cenkalti/backoff/v4"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 )

diff --git a/internal/impl/aws/cache_dynamodb_integration_test.go b/internal/impl/aws/cache_dynamodb_integration_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service/integration"
+	"github.com/redpanda-data/benthos/v4/public/service/integration"
 )
 
 func createTable(ctx context.Context, t testing.TB, dynamoPort, id string) error {

diff --git a/internal/impl/aws/cache_s3.go b/internal/impl/aws/cache_s3.go
@@ -12,7 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/cenkalti/backoff/v4"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 )

diff --git a/internal/impl/aws/config/config.go b/internal/impl/aws/config/config.go
@@ -1,6 +1,6 @@
 package config
 
-import "github.com/benthosdev/benthos/v4/public/service"
+import "github.com/redpanda-data/benthos/v4/public/service"
 
 // SessionFields defines a re-usable set of config fields for an AWS session
 // that is compatible with the public service APIs and avoids importing the full

diff --git a/internal/impl/aws/input_kinesis.go b/internal/impl/aws/input_kinesis.go
@@ -15,7 +15,7 @@ import (
 	"github.com/cenkalti/backoff/v4"
 	"github.com/gofrs/uuid"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 )

diff --git a/internal/impl/aws/input_kinesis_checkpointer.go b/internal/impl/aws/input_kinesis_checkpointer.go
@@ -12,7 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 // Common errors that might occur throughout checkpointing.

diff --git a/internal/impl/aws/input_kinesis_record_batcher.go b/internal/impl/aws/input_kinesis_record_batcher.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/Jeffail/checkpoint"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 type awsKinesisRecordBatcher struct {

diff --git a/internal/impl/aws/input_s3.go b/internal/impl/aws/input_s3.go
@@ -17,8 +17,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	sqstypes "github.com/aws/aws-sdk-go-v2/service/sqs/types"
 
-	"github.com/benthosdev/benthos/v4/public/service"
-	"github.com/benthosdev/benthos/v4/public/service/codec"
+	"github.com/redpanda-data/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service/codec"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 )

diff --git a/internal/impl/aws/input_sqs.go b/internal/impl/aws/input_sqs.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/Jeffail/shutdown"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 )

diff --git a/internal/impl/aws/input_sqs_test.go b/internal/impl/aws/input_sqs_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 type mockSqsInput struct {

diff --git a/internal/impl/aws/integration_kinesis_test.go b/internal/impl/aws/integration_kinesis_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/kinesis"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service/integration"
+	"github.com/redpanda-data/benthos/v4/public/service/integration"
 )
 
 func createKinesisShards(ctx context.Context, t testing.TB, awsPort, id string, numShards int32) ([]string, error) {

diff --git a/internal/impl/aws/integration_s3_test.go b/internal/impl/aws/integration_s3_test.go
@@ -15,9 +15,9 @@ import (
 	sqstypes "github.com/aws/aws-sdk-go-v2/service/sqs/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service/integration"
+	"github.com/redpanda-data/benthos/v4/public/service/integration"
 
-	_ "github.com/benthosdev/benthos/v4/public/components/pure"
+	_ "github.com/redpanda-data/benthos/v4/public/components/pure"
 )
 
 func createBucket(ctx context.Context, s3Port, bucket string) error {

diff --git a/internal/impl/aws/integration_sqs_test.go b/internal/impl/aws/integration_sqs_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service/integration"
+	"github.com/redpanda-data/benthos/v4/public/service/integration"
 
 	_ "github.com/redpanda-data/connect/v4/public/components/pure"
 )

diff --git a/internal/impl/aws/integration_test.go b/internal/impl/aws/integration_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service/integration"
+	"github.com/redpanda-data/benthos/v4/public/service/integration"
 
 	_ "github.com/redpanda-data/connect/v4/public/components/pure"
 )

diff --git a/internal/impl/aws/metrics_cloudwatch.go b/internal/impl/aws/metrics_cloudwatch.go
@@ -11,7 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatch"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 )

diff --git a/internal/impl/aws/output_dynamodb.go b/internal/impl/aws/output_dynamodb.go
@@ -15,7 +15,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
 	"github.com/cenkalti/backoff/v4"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 	"github.com/redpanda-data/connect/v4/internal/retries"

diff --git a/internal/impl/aws/output_dynamodb_test.go b/internal/impl/aws/output_dynamodb_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 type mockDynamoDB struct {

diff --git a/internal/impl/aws/output_kinesis.go b/internal/impl/aws/output_kinesis.go
@@ -11,7 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/kinesis/types"
 	"github.com/cenkalti/backoff/v4"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 	"github.com/redpanda-data/connect/v4/internal/retries"

diff --git a/internal/impl/aws/output_kinesis_firehose.go b/internal/impl/aws/output_kinesis_firehose.go
@@ -10,7 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/firehose/types"
 	"github.com/cenkalti/backoff/v4"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 	"github.com/redpanda-data/connect/v4/internal/retries"

diff --git a/internal/impl/aws/output_kinesis_firehose_test.go b/internal/impl/aws/output_kinesis_firehose_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/cenkalti/backoff/v4"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 type mockKinesisFirehose struct {

diff --git a/internal/impl/aws/output_kinesis_integration_test.go b/internal/impl/aws/output_kinesis_integration_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service"
-	"github.com/benthosdev/benthos/v4/public/service/integration"
+	"github.com/redpanda-data/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service/integration"
 )
 
 func TestKinesisIntegration(t *testing.T) {

diff --git a/internal/impl/aws/output_kinesis_test.go b/internal/impl/aws/output_kinesis_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 type mockKinesis struct {

diff --git a/internal/impl/aws/output_s3.go b/internal/impl/aws/output_s3.go
@@ -14,8 +14,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 
-	"github.com/benthosdev/benthos/v4/public/bloblang"
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/bloblang"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 )

diff --git a/internal/impl/aws/output_sns.go b/internal/impl/aws/output_sns.go
@@ -12,8 +12,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sns"
 	"github.com/aws/aws-sdk-go-v2/service/sns/types"
 
-	"github.com/benthosdev/benthos/v4/public/bloblang"
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/bloblang"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 )

diff --git a/internal/impl/aws/output_sqs.go b/internal/impl/aws/output_sqs.go
@@ -16,8 +16,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
 	"github.com/cenkalti/backoff/v4"
 
-	"github.com/benthosdev/benthos/v4/public/bloblang"
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/bloblang"
+	"github.com/redpanda-data/benthos/v4/public/service"
 
 	"github.com/redpanda-data/connect/v4/internal/impl/aws/config"
 	"github.com/redpanda-data/connect/v4/internal/retries"

diff --git a/internal/impl/aws/output_sqs_test.go b/internal/impl/aws/output_sqs_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/benthosdev/benthos/v4/public/service"
+	"github.com/redpanda-data/benthos/v4/public/service"
 )
 
 func TestSQSHeaderCheck(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"github.com/Azure/go-amqp"
-    	"github.com/benthosdev/benthos/v4/public/service"
+    	"github.com/redpanda-data/benthos/v4/public/service"
     )
     const (
@@ Expand Down @@