-
Notifications
You must be signed in to change notification settings - Fork 201
[Draft] Update awssqs.go with extra logging before calling AWS SDK. #347
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.
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
Open
viv-ng
wants to merge
5
commits into
argoproj:master
Choose a base branch
from
viv-ng:viv-ng-aws-logging
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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 f01924b
fixed syntax error
viv-ng 256494f
fixing log statement syntax
viv-ng 8beb552
fixed NPE for fetching an optional field in GetQueueUrlInput
viv-ng 3cc7c0e
fix formatting error
viv-ng File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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) | ||
|
|
@@ -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) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why not to paste account_id as part of template, why you need to build string separately? |
||
| 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) | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would not write such comments, code itself selfdescriptive