fix: rename filedropper to forwarder

For documentation purposes this is much clearer as to what it does.

Makefile

@@ -73,5 +73,5 @@ build-App:
 	GOARCH=arm64 GOOS=linux go build -tags lambda.norpc -o ./bootstrap cmd/$(APP)/main.go
 	cp ./bootstrap $(ARTIFACTS_DIR)/.
 
-build-FiledropperFunction:
-	APP=filedropper $(MAKE) build-App
+build-Forwarder:
+	APP=forwarder $(MAKE) build-App

apps/collection/template.yaml

@@ -104,7 +104,7 @@ Resources:
     Type: AWS::Serverless::Application
     Properties:
       Location:
-        ApplicationId: arn:aws:serverlessrepo:us-east-1:739672403694:applications/observe-filedropper
+        ApplicationId: arn:aws:serverlessrepo:us-east-1:739672403694:applications/observe-forwarder
         SemanticVersion: 0.0.4
       NotificationARNs:
         - !Ref Topic

apps/filedropper/template.yaml → apps/forwarder/template.yaml

@@ -5,7 +5,7 @@ Description: >
 
 Metadata:
   AWS::ServerlessRepo::Application:
-    Name: observe-filedropper
+    Name: observe-forwarder
     Description: A hello world
     Author: Observe Inc
     SpdxLicenseId: Apache-2.0
@@ -49,7 +49,7 @@ Parameters:
   DestinationUri:
     Type: String
     Description: >-
-      The S3 URI for your Filedrop, e.g.  `s3://bucket-alias/ds101:secret/`
+      The S3 URI for your Filedrop, e.g.  `s3://bucket-alias/ds101/`
   SourceTopicArns:
     Type: CommaDelimitedList
     Description: A list of SNS topics.
@@ -195,7 +195,7 @@ Resources:
         - - /aws/lambda/
           - !Ref 'Name'
       RetentionInDays: 365
-  FiledropperFunction:
+  Forwarder:
     Type: AWS::Serverless::Function
     Metadata:
       BuildMethod: makefile
@@ -223,7 +223,7 @@ Resources:
 Outputs:
   Function:
     Description: "Lambda Function ARN"
-    Value: !GetAtt FiledropperFunction.Arn
+    Value: !GetAtt Forwarder.Arn
   Queue:
     Description: "SQS Queue ARN"
     Value: !GetAtt Queue.Arn

cmd/filedropper/main.go → cmd/forwarder/main.go

@@ -13,7 +13,7 @@ import (
 	"github.com/go-logr/stdr"
 	"github.com/sethvargo/go-envconfig"
 
-	"github.com/observeinc/aws-sam-testing/handlers/filedropper"
+	"github.com/observeinc/aws-sam-testing/handlers/forwarder"
 )
 
 var env struct {
@@ -22,7 +22,7 @@ var env struct {
 }
 
 var logger logr.Logger
-var handler *filedropper.Handler
+var handler *forwarder.Handler
 
 func init() {
 	if err := realInit(); err != nil {
@@ -49,7 +49,7 @@ func realInit() error {
 
 	s3client := s3.NewFromConfig(awsCfg)
 
-	handler, err = filedropper.New(&filedropper.Config{
+	handler, err = forwarder.New(&forwarder.Config{
 		DestinationURI: env.DestinationURI,
 		S3Client:       s3client,
 		Logger:         &logger,

handlers/filedropper/config.go → handlers/forwarder/config.go

@@ -1,4 +1,4 @@
-package filedropper
+package forwarder
 
 import (
 	"errors"

handlers/filedropper/config_test.go → handlers/forwarder/config_test.go

@@ -1,38 +1,38 @@
-package filedropper_test
+package forwarder_test
 
 import (
 	"fmt"
 	"testing"
 
-	"github.com/observeinc/aws-sam-testing/handlers/filedropper"
+	"github.com/observeinc/aws-sam-testing/handlers/forwarder"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 )
 
 func TestConfig(t *testing.T) {
 	testcases := []struct {
-		filedropper.Config
+		forwarder.Config
 		ExpectError error
 	}{
 		{
-			ExpectError: filedropper.ErrMissingS3Client,
+			ExpectError: forwarder.ErrMissingS3Client,
 		},
 		{
-			ExpectError: filedropper.ErrInvalidDestination,
+			ExpectError: forwarder.ErrInvalidDestination,
 		},
 		{
-			Config: filedropper.Config{
+			Config: forwarder.Config{
 				DestinationURI: "s3://test",
 				S3Client:       &MockS3Client{},
 			},
 		},
 		{
-			Config: filedropper.Config{
+			Config: forwarder.Config{
 				DestinationURI: "https://example.com",
 				S3Client:       &MockS3Client{},
 			},
-			ExpectError: filedropper.ErrInvalidDestination,
+			ExpectError: forwarder.ErrInvalidDestination,
 		},
 	}
 

handlers/filedropper/handler.go → handlers/forwarder/handler.go

@@ -1,4 +1,4 @@
-package filedropper
+package forwarder
 
 import (
 	"bytes"
@@ -55,7 +55,7 @@ func GetRecordInput(lctx *lambdacontext.LambdaContext, destination *url.URL, r i
 		return nil
 	}
 
-	key := strings.TrimLeft(fmt.Sprintf("%s/filedropper/%s/%s", strings.Trim(destination.Path, "/"), lctx.InvokedFunctionArn, lctx.AwsRequestID), "/")
+	key := strings.TrimLeft(fmt.Sprintf("%s/forwarder/%s/%s", strings.Trim(destination.Path, "/"), lctx.InvokedFunctionArn, lctx.AwsRequestID), "/")
 
 	return &s3.PutObjectInput{
 		Bucket:      &destination.Host,

handlers/filedropper/handler_test.go → handlers/forwarder/handler_test.go

@@ -1,4 +1,4 @@
-package filedropper_test
+package forwarder_test
 
 import (
 	"context"
@@ -17,7 +17,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 
-	"github.com/observeinc/aws-sam-testing/handlers/filedropper"
+	"github.com/observeinc/aws-sam-testing/handlers/forwarder"
 )
 
 type MockS3Client struct {
@@ -99,7 +99,7 @@ func TestCopy(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			got := filedropper.GetCopyObjectInput(s, d)
+			got := forwarder.GetCopyObjectInput(s, d)
 			if diff := cmp.Diff(got, tc.Expected, cmp.AllowUnexported(s3.CopyObjectInput{})); diff != "" {
 				t.Error("unexpected result", diff)
 			}
@@ -114,14 +114,14 @@ func TestHandler(t *testing.T) {
 
 	testcases := []struct {
 		RequestFile    string
-		Config         filedropper.Config
+		Config         forwarder.Config
 		ExpectErr      error
 		ExpectResponse events.SQSEventResponse
 	}{
 		{
 			// Failing a copy should fail the individual item in the queue affected
 			RequestFile: "testdata/event.json",
-			Config: filedropper.Config{
+			Config: forwarder.Config{
 				DestinationURI: "s3://my-bucket",
 				S3Client: &MockS3Client{
 					CopyObjectFunc: func(ctx context.Context, params *s3.CopyObjectInput, optFns ...func(*s3.Options)) (*s3.CopyObjectOutput, error) {
@@ -138,7 +138,7 @@ func TestHandler(t *testing.T) {
 		{
 			// Failing to put a record to the destination URI is a terminal condition. Error out.
 			RequestFile: "testdata/event.json",
-			Config: filedropper.Config{
+			Config: forwarder.Config{
 				DestinationURI: "s3://my-bucket",
 				S3Client: &MockS3Client{
 					PutObjectFunc: func(ctx context.Context, params *s3.PutObjectInput, optFns ...func(*s3.Options)) (*s3.PutObjectOutput, error) {
@@ -169,7 +169,7 @@ func TestHandler(t *testing.T) {
 				tc.Config.Logger = &logger
 			}
 
-			h, err := filedropper.New(&tc.Config)
+			h, err := forwarder.New(&tc.Config)
 			if err != nil {
 				t.Fatal(err)
 			}

handlers/filedropper/message.go → handlers/forwarder/message.go

@@ -1,4 +1,4 @@
-package filedropper
+package forwarder
 
 import (
 	"encoding/json"

handlers/filedropper/message_test.go → handlers/forwarder/message_test.go

@@ -1,11 +1,11 @@
-package filedropper_test
+package forwarder_test
 
 import (
 	"encoding/json"
 	"fmt"
 	"testing"
 
-	"github.com/observeinc/aws-sam-testing/handlers/filedropper"
+	"github.com/observeinc/aws-sam-testing/handlers/forwarder"
 
 	"github.com/google/go-cmp/cmp"
 )
@@ -67,7 +67,7 @@ func TestObjectCreated(t *testing.T) {
 		tc := tc
 		t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
 			t.Parallel()
-			var message filedropper.SQSMessage
+			var message forwarder.SQSMessage
 			if err := json.Unmarshal([]byte(tc.Message), &message); err != nil {
 				t.Fatal(err)
 			}