[Web] EICE Discover: Extract instanceId from label#34314
Merged
Conversation
Contributor
|
The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with |
rudream
added
no-changelog
rudream
force-pushed
the
yassine/eice-fix
branch
from
eb4da6c to
bdf8899
Compare
kimlisa
approved these changes
Nov 8, 2023
rudream
force-pushed
the
yassine/eice-fix
branch
from
bdf8899 to
8aa5ffa
Compare
This was referenced Nov 10, 2023
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Purpose
Related to #29317
Fixes an edge case in the EC2 instance list screen of the EICE Discover flow.
Also adds some unit tests.
Implementation
In order to check whether or not an EC2 instance is already enrolled, we would check to see if any of our already enrolled nodes had the same AWS Instance ID. In order to do this, we would extract the instance ID of the node from its
awsmetadata. However, there is an edge case which introduced a bug: if the node (ec2 instance) was added using the EC2 Auto-Discovery, then it has noawsmetadata and trying to access the instance ID from there would cause an error.In order to work around this, we now extract the instance ID from the
teleport.dev/instance-idlabel instead, which is guaranteed to be there since it's what we are using in the predicate query which fetches the nodes.