Skip to content

Commit

Permalink
Release 2.7.3 (#25)
Browse files Browse the repository at this point in the history
* improved error handling
  • Loading branch information
jsetton committed Mar 11, 2023
1 parent d6f2de8 commit 9e17557
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
24 changes: 14 additions & 10 deletions lambda/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ const addPermission = (ruleArn) => {
StatementId: ruleName,
SourceArn: ruleArn
});
return lambdaClient.send(command).catch((error) => {
if (!(error instanceof ResourceConflictException)) throw error;
});
return lambdaClient.send(command);
};

/**
Expand All @@ -112,9 +110,7 @@ const removePermission = () => {
FunctionName: process.env.AWS_LAMBDA_FUNCTION_NAME,
StatementId: ruleName
});
return lambdaClient.send(command).catch((error) => {
if (!(error instanceof ResourceNotFoundException)) throw error;
});
return lambdaClient.send(command);
};

/**
Expand All @@ -124,15 +120,23 @@ const removePermission = () => {
* @return {Promise}
*/
export const createEventSchedule = async (functionArn, userId) => {
const response = await createRule();
await Promise.all([addPermission(response.RuleArn), createTarget(functionArn, userId)]);
try {
const response = await createRule();
await Promise.all([addPermission(response.RuleArn), createTarget(functionArn, userId)]);
} catch (error) {
if (!(error instanceof ResourceConflictException)) throw error;
}
};

/**
* Delete event schedule
* @return {Promise}
*/
export const deleteEventSchedule = async () => {
await Promise.all([deleteTarget(), removePermission()]);
await deleteRule();
try {
await Promise.all([deleteTarget(), removePermission()]);
await deleteRule();
} catch (error) {
if (!(error instanceof ResourceNotFoundException)) throw error;
}
};
4 changes: 2 additions & 2 deletions lambda/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lambda/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alexa-aftership",
"version": "2.7.2",
"version": "2.7.3",
"description": "AfterShip Shipment Tracking for Alexa",
"license": "MIT",
"author": "Jeremy Setton",
Expand Down

0 comments on commit 9e17557

Please sign in to comment.