From 809fb16724b7ad8b5cd32eab0d7b5d9bbf3a9464 Mon Sep 17 00:00:00 2001 From: "daniel.naude" <danieln@bob.co.za> Date: Wed, 10 Apr 2024 09:50:40 +0200 Subject: [PATCH] rename session to client --- handler_utils/sqs.go | 4 ++-- sqs/sqs.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/handler_utils/sqs.go b/handler_utils/sqs.go index a77f1d8..f34bbfb 100644 --- a/handler_utils/sqs.go +++ b/handler_utils/sqs.go @@ -30,13 +30,13 @@ func ValidateSQSEndpoints(endpoints map[string]interface{}) (map[string]interfac return endpoints, nil } -func GetRecord(s3Session *s3.SessionWithHelpers, bucket string, message events.SQSMessage, recordType reflect.Type) (interface{}, error) { +func GetRecord(s3Client *s3.ClientWithHelpers, bucket string, message events.SQSMessage, recordType reflect.Type) (interface{}, error) { recordValuePtr := reflect.New(recordType) // Check if message body should be retrieved from S3 if messageAttribute, ok := message.MessageAttributes[sqs.SQSMessageOnS3Key]; ok && messageAttribute.StringValue != nil && *messageAttribute.StringValue == "true" { - messageBytes, err := sqs.RetrieveMessageFromS3(s3Session, bucket, message.Body) + messageBytes, err := sqs.RetrieveMessageFromS3(s3Client, bucket, message.Body) if err != nil { return nil, errors.Wrapf(err, "failed to get sqs message body from s3") } diff --git a/sqs/sqs.go b/sqs/sqs.go index 97ad23d..a089139 100644 --- a/sqs/sqs.go +++ b/sqs/sqs.go @@ -162,10 +162,10 @@ func SendSQSMessage(msgr Messenger, objectToSend interface{}, currentRequestID * return nil } -func uploadMessageToS3(session *s3.ClientWithHelpers, bucket string, name string, messageBytes []byte) error { +func uploadMessageToS3(client *s3.ClientWithHelpers, bucket string, name string, messageBytes []byte) error { // Upload message expiry := 24 * 7 * time.Hour // 3 days - _, err := session.UploadWithSettings(messageBytes, bucket, name, s3.S3UploadSettings{ + _, err := client.UploadWithSettings(messageBytes, bucket, name, s3.S3UploadSettings{ ExpiryDuration: &expiry, }) if err != nil { @@ -175,9 +175,9 @@ func uploadMessageToS3(session *s3.ClientWithHelpers, bucket string, name string return nil } -func RetrieveMessageFromS3(session *s3.ClientWithHelpers, bucket string, filename string) ([]byte, error) { +func RetrieveMessageFromS3(client *s3.ClientWithHelpers, bucket string, filename string) ([]byte, error) { // get the file contents - rawObject, err := session.GetObject(bucket, filename, false) + rawObject, err := client.GetObject(bucket, filename, false) if err != nil { return []byte{}, err } -- GitLab