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.

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

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

Merged
merged 5 commits into from
Aug 23, 2022

Conversation

TheRealAmazonKendra
Copy link
Contributor

This change in the aws cli 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:

Adding new Unconventional Dependencies:

  • This PR adds new unconventional dependencies following the process described here

New Features

  • Have you added the new feature to an integration test?
    • 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

dependabot bot and others added 2 commits August 22, 2022 15:20
Bumps [awscli](https://github.com/aws/aws-cli) from 1.25.2 to 1.25.57.
- [Release notes](https://github.com/aws/aws-cli/releases)
- [Changelog](https://github.com/aws/aws-cli/blob/develop/CHANGELOG.rst)
- [Commits](aws/aws-cli@1.25.2...1.25.57)

---
updated-dependencies:
- dependency-name: awscli
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
[This change in the aws cli](aws/aws-cli#7157) made --help use
global_options.rst in the examples folder. We need to keep that file so that running /opt/awscli/aws help
doesn't break.
@gitpod-io
Copy link

gitpod-io bot commented Aug 22, 2022

@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 22, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team August 22, 2022 22:33
@github-actions github-actions bot added the p2 label Aug 22, 2022
Copy link
Contributor

@madeline-k madeline-k left a comment

Choose a reason for hiding this comment

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

Looks good to me, I have some minor comments

@@ -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.

Co-authored-by: Madeline Kusters <80541297+madeline-k@users.noreply.github.com>
@TheRealAmazonKendra
Copy link
Contributor Author

Oh. Hmm, that change didn't go well.

@mergify
Copy link
Contributor

mergify bot commented Aug 23, 2022

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 2a36a94
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit 5ce0a09 into main Aug 23, 2022
@mergify mergify bot deleted the TheRealAmazonKendra/lambda-layer-awscli-upgrade branch August 23, 2022 18:30
@mergify
Copy link
Contributor

mergify bot commented Aug 23, 2022

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@TheRealAmazonKendra
Copy link
Contributor Author

@Mergifyio backport v1-main

@mergify
Copy link
Contributor

mergify bot commented Aug 23, 2022

backport v1-main

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Aug 23, 2022
…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*

(cherry picked from commit 5ce0a09)
mergify bot added a commit that referenced this pull request Aug 23, 2022
…ackport #21716) (#21722)

This is an automatic backport of pull request #21716 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>
josephedward pushed a commit to josephedward/aws-cdk that referenced this pull request Aug 30, 2022
…ws#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*
@HBobertz HBobertz mentioned this pull request Nov 10, 2022
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS. p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants