Skip to content
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

Fixed AWS 'teleport-generate-config' script when IMDSv2 is used #13417

Merged
merged 13 commits into from
Jun 15, 2022
Merged

Fixed AWS 'teleport-generate-config' script when IMDSv2 is used #13417

Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
438c3ab
Fixed AWS 'teleport-generate-config' script when IMDSV2 is used
fheinecke Jun 13, 2022
f6b5262
Merge branch 'master' into fred/10962-fix
fheinecke Jun 13, 2022
652bed6
Merge branch 'master' into fred/10962-fix
fheinecke Jun 13, 2022
80d8f2c
Merge branch 'master' into fred/10962-fix
fheinecke Jun 13, 2022
27755d7
Merge branch 'master' into fred/10962-fix
fheinecke Jun 14, 2022
2830e66
Merge branch 'master' into fred/10962-fix
fheinecke Jun 14, 2022
18f0dbb
Merge branch 'master' into fred/10962-fix
fheinecke Jun 14, 2022
1d93b2b
Merge branch 'master' into fred/10962-fix
fheinecke Jun 14, 2022
0b83a9f
Merge branch 'master' into fred/10962-fix
fheinecke Jun 14, 2022
ff6ff8e
Merge branch 'master' into fred/10962-fix
fheinecke Jun 14, 2022
e6b2dfc
Merge branch 'master' into fred/10962-fix
fheinecke Jun 14, 2022
e547284
Merge branch 'master' into fred/10962-fix
fheinecke Jun 14, 2022
43f9c2d
Merge branch 'master' into fred/10962-fix
fheinecke Jun 15, 2022
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
4 changes: 2 additions & 2 deletions assets/aws/files/bin/teleport-generate-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ aws_metadata_get() {

if ! is_test; then
IMDS_TOKEN=$(curl -m5 -sS -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 300")
IMDS_TOKEN_HEADER="-H \"X-aws-ec2-metadata-token: ${IMDS_TOKEN}\""
curl -m5 -sS "${IMDS_TOKEN_HEADER}" ${CURL_EXTRA_ARGS} http://169.254.169.254/latest/${REQUEST_PATH}
IMDS_TOKEN_HEADER="X-aws-ec2-metadata-token: ${IMDS_TOKEN}"
curl -m5 -sS -H "${IMDS_TOKEN_HEADER}" ${CURL_EXTRA_ARGS} http://169.254.169.254/latest/${REQUEST_PATH}
else
# return a pre-calculated value
VARIABLE="TELEPORT_TESTVAR_${REQUEST}"
Expand Down