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

feat(ec2): extend BastionHostLinux to support CloudFormationInit #17507

Merged
merged 2 commits into from
Nov 30, 2021
Merged

feat(ec2): extend BastionHostLinux to support CloudFormationInit #17507

merged 2 commits into from
Nov 30, 2021

Conversation

mpvosseller
Copy link
Contributor

@mpvosseller mpvosseller commented Nov 15, 2021 •
edited
Loading

Implements #17161

Extends the BastionHostLinux constructor to accept optional CloudFormationInit and ApplyCloudFormationInitOptions arguments to be passed to the underlying instance.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@gitpod-io
Copy link

gitpod-io bot commented Nov 15, 2021

@mergify
Copy link
Contributor

mergify bot commented Nov 15, 2021

Title does not follow the guidelines of Conventional Commits. Please adjust title before merge.

@mpvosseller mpvosseller changed the title Extend BastionHostLinux to support CloudFormationInit - Fixes #17161 feat(ec2): extend BastionHostLinux to support CloudFormationInit Nov 15, 2021
@github-actions github-actions bot added the @aws-cdk/aws-ec2 Related to Amazon Elastic Compute Cloud label Nov 15, 2021
njlynch
njlynch previously requested changes Nov 16, 2021
View reviewed changes
Copy link
Contributor

@njlynch njlynch 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. Please add a test verifying the behavior

@mergify mergify bot dismissed njlynch’s stale review November 16, 2021 20:03

Pull request has been modified.

@mpvosseller mpvosseller force-pushed the mpv/bastion-host-linux-cloudformation-init branch from 4712621 to fb14b89 Compare November 16, 2021 20:06
@mpvosseller
Copy link
Contributor Author

Thank you @njlynch
I fixed the formatting and added a test.

@mpvosseller mpvosseller force-pushed the mpv/bastion-host-linux-cloudformation-init branch from c9b91c5 to 3a68d47 Compare November 17, 2021 22:49
@mpvosseller mpvosseller requested a review from njlynch November 17, 2021 22:59
@mpvosseller mpvosseller force-pushed the mpv/bastion-host-linux-cloudformation-init branch from 3a68d47 to 74cb051 Compare November 19, 2021 18:37
@mpvosseller
Copy link
Contributor Author

@njlynch the formatting is fixed, test is added, and rebased with master. Let me know if there is anything else I can do to get this merged. Thanks.

@mpvosseller mpvosseller force-pushed the mpv/bastion-host-linux-cloudformation-init branch 4 times, most recently from 572df19 to f06d4f6 Compare November 27, 2021 13:13
@mpvosseller mpvosseller force-pushed the mpv/bastion-host-linux-cloudformation-init branch 4 times, most recently from 4325955 to 320bc0f Compare November 29, 2021 17:45
@mpvosseller mpvosseller force-pushed the mpv/bastion-host-linux-cloudformation-init branch from 320bc0f to 05ef576 Compare November 30, 2021 11:53
njlynch
njlynch approved these changes Nov 30, 2021
View reviewed changes
Copy link
Contributor

@njlynch njlynch left a comment

Choose a reason for hiding this comment

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

Looks great! Apologies for the delay.

@njlynch njlynch added the pr-linter/exempt-readme The PR linter will not require README changes label Nov 30, 2021
@mergify
Copy link
Contributor

mergify bot commented Nov 30, 2021

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

@njlynch
Copy link
Contributor

njlynch commented Nov 30, 2021

FYI - For future reference, don't worry about updating from master (or other upstream branch) unless there are conflicts. Our automation will automatically update after approval and before merge. :)

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: ea80a88
  • 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 c62377e into aws:master Nov 30, 2021
@mergify
Copy link
Contributor

mergify bot commented Nov 30, 2021

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

@mpvosseller
Copy link
Contributor Author

Thank you @njlynch!!!

pedrosola pushed a commit to pedrosola/aws-cdk that referenced this pull request Dec 1, 2021
@mpvosseller
feat(ec2): extend BastionHostLinux to support CloudFormationInit (aws…
7a5ebbe 
…#17507)

Implements aws#17161

Extends the `BastionHostLinux` constructor to accept optional `CloudFormationInit` and `ApplyCloudFormationInitOptions` arguments to be passed to the underlying instance.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
@mpvosseller
Copy link
Contributor Author

@njlynch What's the process to get this PR (already merged to main) merged into v2-main? Happy to open another PR if helpful but guessing it will automatically get merged in at some point? Thanks.

@njlynch
Copy link
Contributor

njlynch commented Dec 3, 2021

We typically automatically merge forward daily; we put a temporary hold on the automation ahead of the v2 launch, but it's back on track now. This change is included in #17824, which will go out with the next v2 release.

TikiTDO pushed a commit to TikiTDO/aws-cdk that referenced this pull request Feb 21, 2022
@mpvosseller @TikiTDO
feat(ec2): extend BastionHostLinux to support CloudFormationInit (aws…
9e15373 
…#17507)

Implements aws#17161

Extends the `BastionHostLinux` constructor to accept optional `CloudFormationInit` and `ApplyCloudFormationInitOptions` arguments to be passed to the underlying instance.

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@njlynch njlynch njlynch approved these changes

Assignees

@njlynch njlynch

Labels
@aws-cdk/aws-ec2 Related to Amazon Elastic Compute Cloud pr-linter/exempt-readme The PR linter will not require README changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mpvosseller @njlynch @aws-cdk-automation