Skip to content

Add account-id option for cross-account connections #54

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

Open
plabanauskis wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add account-id option for cross-account connections #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/com/climate/squeedo/sqs.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
(:import
(com.amazonaws.services.sqs.model
CreateQueueRequest
GetQueueUrlRequest
Message
MessageAttributeValue
QueueDoesNotExistException
Expand Down Expand Up @@ -168,11 +169,13 @@

Will throw QueueDoesNotExistException if the queue does not exist.
`configure-queue` can be used to create and configure the queue."
[^String queue-name & {:keys [client] :as options}]
[^String queue-name & {:keys [client account-id] :as options}]
(dead-letter-deprecation-warning options)
(validate-queue-name! queue-name)
(let [^AmazonSQS client (or client (default-client))
queue-url (.getQueueUrl (.getQueueUrl client queue-name))]
get-queue-url-request (doto (GetQueueUrlRequest. queue-name)
(.setQueueOwnerAWSAccountId account-id))
queue-url (.getQueueUrl (.getQueueUrl client get-queue-url-request))]
(log/infof "Using SQS queue %s at %s" queue-name queue-url)
{:client client
:queue-name queue-name
Expand Down
3 changes: 2 additions & 1 deletion src/com/climate/squeedo/sqs_consumer.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@
:max-concurrent-work - the maximum number of total messages processed. This is mainly for async workflows;
default num-workers
:client - the SQS client to use (if missing, sqs/mk-connection will create a client)
:account-id - the AWS account ID for cross-account connections
:exceptional-poll-delay-ms - when an Exception is received while polling, the number of ms we wait until polling
again. Default is 10000 (10 seconds).
Output:
Expand All @@ -198,7 +199,7 @@
[queue-name compute & opts]
(let [options (->options-map opts)
_ (dead-letter-deprecation-warning options)
connection (sqs/mk-connection queue-name :client (:client options))
connection (sqs/mk-connection queue-name :client (:client options) (:account-id options))
worker-count (get-worker-count options)
listener-count (get-listener-count worker-count options)
message-chan-size (get-message-channel-size listener-count options)
Expand Down