Merge branch 'hotfix/0.3.1'

README.rst

@@ -116,6 +116,11 @@ You can also restart it using
 Release notes
 -------------
 
+0.3.1
+^^^^^
+
+- Fixed IAM Instance Profile authentication for boto >= 2.29.0 (`#6 <https://github.com/skymill/automated-ebs-snapshots/issues/6>`__)
+
 0.3.0
 ^^^^^
 

automated_ebs_snapshots/connection_manager.py

@@ -21,25 +21,21 @@ def connect_to_ec2(region='us-east-1', access_key=None, secret_key=None):
     """
     logger.info('Connecting to AWS EC2 in {}'.format(region))
 
-    # Fetch instance metadata
-    metadata = get_instance_metadata(timeout=1, num_retries=1)
-    if metadata:
-        try:
-            profile_name = metadata['iam']['info'][u'InstanceProfileArn']
-            region = metadata['placement']['availability-zone'][:-1]
-        except KeyError:
-            profile_name = None
-
     if access_key:
         # Connect using supplied credentials
         connection = ec2.connect_to_region(
             region,
             aws_access_key_id=access_key,
             aws_secret_access_key=secret_key)
-    elif metadata:
-        # Connect using instance profile
-        connection = ec2.connect_to_region(region, profile_name=profile_name)
     else:
+        # Fetch instance metadata
+        metadata = get_instance_metadata(timeout=1, num_retries=1)
+        if metadata:
+            try:
+                region = metadata['placement']['availability-zone'][:-1]
+            except KeyError:
+                pass
+
         # Connect using env vars or boto credentials
         connection = ec2.connect_to_region(region)
 

automated_ebs_snapshots/settings.conf

@@ -1,2 +1,2 @@
 [general]
-version: 0.3.0
+version: 0.3.1