Fix keys in headers for some endpoints (#468)

* Remove keys in headers for some endpoints

* Add tests

Author: David Bouchare

datadog/api/api_client.py

@@ -105,11 +105,14 @@ def submit(cls, method, path, api_version=None, body=None, attach_host_name=Fals
             if not api_version:
                 api_version = _api_version
 
-            # set api and app keys in params only for some endpoints
+            # set api and app keys in params only for some endpoints and thus remove keys from headers
+            # as they cannot be set in both params and headers
             if cls._set_api_and_app_keys_in_params(api_version, path):
                 params['api_key'] = _api_key
+                del headers['DD-API-KEY']
                 if _application_key:
                     params['application_key'] = _application_key
+                    del headers['DD-APPLICATION-KEY']
 
             # Attach host name to body
             if attach_host_name and body:

tests/unit/api/test_api.py

@@ -148,7 +148,8 @@ def test_request_parameters(self):
         self.assertEqual(options['headers']['Content-Type'], 'application/json')
         self.assertEqual(options['headers']['DD-API-KEY'], API_KEY)
         self.assertEqual(options['headers']['DD-APPLICATION-KEY'], APP_KEY)
-
+        assert "api_key" not in options['params']
+        assert "application_key" not in options['params']
 
     def test_request_parameters_api_keys_in_params(self):
         """
@@ -172,8 +173,8 @@ def test_request_parameters_api_keys_in_params(self):
         self.assertEqual(options['headers']['Content-Type'], 'application/json')
         self.assertEqual(options['params']['api_key'], API_KEY)
         self.assertEqual(options['params']['application_key'], APP_KEY)
-
-
+        assert "DD-API-KEY" not in options['headers']
+        assert "DD-APPLICATION-KEY" not in options['headers']
 
     def test_initialize_options(self):
         """