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

chore(deps): Bump awscli in /packages/@aws-cdk/lambda-layer-awscli #21716

Merged
merged 5 commits into from
Aug 23, 2022
Merged

chore(deps): Bump awscli in /packages/@aws-cdk/lambda-layer-awscli #21716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38659ec
chore(deps): Bump awscli in /packages/@aws-cdk/lambda-layer-awscli
dependabot[bot] Aug 22, 2022
4f8090b
fix awscli lambda layer
TheRealAmazonKendra Aug 22, 2022
e17fa9f
Update packages/@aws-cdk/lambda-layer-awscli/layer/Dockerfile
TheRealAmazonKendra Aug 23, 2022
7b80144
Revert "Update packages/@aws-cdk/lambda-layer-awscli/layer/Dockerfile"
TheRealAmazonKendra Aug 23, 2022
2a36a94
Merge branch 'main' into TheRealAmazonKendra/lambda-layer-awscli-upgrade
mergify[bot] Aug 23, 2022
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
9 changes: 8 additions & 1 deletion packages/@aws-cdk/lambda-layer-awscli/layer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,21 @@ RUN yum update -y \
COPY requirements.txt ./
RUN python -m pip install -r requirements.txt -t /opt/awscli

#
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you remove the added empty lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added these to align with the style of the rest of the file. I can remove them everywhere if preferred.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah in that case, it's fine with me! Thanks for explaining.

# organize for self-contained usage
#

RUN mv /opt/awscli/bin/aws /opt/awscli

#
# cleanup
#

RUN rm -rf \
/opt/awscli/pip* \
/opt/awscli/setuptools* \
/opt/awscli/awscli/examples
&& cd /opt/awscli/awscli/examples \
&& rm -rf $(ls | grep -v global_options.rst)
TheRealAmazonKendra marked this conversation as resolved.
Show resolved Hide resolved

#
# Test that the CLI works
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
awscli==1.25.51
awscli==1.25.58
1 change: 1 addition & 0 deletions packages/@aws-cdk/lambda-layer-awscli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"@aws-cdk/custom-resources": "0.0.0",
"@aws-cdk/cdk-build-tools": "0.0.0",
"@aws-cdk/integ-runner": "0.0.0",
"@aws-cdk/integ-tests": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.5.2",
"jest": "^27.5.1"
Expand Down
Binary file renamed ...2511dcc959f25054825394cbb86028ccd1b6a.zip → ...d6f3fa7b5276431c9a4fd4dc681303ab15080.zip
View file
Open in desktop
Binary file not shown.
58 changes: 58 additions & 0 deletions ...layer-awscli/test/awscli-layer.integ.snapshot/lambda-layer-awscli-integ-stack.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"version": "20.0.0",
"files": {
"39ee629321f531fffd853b944b2d6f3fa7b5276431c9a4fd4dc681303ab15080": {
"source": {
"path": "asset.39ee629321f531fffd853b944b2d6f3fa7b5276431c9a4fd4dc681303ab15080.zip",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "39ee629321f531fffd853b944b2d6f3fa7b5276431c9a4fd4dc681303ab15080.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"5dff6208ccd5fb196bb0354fd6e47faa8431a789e6125d20386586fef761ed48": {
"source": {
"path": "asset.5dff6208ccd5fb196bb0354fd6e47faa8431a789e6125d20386586fef761ed48",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "5dff6208ccd5fb196bb0354fd6e47faa8431a789e6125d20386586fef761ed48.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"8dd02cc4ac473ca5b08800e92edaa31a1a7db4005928021d029c5363584f11b9": {
"source": {
"path": "asset.8dd02cc4ac473ca5b08800e92edaa31a1a7db4005928021d029c5363584f11b9",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "8dd02cc4ac473ca5b08800e92edaa31a1a7db4005928021d029c5363584f11b9.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"db3b79ea78a7c5870937de303240a14a1eb5bb3bd3511defffc68f678aa324f4": {
"source": {
"path": "lambda-layer-awscli-integ-stack.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "db3b79ea78a7c5870937de303240a14a1eb5bb3bd3511defffc68f678aa324f4.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
Loading