Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Draft] Update awssqs.go with extra logging before calling AWS SDK. #347

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[Draft] Update awssqs.go with extra logging before calling AWS SDK. #347

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25cb3dc
Update awssqs.go with logging before calling AWS getQueueUrl() & send…
viv-ng Nov 25, 2024
f01924b
fixed syntax error
viv-ng Nov 25, 2024
256494f
fixing log statement syntax
viv-ng Nov 25, 2024
8beb552
fixed NPE for fetching an optional field in GetQueueUrlInput
viv-ng Nov 27, 2024
3cc7c0e
fix formatting error
viv-ng Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pkg/services/awssqs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,15 @@ func (s awsSqsService) Send(notif Notification, dest Destination) error {

client := sqs.NewFromConfig(cfg)

// 'client' provides credential, region, endpointUrl
// 'getQueueInput()' provides queueName, accountId
queueUrl, err := GetQueueURL(context.TODO(), client, s.getQueueInput(dest))
if err != nil {
log.Error("Got an error getting the queue URL: ", err)
return err
}

// 'sendMessageInput()' provides queueUrl, message
sendMessage, err := SendMsg(context.TODO(), client, s.sendMessageInput(queueUrl.QueueUrl, notif))
if err != nil {
log.Error("Got an error sending the message: ", err)
Expand Down Expand Up @@ -189,9 +192,17 @@ type SQSSendMessageAPI interface {
}

var GetQueueURL = func(c context.Context, api SQSSendMessageAPI, input *sqs.GetQueueUrlInput) (*sqs.GetQueueUrlOutput, error) {
// QueueName is required, QueueOwnerAWSAccountId is optional
accountIdStr := ""
if input.QueueOwnerAWSAccountId != nil {
accountIdStr = ", account_id: " + *input.QueueOwnerAWSAccountId
}
log.Infof("[GetQueueUrl] queue_name: %s%s", *input.QueueName, accountIdStr)
return api.GetQueueUrl(c, input)
}

var SendMsg = func(c context.Context, api SQSSendMessageAPI, input *sqs.SendMessageInput) (*sqs.SendMessageOutput, error) {
// QueueUrl & MessageBody are required fields.
log.Infof("[SendMsg] queue_url: %s, message_body: %s", *input.QueueUrl, *input.MessageBody)
return api.SendMessage(c, input)
}