Merge pull request #28 from ccnmtl/ec2-instance-ip-refactor

Refactor get_ec2_instance_ip logic

CHANGES.txt

@@ -1,3 +1,7 @@
+0.3.3
+====================
+* Added token process to get_ec2_instance_ip()
+
 0.3.2 (2024-04-16)
 ====================
 * Added CSRF_TRUSTED_ORIGINS config for Django >= 4.0

ctlsettings/shared.py

@@ -3,30 +3,40 @@
 import requests
 
 
-def get_ec2_instance_ip():
+def get_ec2_instance_ip() -> str:
     # URL to retrieve the token for IMDSv2
     token_url = "http://169.254.169.254/latest/api/token"
     # URL to get the local IPv4 address
     ipv4_url = "http://169.254.169.254/latest/meta-data/local-ipv4"
+
+    token_response = None
     try:
         # Get the token required for accessing IMDSv2
         token_response = requests.put(
                 token_url,
                 headers={"X-aws-ec2-metadata-token-ttl-seconds": "21600"},
                 timeout=2
             )
-        if token_response.status_code == 200:
-            token = token_response.text
-        else:
-            return ""  # Token request failed
+    except requests.exceptions.RequestException:
+        return ""
+
+    token = None
+    if token_response.status_code == 200:
+        token = token_response.text
+    else:
+        return ""  # Token request failed
 
+    response = None
+    try:
         # Use the token to access the IPv4 metadata
         response = requests.get(
             ipv4_url, headers={"X-aws-ec2-metadata-token": token}, timeout=2)
-        if response.status_code == 200:
-            return response.text
     except requests.exceptions.RequestException:
         return ""
+
+    if response.status_code == 200:
+        return response.text
+
     return ""