Skip to content

Commit

Permalink
chore(deps): Bump awscli in /packages/@aws-cdk/lambda-layer-awscli (#…
Browse files Browse the repository at this point in the history
…21716)

[This change in the aws cli](aws/aws-cli#7157) made the `help` command use 
the file `global_options.rst` in the `opt/awscli/awscli/examples` folder. 
We need to keep that file so that running 
`/opt/awscli/aws help` doesn't break.

I moved this into a new PR from the dependabot one because I didn't want it to auto-approve my changes.

----

### All Submissions:

* [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)?
	* [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)?

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
TheRealAmazonKendra authored Aug 23, 2022
1 parent 17dd132 commit 5ce0a09
Show file tree
Hide file tree
Showing 9 changed files with 629 additions and 613 deletions.
9 changes: 8 additions & 1 deletion packages/@aws-cdk/lambda-layer-awscli/layer/Dockerfile
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

#
# 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)

#
# Test that the CLI works
Expand Down
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
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 not shown.
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

0 comments on commit 5ce0a09

Please sign in to comment.