-
Notifications
You must be signed in to change notification settings - Fork 21
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
Add error handling around SNS API calls #21
Merged
+38
−6
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d73e6e5
Add error handling around SNS API calls
makimoto 61cdbd5
Use save! instead of save
makimoto 23563ce
Remove exception handling in fetch_sns_topic_arns and require sns:Lis…
makimoto edc4210
Add spec in case of another error
makimoto 5d11bbb
Remove unncessary method call
makimoto 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 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 |
---|---|---|
|
@@ -18,11 +18,22 @@ def edit | |
|
||
def create | ||
@sns_subscription = Barbeque::SNSSubscription.new(params.require(:sns_subscription).permit(:topic_arn, :job_queue_id, :job_definition_id)) | ||
|
||
if @sns_subscription.save | ||
update_sqs_policy! | ||
subscribe_topic! | ||
redirect_to @sns_subscription, notice: 'SNS subscription was successfully created.' | ||
if @sns_subscription.valid? | ||
begin | ||
subscribe_topic! | ||
rescue Aws::SNS::Errors::AuthorizationError | ||
@sns_subscription.errors[:topic_arn] << 'is not authorized' | ||
@sns_topic_arns = fetch_sns_topic_arns | ||
render :new | ||
rescue Aws::SNS::Errors::NotFound | ||
@sns_subscription.errors[:topic_arn] << 'is not found' | ||
@sns_topic_arns = fetch_sns_topic_arns | ||
render :new | ||
else | ||
@sns_subscription.save | ||
update_sqs_policy! | ||
redirect_to @sns_subscription, notice: 'SNS subscription was successfully created.' | ||
end | ||
else | ||
render :new | ||
end | ||
|
@@ -50,6 +61,8 @@ def destroy | |
|
||
def fetch_sns_topic_arns | ||
sns_client.list_topics.topics.map(&:topic_arn) | ||
rescue Aws::Errors::MissingCredentialsError, Aws::SNS::Errors::AuthorizationError | ||
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. I think these exceptions should be reported as 5xx error because sns:ListTopics permission is required in Barbeque 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. I think so, too. fixed. |
||
[] | ||
end | ||
|
||
def update_sqs_policy! | ||
|
This file contains 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
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.
Use
save!
if you don't check the return valueThere 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.
fixed.