fix: handle serialization of error message

observeinc · Oct 3, 2023 · ade7be6 · ade7be6
1 parent 55f07ac
commit ade7be6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/handlers/forwarder/handler.go b/handlers/forwarder/handler.go
@@ -102,8 +102,9 @@ func (h *Handler) Handle(ctx context.Context, request events.SQSEvent) (response
 		m := &SQSMessage{SQSMessage: record}
 		for _, sourceURI := range m.GetObjectCreated() {
 			copyInput := GetCopyObjectInput(sourceURI, h.DestinationURI)
-			if _, m.Error = h.S3Client.CopyObject(ctx, copyInput); m.Error != nil {
-				logger.Error(m.Error, "error copying file")
+			if _, cerr := h.S3Client.CopyObject(ctx, copyInput); cerr != nil {
+				logger.Error(cerr, "error copying file")
+				m.ErrorMessage = cerr.Error()
 				response.BatchItemFailures = append(response.BatchItemFailures, events.SQSBatchItemFailure{
 					ItemIdentifier: record.MessageId,
 				})

diff --git a/handlers/forwarder/message.go b/handlers/forwarder/message.go
@@ -11,15 +11,7 @@ import (
 
 type SQSMessage struct {
 	events.SQSMessage
-	Error error `json:"error,omitempty"`
-}
-
-func getS3URI(bucketName string, objectKey string) *url.URL {
-	s := fmt.Sprintf("s3://%s/%s", bucketName, objectKey)
-	if u, err := url.ParseRequestURI(s); err == nil {
-		return u
-	}
-	return nil
+	ErrorMessage string `json:"error,omitempty"`
 }
 
 func (m *SQSMessage) GetObjectCreated() (uris []*url.URL) {
@@ -38,6 +30,14 @@ func (m *SQSMessage) GetObjectCreated() (uris []*url.URL) {
 	return
 }
 
+func getS3URI(bucketName string, objectKey string) *url.URL {
+	s := fmt.Sprintf("s3://%s/%s", bucketName, objectKey)
+	if u, err := url.ParseRequestURI(s); err == nil {
+		return u
+	}
+	return nil
+}
+
 func processS3Event(message []byte) (uris []*url.URL) {
 	var s3records events.S3Event
 	err := json.Unmarshal(message, &s3records)