Merge branch 'master' into add-twcs-jar-for-2.1

zalando-stups · May 30, 2017 · b567f32 · b567f32
2 parents b92efcf + 404da04
commit b567f32
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/planb/common.py b/planb/common.py
@@ -134,8 +134,10 @@ def get_instance_profile(cluster_name: str) -> dict:
         profile_name = make_instance_profile_name(cluster_name)
         profile = iam.get_instance_profile(InstanceProfileName=profile_name)
         return profile['InstanceProfile']
-    except botocore.errorfactory.NoSuchEntityException:
-        return None
+    except botocore.exceptions.ClientError as e:
+        if e.response['Error']['Code'] == 'NoSuchEntity':
+            return None
+        raise e
 
 
 def create_instance_profile(cluster_name: str):