-
Notifications
You must be signed in to change notification settings - Fork 21
Refactor SQS and SNS #14
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
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0b64723
refactor: update aws sdk , handling contexts, cancelling operations a…
Mariscal6 6b98dd6
remove context from NewPublisher
Mariscal6 117c377
handle error on deleteMsg
Mariscal6 9b28303
new stress test
Mariscal6 5866ecb
deduplication and group id keys
Mariscal6 dd9c70a
sns publisher add subscriptions function and tests
Mariscal6 58269f6
typo on unmarshaller attributes
Mariscal6 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 |
|---|---|---|
| @@ -1 +1,3 @@ | ||
| .idea/ | ||
| .vscode/ | ||
| .DS_Store |
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
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
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 |
|---|---|---|
| @@ -1,18 +1,20 @@ | ||
| package connection | ||
|
|
||
| import ( | ||
| "os" | ||
|
|
||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go-v2/aws" | ||
| "github.com/aws/aws-sdk-go-v2/config" | ||
| ) | ||
|
|
||
| const AWS_ENDPOINT = "AWS_ENDPOINT" | ||
|
|
||
| func SetEndPoint(config aws.Config) aws.Config { | ||
| newConfig := config | ||
| awsEndpoint := os.Getenv(AWS_ENDPOINT) | ||
| if awsEndpoint != "" { | ||
| newConfig.Endpoint = aws.String(awsEndpoint) | ||
| } | ||
| return newConfig | ||
| func SetEndPoint(endpoint string) config.LoadOptionsFunc { | ||
| return config.WithEndpointResolverWithOptions(aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...interface{}) (aws.Endpoint, error) { | ||
| if endpoint != "" { | ||
| return aws.Endpoint{ | ||
| PartitionID: "aws", | ||
| URL: endpoint, | ||
| SigningRegion: region, | ||
| }, nil | ||
| } | ||
| // returning EndpointNotFoundError will allow the service to fallback to it's default resolution | ||
| return aws.Endpoint{}, &aws.EndpointNotFoundError{} | ||
| })) | ||
| } | ||
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
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
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 |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package sns | ||
|
|
||
| import ( | ||
| "github.com/aws/aws-sdk-go-v2/aws" | ||
| "github.com/aws/aws-sdk-go-v2/service/sns" | ||
| "github.com/aws/aws-sdk-go-v2/service/sns/types" | ||
|
|
||
| "github.com/ThreeDotsLabs/watermill/message" | ||
| ) | ||
|
|
||
| const UUIDAttribute = "UUID" | ||
|
|
||
| type Marshaler interface { | ||
| Marshal(msg *message.Message) *sns.PublishInput | ||
| } | ||
|
|
||
| type DefaultMarshalerUnmarshaler struct{} | ||
|
|
||
| func (d DefaultMarshalerUnmarshaler) Marshal(msg *message.Message) *sns.PublishInput { | ||
| // client side uuid | ||
| // there is a deduplication id that can be use for | ||
| // fifo queues | ||
| attributes, deduplicationId, groupId := metadataToAttributes(msg.Metadata) | ||
| attributes[UUIDAttribute] = types.MessageAttributeValue{ | ||
| StringValue: aws.String(msg.UUID), | ||
| DataType: aws.String("String"), | ||
| } | ||
|
|
||
| return &sns.PublishInput{ | ||
| Message: aws.String(string(msg.Payload)), | ||
| MessageAttributes: attributes, | ||
| MessageDeduplicationId: deduplicationId, | ||
| MessageGroupId: groupId, | ||
| } | ||
| } | ||
|
|
||
| func metadataToAttributes(meta message.Metadata) (map[string]types.MessageAttributeValue, *string, *string) { | ||
| attributes := make(map[string]types.MessageAttributeValue) | ||
| var deduplicationId, groupId *string | ||
| for k, v := range meta { | ||
| // SNS has special attributes for deduplication and group id | ||
| if k == "MessageDeduplicationId" { | ||
| deduplicationId = aws.String(v) | ||
| continue | ||
| } | ||
| if k == "MessageGroupId" { | ||
| groupId = aws.String(v) | ||
| continue | ||
| } | ||
| attributes[k] = types.MessageAttributeValue{ | ||
| StringValue: aws.String(v), | ||
| DataType: aws.String("String"), | ||
| } | ||
| } | ||
|
|
||
| return attributes, deduplicationId, groupId | ||
| } |
Oops, something went wrong.
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.
Since its no longer setting anything
Also the package connection is a bit iffy on this one, maybe config, where other config related functionality could reside in the future? Nitpick
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.
thanks for the review Nikola!