Merge pull request #1 from codeocean/imdsv2-support

Imdsv2 support

install.sh

@@ -59,6 +59,9 @@ Options
     -s, --initial-size  SIZE
                         Initial size of the volume in GB. (Default: 200)
                         Only used if --initial-device is NOT specified.
+
+    -i, --imdsv2        
+                        Enable imdsv2 for instance metadata API requests.
     
 EOF
 )
@@ -73,8 +76,6 @@ BASEDIR=$(dirname $0)
 
 . ${BASEDIR}/shared/utils.sh
 
-initialize
-
 # parse options
 PARAMS=""
 while (( "$#" )); do
@@ -99,6 +100,10 @@ while (( "$#" )); do
             MOUNTPOINT=$2
             shift 2
             ;;
+        -i|--imdsv2)
+            IMDSV2="true"
+            shift 1
+            ;;
         -h|--help)
             echo "$USAGE"
             exit
@@ -119,6 +124,8 @@ done
 
 eval set -- "$PARAMS"
 
+initialize
+
 # for backwards compatibility evaluate positional parameters like previous 2.0.x and 2.1.x releases
 # this will be removed in the future
 if [ ! -z "$PARAMS" ]; then

shared/utils.sh

@@ -30,10 +30,14 @@
 
 function get_metadata() {
     local key=$1
-    local metdata_ip='169.254.169.254'
-    local token=$(curl -s -X PUT "http://$metdata_ip/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 60")
+    local metadata_ip='169.254.169.254'
+
+    if [ ! -z "$IMDSV2" ]; then
+        local token=$(curl -s -X PUT "http://$metadata_ip/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 60")
+        local token_wrapper='-H "X-aws-ec2-metadata-token: $token"'
+    fi
 
-    echo `curl -s -H "X-aws-ec2-metadata-token: $token" http://$metdata_ip/latest/meta-data/$key`
+    echo `curl -s $token_wrapper http://$metadata_ip/latest/meta-data/$key`
 }
 
 function initialize() {