sns_topic boto3 port (ansible#39292)

* Port sns_topic to boto3 and add tests
alustau · Aug 24, 2018 · 60e3af4 · 60e3af4
1 parent a78cc15
commit 60e3af4
Show file tree

Hide file tree

Showing 13 changed files with 678 additions and 156 deletions.
diff --git a/changelogs/fragments/sns_topic_boto3_port.yaml b/changelogs/fragments/sns_topic_boto3_port.yaml
@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - sns_topic - Port sns_topic module to boto3 and add an integration test suite.
diff --git a/hacking/aws_config/testing_policies/compute-policy.json b/hacking/aws_config/testing_policies/compute-policy.json
@@ -246,9 +246,13 @@
             "Action": [
               "SNS:CreateTopic",
               "SNS:DeleteTopic",
-              "SNS:ListTopics",
               "SNS:GetTopicAttributes",
-              "SNS:ListSubscriptionsByTopic"
+              "SNS:ListSubscriptions",
+              "SNS:ListSubscriptionsByTopic",
+              "SNS:ListTopics",
+              "SNS:SetTopicAttributes",
+              "SNS:Subscribe",
+              "SNS:Unsubscribe"
             ],
             "Resource": [
               "*"

diff --git a/hacking/aws_config/testing_policies/security-policy.json b/hacking/aws_config/testing_policies/security-policy.json
@@ -3,11 +3,14 @@
     "Statement": [
         {
             "Action": [
+                "iam:GetInstanceProfile",
                 "iam:GetPolicy",
                 "iam:GetPolicyVersion",
                 "iam:GetRole",
+                "iam:GetRolePolicy",
                 "iam:ListAttachedRolePolicies",
                 "iam:ListGroups",
+                "iam:ListInstanceProfiles",
                 "iam:ListInstanceProfilesForRole",
                 "iam:ListPolicies",
                 "iam:ListRoles",

diff --git a/lib/ansible/module_utils/ec2.py b/lib/ansible/module_utils/ec2.py
@@ -552,6 +552,9 @@ def _hashable_policy(policy, policy_list):
                 tupleified = tuple(tupleified)
             policy_list.append(tupleified)
     elif isinstance(policy, string_types) or isinstance(policy, binary_type):
+        # convert root account ARNs to just account IDs
+        if policy.startswith('arn:aws:iam::') and policy.endswith(':root'):
+            policy = policy.split(':')[4]
         return [(to_text(policy))]
     elif isinstance(policy, dict):
         sorted_keys = list(policy.keys())