Skip to content
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

Jump to bottom

added awsRequest for aws-sdk call backoff and retry in customResources #8338

Merged
merged 16 commits into from Oct 7, 2020
Merged

added awsRequest for aws-sdk call backoff and retry in customResources #8338

Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a025816
added awsRequest for aws-sdk call backoff and retry in customResources
pratik-vii Oct 2, 2020
49b9f15
update for prettier
pratik-vii Oct 2, 2020
cbafc9c
using existing env variable SLS_AWS_REQUEST_MAX_RETRIES
pratik-vii Oct 3, 2020
8f0b61d
added functionality to resolve aws service instance in awsRequest
pratik-vii Oct 5, 2020
2c43a32
integrated awsRequest with s3 custom resource
pratik-vii Oct 5, 2020
53d52aa
integrated awsRequest with Event Bridge custom resource
pratik-vii Oct 5, 2020
0a0725b
Merge branch 'master' of https://github.com/serverless/serverless int…
pratik-vii Oct 5, 2020
d2afc2c
integrated awsRequest with CognitoUserPool custom resource
pratik-vii Oct 5, 2020
8a4523b
integrated awsRequest with APIGatewayCloudWatchRole custom resource
pratik-vii Oct 5, 2020
ff2a285
fix case of APIGateway for awsRequest in APIGatewayCloudWatchRole cus…
pratik-vii Oct 5, 2020
3d1a697
fix case of APIGateway for awsRequest in APIGatewayCloudWatchRole cus…
pratik-vii Oct 5, 2020
ae40f38
removed lodash dependency
pratik-vii Oct 6, 2020
5875539
changed awsRequest to async and removed unnecessary promise
pratik-vii Oct 6, 2020
803324d
reverted changes of try/catch for APIGateway update account
pratik-vii Oct 7, 2020
646043c
Merge branch 'master' of https://github.com/serverless/serverless int…
pratik-vii Oct 7, 2020
ea0863f
added async/await for awsRequest
pratik-vii Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 29 additions & 0 deletions lib/plugins/aws/customResources/resources/utils.js
View file
Open in desktop
Expand Up @@ -90,11 +90,40 @@ function wait(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}

const MAX_AWS_REQUEST_TRY = (() => {
const DEFAULT_MAX_AWS_REQUEST_TRY = 4;
const userValue = Number(process.env.SLS_AWS_REQUEST_MAX_RETRIES);
return userValue >= 0 ? userValue : DEFAULT_MAX_AWS_REQUEST_TRY;
})();

function awsRequest(serviceInstance, method, ...args) {
const callAws = requestTry => {
return serviceInstance[method](...args)
.promise()
.then(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use async/await

result => result,
error => {
if (
requestTry < MAX_AWS_REQUEST_TRY &&
error &&
(error.statusCode === 429 ||
(error.retryable && error.statusCode !== 403 && error.code !== 'CredentialsError'))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can limit this to (error.statusCode === 429 || error.retryable), as in Lambda we should not expect credential errors, so it's not the case to consider

) {
return wait(4000 + Math.random() * 3000).then(() => callAws(++requestTry));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7 seconds, is a lot in lambda, let's make it maybe 2000 + Math.random() * 1000, and maybe increase DEFAULT_MAX_AWS_REQUEST_TRY to 8

}
throw error;
}
);
};
return callAws(1);
}

module.exports = {
logger,
response,
getEnvironment,
getLambdaArn,
handlerWrapper,
wait,
awsRequest,
};