fix(ec2): exposed userDataCausesReplacement in BastionHostLinuxProps#31416
Merged
mergify[bot] merged 2 commits intoaws:mainfrom Oct 15, 2024
Conversation
5df5949 to
d6bf834
Compare
pahud
reviewed
Sep 12, 2024
Comment on lines
+211
to
+230
| // THEN | ||
| Template.fromStack(stackOld).templateMatches(Match.objectLike({ | ||
| Resources: Match.objectLike({ | ||
| [`BastionHostUserDataCausesReplacement985DBC41${oldHash}`]: Match.objectLike({ | ||
| Type: 'AWS::EC2::Instance', | ||
| Properties: Match.anyValue(), | ||
| }), | ||
| }), | ||
| })); | ||
|
|
||
| Template.fromStack(stackNew).templateMatches(Match.objectLike({ | ||
| Resources: Match.objectLike({ | ||
| [`BastionHostUserDataCausesReplacement985DBC41${newHash}`]: Match.objectLike({ | ||
| Type: 'AWS::EC2::Instance', | ||
| Properties: Match.anyValue(), | ||
| }), | ||
| }), | ||
| })); | ||
| }); | ||
|
|
Contributor
There was a problem hiding this comment.
If I just care the logicalId should be different, another option FYR
const oldResourceIds = Object.keys(Template.fromStack(stackOld).findResources('AWS::EC2::Instance'));
const newResourceIds = Object.keys(Template.fromStack(stackNew).findResources('AWS::EC2::Instance'));
if (oldResourceIds.length === 1 && newResourceIds.length === 1) {
const oldResourceId = oldResourceIds[0];
const newResourceId = newResourceIds[0];
expect(oldResourceId).not.toEqual(newResourceId);
expect(oldResourceId).toBe(`BastionHostUserDataCausesReplacement985DBC41${oldHash}`)
expect(newResourceId).toBe(`BastionHostUserDataCausesReplacement985DBC41${newHash}`)
} else {
throw new Error('Expected exactly one AWS::EC2::Instance resource in each stack');
}
GavinZZ
suggested changes
Oct 10, 2024
923e919 to
fb621ff
Compare
GavinZZ
approved these changes
Oct 15, 2024
Contributor
|
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). |
Collaborator
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
Contributor
|
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). |
Contributor
|
Comments on closed issues and PRs are hard for our team to see. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue # (if applicable)
Closes #31348.
Reason for this change
When creating a Bastion host, customer is using instance's userData to write approved public keys to
.ssh/authorized_keys. However, when changing the list of authorized keys, it does not trigger the instance to be replaced, so the modification has no effect.Description of changes
Exposed
userDataCausesReplacementinBastionHostLinuxProps. The value is passed down to downstreamAWS::EC2::Instanceresource.Description of how you validated changes
Added unit and integration tests.
NOTE: Re-invoking
Template.fromStack(stack)doesn't change the resource Id, so unit test uses 2 stacks. May be invokingTemplate.fromStack(stack)caches the results and doesn't refresh it.Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license