From 1e929d44a4f2aedc1575f60e12f2f7f359a39aae Mon Sep 17 00:00:00 2001
From: jano3 <jano@bob.co.za>
Date: Mon, 10 Jun 2024 09:15:56 +0200
Subject: [PATCH] Revert DelaySeconds to an int64 pointer
---
sqs/sqs.go | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/sqs/sqs.go b/sqs/sqs.go
index a089139..0d0259f 100644
--- a/sqs/sqs.go
+++ b/sqs/sqs.go
@@ -6,6 +6,7 @@ import (
"context"
"encoding/json"
"fmt"
+ "gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/utils"
"io"
"time"
@@ -32,7 +33,7 @@ type Messenger struct {
S3Client *s3.ClientWithHelpers
S3BucketName string
MessageGroupID *string
- DelaySeconds int32
+ DelaySeconds *int64
RequestIDHeaderKey string
}
@@ -79,8 +80,12 @@ func (m *Messenger) SendSQSMessage(headers map[string]string, body string, curre
// SQS has max of 15 minutes delay
// https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_SendMessage.html
- if m.DelaySeconds != 0 && m.DelaySeconds > 900 {
- m.DelaySeconds = 900
+ var delaySeconds int32
+ if m.DelaySeconds != nil {
+ if *m.DelaySeconds > 900 {
+ m.DelaySeconds = utils.ValueToPointer(int64(900))
+ }
+ delaySeconds = int32(*m.DelaySeconds)
}
var res *sqs.SendMessageOutput
@@ -90,7 +95,7 @@ func (m *Messenger) SendSQSMessage(headers map[string]string, body string, curre
MessageBody: aws.String(body),
QueueUrl: &m.QueueURL,
MessageGroupId: m.MessageGroupID,
- DelaySeconds: m.DelaySeconds,
+ DelaySeconds: delaySeconds,
})
if err != nil {
@@ -104,8 +109,8 @@ func SendSQSMessage(msgr Messenger, objectToSend interface{}, currentRequestID *
if isDebug {
go func() {
- if msgr.DelaySeconds != 0 {
- delay := msgr.DelaySeconds
+ if msgr.DelaySeconds != nil {
+ delay := *msgr.DelaySeconds
time.Sleep(time.Second * time.Duration(delay))
}
resty.New().R().
--
GitLab