Add excluded_regions to POST/PUT AWS lib (#552)

sabiurr · sabiurr · jirikuncar · web-flow · commit 6319ebde0e6b · 2020-03-23T11:01:59.000-04:00
* Add excluded_regions to POST/PUT AWS lib

* Update AWS integration tests with excluded_regions

* Assert excluded region in resp

* Assert excluded region in resp v2

* Update cassette

Co-authored-by: sabiurr &lt;sabiurr@datadoghq.com&gt;
Co-authored-by: Jiri Kuncar &lt;jiri.kuncar@gmail.com&gt;
diff --git a/datadog/api/aws_integration.py b/datadog/api/aws_integration.py
@@ -64,6 +64,10 @@ def create(cls, **params):
         /v1/integration/aws/available_namespace_rules endpoint.
         :type account_specific_namespace_rules: dictionary
 
+        :param excluded_regions: An array of AWS regions to exclude \
+        from metrics collection.
+        :type excluded_regions: list of strings
+
         :returns: Dictionary representing the API's JSON response
 
         >>> account_id = "<AWS_ACCOUNT_ID>"
@@ -72,10 +76,12 @@ def create(cls, **params):
         >>> filter_tags = ["<KEY>:<VALUE>"]
         >>> host_tags = ["<KEY>:<VALUE>"]
         >>> account_specific_namespace_rules = {"namespace1":true/false, "namespace2":true/false}
+        >>> excluded_regions = ["us-east-1", "us-west-1"]
 
         >>> api.AwsIntegration.create(account_id=account_id, role_name=role_name, \
         filter_tags=filter_tags,host_tags=host_tags,\
-        account_specific_namespace_rules=account_specific_namespace_rules)
+        account_specific_namespace_rules=account_specific_namespace_rules \
+        excluded_regions=excluded_regions)
         """
         return super(AwsIntegration, cls).create(id=cls._resource_id, **params)
 
@@ -142,6 +148,10 @@ def update(cls, **body):
         /v1/integration/aws/available_namespace_rules endpoint.
         :type account_specific_namespace_rules: dictionary
 
+        :param excluded_regions: An array of AWS regions to exclude \
+        from metrics collection.
+        :type excluded_regions: list of strings
+
         :returns: Dictionary representing the API's JSON response
 
         The following will depend on whether role delegation or access keys are being used.
@@ -166,11 +176,13 @@ def update(cls, **body):
         >>> filter_tags = ["<KEY>:<VALUE>"]
         >>> host_tags = ["<KEY>:<VALUE>"]
         >>> account_specific_namespace_rules = {"namespace1":true/false, "namespace2":true/false}
+        >>> excluded_regions = ["us-east-1", "us-west-1"]
 
         >>> api.AwsIntegration.update(account_id=account_id, role_name=role_name, \
         new_account_id=new_account_id, new_role_name=new_role_name, \
         filter_tags=filter_tags,host_tags=host_tags,\
-        account_specific_namespace_rules=account_specific_namespace_rules)
+        account_specific_namespace_rules=account_specific_namespace_rules, \
+        excluded_regions=excluded_regions)
         """
         params = {}
         if body.get('account_id') and body.get('role_name'):
diff --git a/tests/integration/api/cassettes/TestAwsIntegration.test_update.yaml b/tests/integration/api/cassettes/TestAwsIntegration.test_update.yaml
@@ -12,17 +12,15 @@ interactions:
       - '65'
       Content-Type:
       - application/json
-      Cookie:
-      - DD-PSHARD=233
       User-Agent:
       - python-requests/2.22.0
     method: POST
     uri: https://api.datadoghq.com/api/v1/integration/aws
   response:
     body:
       string: !!binary |
-        H4sIAAAAAAAAA6tWSq0oSS3KS8yJz0xRslIyT0xNMk40SjVJNTcwMTczsjC3NDRJMzE1NLIwNUpK
-        MVSqBQBSbkdpMgAAAA==
+        H4sIAAAAAAAAA6tWSq0oSS3KS8yJz0xRslIyMkxJS00zS7E0MTY1MTG1TEyyMEq2tDQzTEmxNDIw
+        MFaqBQCXVQ/zMgAAAA==
     headers:
       Cache-Control:
       - no-cache
@@ -37,11 +35,11 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:21:59 GMT
+      - Sat, 21 Mar 2020 08:44:10 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:21:58 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:06 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
@@ -52,17 +50,17 @@ interactions:
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - rk3iIRyevtXsTLLTMsm8PoHrVjRY2UIgJwOnYxasATpPihgg0ps3VPSw7zz+6jrL
+      - WatxAL43AyqgfI4tyA152NzYM3DLdjL7IWr0SzhldiWriTsbw9vUaRZnaqhOCdUk
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
       code: 200
       message: OK
 - request:
-    body: '{"account_id": "123456789104", "host_tags": ["api:test2"], "role_name":
-      "DatadogApiTestRolo"}'
+    body: '{"account_id": "123456789104", "excluded_regions": ["us-east-1", "us-west-1"],
+      "host_tags": ["api:test2"], "role_name": "DatadogApiTestRolo"}'
     headers:
       Accept:
       - '*/*'
@@ -71,7 +69,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '93'
+      - '141'
       Content-Type:
       - application/json
       Cookie:
@@ -97,20 +95,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:00 GMT
+      - Sat, 21 Mar 2020 08:44:11 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:21:59 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:10 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - u2B27rQjtu8TuEjzrroc8ae3xeJMLmsxU6SiAszW1tH+EI3X0cOP819eGNRqlxzl
+      - QpzDmIoaO5Hufx014PqM5BuLw+G9k75nLqy12TEr4Iab1Fl7hIFT5DrERoBer8OF
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
@@ -134,12 +132,10 @@ interactions:
   response:
     body:
       string: !!binary |
-        H4sIAAAAAAAAA82SMU/DMBCF/8vNGZrSlNQbgoWFASoxoMg6udfUEHKRfSFCVf47dmlplUJgZDv7
-        Tuf3Pr8toDHc1uJBPW2BnGMXyyI5NLRdgYJnfEO9SOfZLJtDAhv2ogXLwahvyNi1NbrGV/INGtKu
-        rShMbfsEHFe06xz2CXm5D5d38S6Bta2E3NfaPhnRU7JOZ9M0z+aTbKBnv0dxfVwqHcOJpRGdwI3v
-        2L0EzeJaGsi+QcEVl1ePD7e1UOlQLNfRwpl8iOaWWIZGrFQop1CMetoxTqcXAfHlf2B8oicfMo69
-        YGkPOZ6Ub40h7//KGRurSxTq8P1b1LvXRxMCK67lmquKjKg4/gvfPdp8kU5mQz9BjYqPhT86Jn8k
-        Jj/korHLz0zzWSCKvug/AL5ErxtuAwAA
+        H4sIAAAAAAAAA02OywqDQAxF/yVrhWrty12hX1C6KzKEmWgHpmaYBy2I/94oCN1dyD0ndwLUmvOY
+        IrTPCQI7UiO+CVq4YULDw9XbB8V0Z8dQAH21y4aMCjRYHhcKciwJYyoruUv+SFtyV2xqZY3oqnrf
+        HI6n86XaNVJ8cUwq4bAa0Ns2CVb/U9GTtr3V657oUZMK2ZEA0yxDQuCwwPKnty5R2Gzd3M0/Jtmz
+        DdcAAAA=
     headers:
       Cache-Control:
       - no-cache
@@ -154,11 +150,11 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:01 GMT
+      - Sat, 21 Mar 2020 08:44:12 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:22:01 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:11 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
@@ -169,9 +165,9 @@ interactions:
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - +0e88dcOoH2a7qrZ5zz4PnubdrAKvSl+k8YKr4bhBQyArPBFiYg3oXWqeVKLPB1I
+      - EbXB0e7cF4uDRViRvI+w6qPg1YzykoJqZiw5SbqL/81VRQW4a286h09eTGyIVvXJ
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
@@ -213,20 +209,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:02 GMT
+      - Sat, 21 Mar 2020 08:44:13 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:22:01 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:12 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - jety+2H6BA1H4x31+wzy5BjqI2NDwh54fgbjSYyrLU0p2tWQPCCTKspX7sHO7u1n
+      - IkXBg4ZNMRmDsobzMjEa2v35+NuPiQI0gFmho/o6e7+hfyyJl3rjuklsE4uVJo7l
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
@@ -268,20 +264,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:03 GMT
+      - Sat, 21 Mar 2020 08:44:14 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:22:03 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:14 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - /Lq4EjXKMzRKp9qa/TaJTTVqSY3uTwQpdi8SFIU3firYrLG0qdPC+ksTJBROerQS
+      - RngFxOd8mVeT14auLfzsH/6kz142QLoKkYXZjfmXpXDkZ/eN6uoCM3cTScXuFEa0
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
@@ -323,20 +319,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:04 GMT
+      - Sat, 21 Mar 2020 08:44:16 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:22:03 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:15 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - x4m73yTAj65OpCjnvpw3RBJyiFQpkDOBZ7rE/UM6Q4o0837nUb4ZsWFNJUD0Xh0e
+      - EbXB0e7cF4uDRViRvI+w6qPg1YzykoJqZiw5SbqL/81VRQW4a286h09eTGyIVvXJ
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
@@ -378,20 +374,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:06 GMT
+      - Sat, 21 Mar 2020 08:44:17 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:22:04 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:16 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - xKFgbVhCHArG4Y0sXMtZ5P8r3tuxi63adTKFxNzM7f4aJAAu82zS1Bp7ak9HjM4Y
+      - NueLa2zkdBcl9S7BHrRuWyjAeR9iWgPFe330KTY6Cp0/yUhjUktbxu5rG2fG6gBk
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
@@ -433,20 +429,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:07 GMT
+      - Sat, 21 Mar 2020 08:44:18 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:22:06 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:17 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - TAg/qKywM5rz/AUGkmt8+wB4wzGMJfSiHOrBzxBctPLsV/erSD5TChi/uo5ZlVXK
+      - u9VEJv4YNx+Fl9tRGJNbGm0+76jyym0t+mec2t84PhoJYEedil3ajyEhP7U3EneZ
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
@@ -488,20 +484,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:10 GMT
+      - Sat, 21 Mar 2020 08:44:18 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:22:07 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:18 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - xDB9TwFteerR1wCiwj8/TgXRHM8VsESQxiCQvltAxyn4fse47E64CquSvdpyvFXM
+      - Z91NUpPIZnIQ9h7lBFWBkEPGVUEsn4/i71imPPwrChu4RPI5uNM5HGuodISK1HBR
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
@@ -543,20 +539,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:11 GMT
+      - Sat, 21 Mar 2020 08:44:20 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:22:10 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:18 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - AZX6w/8zD+VN3BjlP7mTxsWKLW39bs6QmKw7eyNlBdxzsMsZp5eTFn4umzElZK4n
+      - +6muH0vWWhHE6JfE/xHkdpoFSNgX/+wCvqEMuEDvglDKir3htwvCDYdHi0bPaPF0
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
@@ -598,20 +594,20 @@ interactions:
       DD-POOL:
       - dogweb
       Date:
-      - Mon, 03 Feb 2020 16:22:11 GMT
+      - Sat, 21 Mar 2020 08:44:22 GMT
       Pragma:
       - no-cache
       Set-Cookie:
-      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Mon, 10-Feb-2020 16:22:11 GMT;
+      - DD-PSHARD=233; Max-Age=604800; Path=/; expires=Sat, 28-Mar-2020 08:44:20 GMT;
         secure; HttpOnly
       Strict-Transport-Security:
       - max-age=15724800;
       X-Content-Type-Options:
       - nosniff
       X-DD-Debug:
-      - vwiIwb5QepaQFIQrmPfIwwVWkQ/z0inFQwNEDjqDDy4v3CsF5qbv9dnyfb7UGzLf
+      - WyM4veckZw3QTGGZ+Ro8psXMR12RERTyuAWc4KNrn9Mfk0tQy+xf5Ofi04GlB+uh
       X-DD-VERSION:
-      - '35.2134903'
+      - '35.2303403'
       X-Frame-Options:
       - SAMEORIGIN
     status:
diff --git a/tests/integration/api/test_aws_integration.py b/tests/integration/api/test_aws_integration.py
