Skip to content

updated to IMDSv2 #5783

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

Merged
merged 1 commit into from
Oct 30, 2024
Merged

updated to IMDSv2 #5783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-linux/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ runs:
# Pulled from instance metadata endpoint for EC2
# see https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-data-retrieval.html
category=$1
curl -fsSL "http://169.254.169.254/latest/meta-data/${category}"
curl -H "X-aws-ec2-metadata-token: $(curl -s -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")" -fsSL "http://169.254.169.254/latest/meta-data/${category}"
}
echo "ami-id: $(get_ec2_metadata ami-id)"
echo "instance-id: $(get_ec2_metadata instance-id)"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-windows/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
# Pulled from instance metadata endpoint for EC2
# see https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-data-retrieval.html
category=$1
curl -fsSL "http://169.254.169.254/latest/meta-data/${category}"
curl -H "X-aws-ec2-metadata-token: $(curl -s -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")" -fsSL "http://169.254.169.254/latest/meta-data/${category}"
}
echo "ami-id: $(get_ec2_metadata ami-id)"
echo "instance-id: $(get_ec2_metadata instance-id)"
Expand Down
21 changes: 20 additions & 1 deletion setup-ssh/src/ec2-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,28 @@ export async function getEC2Metadata(category: string): Promise<string> {
allowRetries: true,
maxRetries
})
// convert these two curls:
// curl -H "X-aws-ec2-metadata-token: $(curl -s -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")" -fsSL "http://169.254.169.254/latest/meta-data/${category}"
const tokenResponse = await http.put(
Copy link
Contributor

@ZainRizvi ZainRizvi Oct 18, 2024

Choose a reason for hiding this comment

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

this bit could be tested by identifying a workflow that uses it and modifying the reference to point to this PR's branch. Let me know if you need help with that

Copy link
Contributor Author

@wdvr wdvr Oct 30, 2024

Choose a reason for hiding this comment

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

tested on pytorch/pytorch#139330 - seems to work: https://github.com/pytorch/pytorch/actions/runs/11602944927/job/32308974862?pr=139330#step:6:27 prints the instance id as url

`http://169.254.169.254/latest/api/token`, undefined, {
headers: {
'X-aws-ec2-metadata-token-ttl-seconds': '30'
}
}
)

if (tokenResponse.message.statusCode !== 200) {
return ''
}

const resp = await http.get(
`http://169.254.169.254/latest/meta-data/${category}`
`http://169.254.169.254/latest/meta-data/${category}`, {
headers: {
'X-aws-ec2-metadata-token': tokenResponse.result
}
}
)

if (resp.message.statusCode !== 200) {
return ''
}
Expand Down
Loading