Merge branch 'Updatng-permissions-and-adding-more-functions' into Updatng-permissions-and-adding-more-functions-PR-devel-2.x

Author: Matej Stajduhar

roles/aws/aws_admin_tools/defaults/main.yml

@@ -4,19 +4,40 @@ aws_admin_tools:
   allowed_ips:
     - 192.168.1.1/32 # Ip of server with access to API-s
   functions:
-    - name: "GetForecastedCosts"
+    - name: "Get_Forecasted_Costs"
       type: GET
       inline_policies:
         name: "{{ _aws_profile }}Billing"
         resource: "*"
         acton:
           - "ce:*"
       policies: []
-    - name: "ChangeASGScaling"
+    - name: "Change_ASG_Scaling"
       type: POST
       policies:
         - arn:aws:iam::aws:policy/AmazonEC2FullAccess
-    - name: "GetListOfEC2"
+    - name: "Get_List_Of_EC2"
       type: GET
-      policies:
-        - arn:aws:iam::aws:policy/AmazonEC2FullAccess
+      policies: []
+      inline_policies:
+        name: "ListEc2"
+        resource: "*"
+        acton:
+          - "ec2:DescribeAddresses"
+          - "ec2:DescribeInstances"
+    - name: "Get_IP_Set"
+      type: GET
+      policies: []
+      inline_policies:
+        name: "Get_IP_Set"
+        resource: "*"
+        acton:
+          - "wafv2:GetIPSet"
+    - name: "Update_IP_Set"
+      type: POST
+      policies: []
+      inline_policies:
+        name: "Update_IP_Set"
+        resource: "*"
+        acton:
+          - "wafv2:UpdateIPSet"

…ols/templates/API_ChangeASGScaling.py.j2 …s/templates/API_Change_ASG_Scaling.py.j2roles/aws/aws_admin_tools/templates/API_ChangeASGScaling.py.j2 renamed to roles/aws/aws_admin_tools/templates/API_Change_ASG_Scaling.py.j2 roles/aws/aws_admin_tools/templates/API_ChangeASGScaling.py.j2 renamed to roles/aws/aws_admin_tools/templates/API_Change_ASG_Scaling.py.j2

@@ -0,0 +1,21 @@
+import json
+import boto3
+
+waf_cli = boto3.client("wafv2")
+
+def lambda_handler(event, context):
+
+    print("Gathering instance details.")
+    ip_set=waf_cli.get_ip_set(
+        Name=event['ip_set'],
+        Scope='REGIONAL',
+        Id=event['id']
+    )
+
+    return {
+        'statusCode': 200,
+        'name': ip_set['IPSet']['Name'],
+        'id': ip_set['IPSet']['Id'],
+        'addresses': ip_set['IPSet']['Addresses'],
+        'lock_token': ip_set['LockToken'],
+    }

…s/templates/API_GetForecastedCosts.py.j2 …templates/API_Get_Forecasted_Costs.py.j2roles/aws/aws_admin_tools/templates/API_GetForecastedCosts.py.j2 renamed to roles/aws/aws_admin_tools/templates/API_Get_Forecasted_Costs.py.j2 roles/aws/aws_admin_tools/templates/API_GetForecastedCosts.py.j2 renamed to roles/aws/aws_admin_tools/templates/API_Get_Forecasted_Costs.py.j2

@@ -0,0 +1,19 @@
+import json
+import boto3
+
+waf_cli = boto3.client("wafv2")
+
+def lambda_handler(event, context):
+
+    response = waf_cli.update_ip_set(
+        Name=event['name'],
+        Scope=event['scope'],
+        Id=event['id'],
+        Addresses=event['addresses'],
+        LockToken=event['lock_token']
+)
+
+    return {
+        'statusCode': 200,
+        'body': response
+    }