Remove token, cleanup

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # Define code owners (individuals or teams that are responsible for code in this repository)
 # More about code owners at https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-*       @ConduitIO/conduit-core
+*        @conduitio-labs/conduit-core

.github/pull_request_template.md

@@ -8,6 +8,6 @@ Fixes # (issue)
 
 ### Quick checks:
 
-- [ ] There is no other [pull request](https://github.com/conduitio/conduit-connector-connectorname/pulls) for the same update/change.
+- [ ] There is no other [pull request](https://github.com/conduitio-labs/conduit-connector-sqs/pulls) for the same update/change.
 - [ ] I have written unit tests.
 - [ ] I have made sure that the PR is of reasonable size and can be easily reviewed.

.github/workflows/build.yml

@@ -10,11 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
-
+          go-version-file: 'go.mod'
       - name: Test
-        run: make test"
+        run: make test

.github/workflows/lint.yml

@@ -12,8 +12,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
-
+            go-version-file: 'go.mod'
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
-
+        with:
+          version: v1.52.2

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version-file: 'go.mod'
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5

.goreleaser.yml

@@ -7,7 +7,7 @@ builds:
     env:
       - CGO_ENABLED=0
     ldflags:
-      - "-s -w -X 'github.com/conduitio/conduit-connector-connectorname.version={{ .Tag }}'"
+      - "-s -w -X 'github.com/conduitio-labs/conduit-connector-sqs.version={{ .Tag }}'"
 checksum:
   name_template: checksums.txt
 archives:

Makefile

@@ -1,7 +1,7 @@
 VERSION=$(shell git describe --tags --dirty --always)
 .PHONY:
 build:
-	go build -ldflags "-X 'github.com/meroxa/conduit-connector-amazon-sqs.version=${VERSION}'" -o conduit-connector-amazon-sqs cmd/sqs/main.go
+	go build -ldflags "-X 'github.com/conduitio-labs/conduit-connector-sqs.version=${VERSION}'" -o conduit-connector-amazon-sqs cmd/sqs/main.go
 
 .PHONY:
 test:
@@ -16,4 +16,4 @@ lint:
 	golangci-lint run -c .golangci.yml
 
 install-paramgen:
-	go install github.com/conduitio/conduit-connector-sdk/cmd/paramgen@latest
+	go install github.com/conduitio/conduit-connector-sdk/cmd/paramgen@latest

destination/config.go

@@ -7,18 +7,22 @@ type Config struct {
 	AWSAccessKeyID string `json:"aws.accessKeyId" validate:"required"`
 	// amazon secret access key
 	AWSSecretAccessKey string `json:"aws.secretAccessKey" validate:"required"`
-	// amazon access token
-	AWSToken string `json:"aws.token"`
+	// amazon sqs region
+	AWSRegion string `json:"aws.region" validate:"required"`
 	// amazon sqs queue name
 	AWSQueue string `json:"aws.queue" validate:"required"`
+	// amazon sqs message delay time
+	AWSSQSMessageDelay int32 `json:"aws.delayTime"`
 }
 
 const (
 	ConfigKeyAWSAccessKeyID = "aws.accessKeyId"
 
 	ConfigKeyAWSSecretAccessKey = "aws.secretAccessKey"
 
-	ConfigKeyAWSToken = "aws.token"
+	ConfigKeyAWSRegion = "aws.region"
 
 	ConfigKeyAWSQueue = "aws.queue"
+
+	ConfigKeyAWSSQSDelayTime = "aws.delayTime"
 )

destination/config_test.go

@@ -10,7 +10,9 @@ import (
 var exampleConfig = map[string]string{
 	"aws.accessKeyId":     "access-key-123",
 	"aws.secretAccessKey": "secret-key-321",
-	"aws.token":           "token_token",
+	"aws.region":          "us-east-1",
+	"aws.queue":           "queue",
+	"aws.delayTime":       "10",
 }
 
 func TestParseConfig(t *testing.T) {
@@ -20,7 +22,9 @@ func TestParseConfig(t *testing.T) {
 	want := Config{
 		AWSAccessKeyID:     "access-key-123",
 		AWSSecretAccessKey: "secret-key-321",
-		AWSToken:           "token_token",
+		AWSRegion:          "us-east-1",
+		AWSQueue:           "queue",
+		AWSSQSMessageDelay: 10,
 	}
 
 	is.NoErr(err)

destination/destination.go

@@ -16,6 +16,7 @@ package destination
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
@@ -45,22 +46,23 @@ func (d *Destination) Configure(ctx context.Context, cfg map[string]string) erro
 
 	err := sdk.Util.ParseConfig(cfg, &d.config)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to parse destination config : %w", err)
 	}
 
 	return nil
 }
 
 func (d *Destination) Open(ctx context.Context) error {
 	cfg, err := config.LoadDefaultConfig(ctx,
+		config.WithRegion(d.config.AWSRegion),
 		config.WithCredentialsProvider(
 			credentials.NewStaticCredentialsProvider(
 				d.config.AWSAccessKeyID,
 				d.config.AWSSecretAccessKey,
-				d.config.AWSToken)),
+				"")),
 	)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to load amazon config with given credentials : %w", err)
 	}
 	// Create a SQS client from just a session.
 	d.svc = sqs.NewFromConfig(cfg)
@@ -72,7 +74,7 @@ func (d *Destination) Open(ctx context.Context) error {
 	// Get URL of queue
 	urlResult, err := d.svc.GetQueueUrl(ctx, queueInput)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to get sqs queue url : %w", err)
 	}
 
 	d.queueURL = *urlResult.QueueUrl
@@ -93,15 +95,15 @@ func (d *Destination) Write(ctx context.Context, records []sdk.Record) (int, err
 		}
 		// construct record to send to destination
 		sendMessageInput := &sqs.SendMessageInput{
-			DelaySeconds:      10,
 			MessageAttributes: messageAttributes,
 			MessageBody:       &messageBody,
 			QueueUrl:          &d.queueURL,
+			DelaySeconds:      d.config.AWSSQSMessageDelay,
 		}
 
 		_, err := d.svc.SendMessage(ctx, sendMessageInput)
 		if err != nil {
-			return i, err
+			return i, fmt.Errorf("failed to write sqs message : %w", err)
 		}
 	}
 

destination/destination_integration_test.go

@@ -133,11 +133,11 @@ func deleteSQSQueue(t *testing.T, svc *sqs.Client, url *string) error {
 
 func newAWSClient(cfg map[string]string) (*sqs.Client, error) {
 	awsConfig, err := config.LoadDefaultConfig(context.Background(),
+		config.WithRegion(cfg[ConfigKeyAWSRegion]),
 		config.WithCredentialsProvider(
 			credentials.NewStaticCredentialsProvider(
 				cfg[ConfigKeyAWSAccessKeyID],
-				cfg[ConfigKeyAWSSecretAccessKey],
-				cfg[ConfigKeyAWSToken])),
+				cfg[ConfigKeyAWSSecretAccessKey], "")),
 	)
 	if err != nil {
 		return nil, err
@@ -160,11 +160,11 @@ func parseIntegrationConfig() (map[string]string, error) {
 		return map[string]string{}, errors.New("AWS_SECRET_ACCESS_KEY env var must be set")
 	}
 
-	awsToken := os.Getenv("AWS_TOKEN")
+	awsMessageDelay := os.Getenv("AWS_MESSAGE_DELAY")
 
 	return map[string]string{
 		ConfigKeyAWSAccessKeyID:     awsAccessKeyID,
 		ConfigKeyAWSSecretAccessKey: awsSecretAccessKey,
-		ConfigKeyAWSToken:           awsToken,
+		ConfigKeyAWSSQSDelayTime:    awsMessageDelay,
 	}, nil
 }

source/config.go

@@ -7,8 +7,8 @@ type Config struct {
 	AWSAccessKeyID string `json:"aws.accessKeyId" validate:"required"`
 	// amazon secret access key
 	AWSSecretAccessKey string `json:"aws.secretAccessKey" validate:"required"`
-	// amazon access token
-	AWSToken string `json:"aws.token"`
+	// amazon sqs region
+	AWSRegion string `json:"aws.region" validate:"required"`
 	// amazon sqs queue name
 	AWSQueue string `json:"aws.queue" validate:"required"`
 	// visibility timeout
@@ -20,9 +20,9 @@ const (
 
 	ConfigKeyAWSSecretAccessKey = "aws.secretAccessKey"
 
-	ConfigKeyAWSToken = "aws.token"
+	ConfigKeyAWSRegion = "aws.region"
 
 	ConfigKeyAWSQueue = "aws.queue"
 
-	ConfigSQSVisibilityTimeout = "aws.visibilityTimeout"
+	ConfigKeySQSVisibilityTimeout = "aws.visibilityTimeout"
 )

source/config_test.go

@@ -24,8 +24,9 @@ import (
 var exampleConfig = map[string]string{
 	"aws.accessKeyId":       "access-key-123",
 	"aws.secretAccessKey":   "secret-key-321",
-	"aws.token":             "token_token",
+	"aws.region":            "us-east-1",
 	"aws.visibilityTimeout": "60",
+	"aws.queue":             "queue",
 }
 
 func TestParseConfig(t *testing.T) {
@@ -35,7 +36,8 @@ func TestParseConfig(t *testing.T) {
 	want := Config{
 		AWSAccessKeyID:          "access-key-123",
 		AWSSecretAccessKey:      "secret-key-321",
-		AWSToken:                "token_token",
+		AWSRegion:               "us-east-1",
+		AWSQueue:                "queue",
 		AWSSQSVisibilityTimeout: 60,
 	}
 

source/source.go

@@ -31,22 +31,23 @@ func (s *Source) Configure(ctx context.Context, cfg map[string]string) error {
 
 	err := sdk.Util.ParseConfig(cfg, &s.config)
 	if err != nil {
-		return fmt.Errorf(" failed to parse source config : %w", err)
+		return fmt.Errorf("failed to parse source config : %w", err)
 	}
 
 	return nil
 }
 
 func (s *Source) Open(ctx context.Context, _ sdk.Position) error {
 	cfg, err := config.LoadDefaultConfig(ctx,
+		config.WithRegion(s.config.AWSRegion),
 		config.WithCredentialsProvider(
 			credentials.NewStaticCredentialsProvider(
 				s.config.AWSAccessKeyID,
 				s.config.AWSSecretAccessKey,
-				s.config.AWSToken)),
+				"")),
 	)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to load aws config with given credentials : %w", err)
 	}
 	// Create a SQS client from just a session.
 	s.svc = sqs.NewFromConfig(cfg)
@@ -57,7 +58,7 @@ func (s *Source) Open(ctx context.Context, _ sdk.Position) error {
 	// Get URL of queue
 	urlResult, err := s.svc.GetQueueUrl(ctx, queueInput)
 	if err != nil {
-		return fmt.Errorf(" failed to get queue amazon sqs URL: %w", err)
+		return fmt.Errorf("failed to get queue amazon sqs URL: %w", err)
 	}
 
 	s.queueURL = *urlResult.QueueUrl
@@ -79,7 +80,7 @@ func (s *Source) Read(ctx context.Context) (sdk.Record, error) {
 	// grab a message from queue
 	sqsMessages, err := s.svc.ReceiveMessage(ctx, receiveMessage)
 	if err != nil {
-		return sdk.Record{}, fmt.Errorf(" error retrieving amazon sqs messages: %w", err)
+		return sdk.Record{}, fmt.Errorf("error retrieving amazon sqs messages: %w", err)
 	}
 
 	if len(sqsMessages.Messages) != 0 {