Skip to content

Commit

Permalink
Merge branch 'master' into update-apigwv2auth-to-none
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed May 12, 2021
2 parents 3df107f + 0ea24e9 commit afa7ceb
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 10 deletions.
5 changes: 4 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ The following tools need to be installed on your system prior to installing the
- [Yarn >= 1.19.1, < 2](https://yarnpkg.com/lang/en/docs/install)
- [.NET Core SDK 3.1.x](https://www.microsoft.com/net/download)
- [Python >= 3.6.5, < 4.0](https://www.python.org/downloads/release/python-365/)
- [Docker >= 19.03](https://docs.docker.com/get-docker/)
- the Docker daemon must also be running

First fork the repository, and then run the following commands to clone the repository locally.

Expand Down Expand Up @@ -113,8 +115,9 @@ However, if you wish to build the the entire repository, the following command w

```console
cd <root of the CDK repo>
yarn build
scripts/foreach.sh yarn build
```
Note: The `foreach` command is resumable by default; you must supply `-r` or `--reset` to start a new session.

You are now ready to start contributing to the CDK. See the [Pull Requests](#pull-requests) section on how to make your
changes and submit it as a pull request.
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-lambda-event-sources/lib/stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export interface StreamEventSourceProps {
* * Minimum value of 60 seconds
* * Maximum value of 7 days
*
* @default Duration.days(7)
* @default - the retention period configured on the stream
*/
readonly maxRecordAge?: Duration;

Expand All @@ -51,7 +51,7 @@ export interface StreamEventSourceProps {
* * Minimum value of 0
* * Maximum value of 10000
*
* @default 10000
* @default - retry until the record expires
*/
readonly retryAttempts?: number;

Expand Down
33 changes: 29 additions & 4 deletions scripts/check-build-prerequisites.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ app_v=$(node --version)
# Check for version 10.*.* - 29.*.*
echo -e "Checking node version... \c"
if [ $(echo $app_v | grep -c -E "v[12][0-9]\.[0-9]+\.[0-9]+") -eq 1 ]
then
then
# Check for version 13.0 to 13.6
if [ $(echo $app_v | grep -c -E "v13\.[0-6]\.[0-9]+") -eq 1 ]
then
die "node versions 13.0.0 to 13.6.0 are not supported due to compatibility issues with our dependencies."
else
# Check for version < 10.13
if [ $(echo $app_v | grep -c -E "v10\.([0-9]|1[0-2])\.[0-9]+") -eq 1 ]
then
then
wrong_version
else
echo "Ok"
Expand All @@ -68,7 +68,7 @@ check_which $app $app_min
app_v=$(${app} --version)
echo -e "Checking yarn version... \c"
if [ $(echo $app_v | grep -c -E "1\.(19|2[0-9])\.[0-9]+") -eq 1 ]
then
then
echo "Ok"
else
wrong_version
Expand All @@ -83,9 +83,34 @@ check_which $app $app_min
echo -e "Checking if docker is running... \c"
docker_running=$(docker ps)
if [ $? -eq 0 ]
then
then
echo "Ok"
else
die "Docker is not running"
fi

# [.NET == 3.1.x]
app="dotnet"
app_min="3.1.0"
check_which $app $app_min
app_v=$(${app} --version)
echo -e "Checking dotnet version... \c"
if [ $(echo $app_v | grep -c -E "3\.1\.[0-9]+") -eq 1 ]
then
echo "Ok"
else
wrong_version
fi

# [Python >= 3.6.5, < 4.0]
app="python3"
app_min="3.6.5"
check_which $app $app_min
app_v=$(${app} --version)
echo -e "Checking python3 version... \c"
if [ $(echo $app_v | grep -c -E "3\.[6-9]+\.[0-9]+") -eq 1 ]
then
echo "Ok"
else
wrong_version
fi
6 changes: 3 additions & 3 deletions scripts/check-yarn-lock.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ async function main() {
}

projects.forEach((p) => {
Object.entries(p.devDependencies ?? {}).forEach(([depName, depVersion]) => errorIfNotInYarnLock(p, depName, depVersion));
Object.entries(p.peerDependencies ?? {}).forEach(([depName, depVersion]) => errorIfNotInYarnLock(p, depName, depVersion));
Object.entries(p.dependencies ?? {}).forEach(([depName, depVersion]) => errorIfNotInYarnLock(p, depName, depVersion));
Object.entries(p.devDependencies || {}).forEach(([depName, depVersion]) => errorIfNotInYarnLock(p, depName, depVersion));
Object.entries(p.peerDependencies || {}).forEach(([depName, depVersion]) => errorIfNotInYarnLock(p, depName, depVersion));
Object.entries(p.dependencies || {}).forEach(([depName, depVersion]) => errorIfNotInYarnLock(p, depName, depVersion));
});
}

Expand Down

0 comments on commit afa7ceb

Please sign in to comment.