-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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
fix(ec2): exposed userDataCausesReplacement in BastionHostLinuxProps #31416
fix(ec2): exposed userDataCausesReplacement in BastionHostLinuxProps #31416
Conversation
5df5949
to
d6bf834
Compare
// 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(), | ||
}), | ||
}), | ||
})); | ||
}); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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');
}
923e919
to
fb621ff
Compare
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 CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
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). |
Comments on closed issues and PRs are hard for our team to see. |
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
userDataCausesReplacement
inBastionHostLinuxProps
. The value is passed down to downstreamAWS::EC2::Instance
resource.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