-
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
Open
ashishdhingra
wants to merge
2
commits into
aws:main
Choose a base branch
from
ashishdhingra:user/ashdhin/userDataCausesReplacement-BastionHostLinuxProps
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
fix(ec2): exposed userDataCausesReplacement in BastionHostLinuxProps #31416
ashishdhingra
wants to merge
2
commits into
aws:main
from
ashishdhingra:user/ashdhin/userDataCausesReplacement-BastionHostLinuxProps
+2,455
−1
Conversation
This file contains 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
github-actions
bot
added
bug
This issue is a bug.
effort/small
Small work item – less than a day of effort
p2
labels
Sep 12, 2024
amazon-codecatalyst
bot
force-pushed
the
user/ashdhin/userDataCausesReplacement-BastionHostLinuxProps
branch
from
September 12, 2024 01:16
1ce4e49
to
9aacd6c
Compare
amazon-codecatalyst
bot
force-pushed
the
user/ashdhin/userDataCausesReplacement-BastionHostLinuxProps
branch
from
September 12, 2024 01:41
5df5949
to
d6bf834
Compare
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
aws-cdk-automation
added
the
pr/needs-maintainer-review
This PR needs a review from a Core Team Member
label
Sep 12, 2024
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(), | ||
}), | ||
}), | ||
})); | ||
}); | ||
|
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');
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
bug
This issue is a bug.
contribution/core
This is a PR that came from AWS.
effort/small
Small work item – less than a day of effort
p2
pr/needs-maintainer-review
This PR needs a review from a Core Team Member
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
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