send enforcement action for override decisions

Author: eviljeff

src/olympia/abuse/cinder.py

@@ -169,27 +169,17 @@ def appeal(self, *, decision_cinder_id, appeal_text, appealer):
         else:
             raise HTTPError(response.content)
 
-    def _send_create_decision(
-        self, url, data, action, reasoning, policy_uuids, *, success_code=201
-    ):
+    def _send_create_decision(self, url, data, action, reasoning, policy_uuids):
         data = {
             **data,
             'reasoning': self.get_str(reasoning),
             'policy_uuids': policy_uuids,
-            **(
-                {
-                    'enforcement_actions_slugs': [action],
-                    'enforcement_actions_update_strategy': 'set',
-                }
-                if action is not None
-                else {}
-            ),
+            'enforcement_actions_slugs': [action],
+            'enforcement_actions_update_strategy': 'set',
         }
         response = requests.post(url, json=data, headers=self.get_cinder_http_headers())
-        if response.status_code == success_code:
-            return response.json().get('uuid')
-        else:
-            raise HTTPError(response.content)
+        response.raise_for_status()
+        return response.json().get('uuid')
 
     def create_decision(self, *, action, reasoning, policy_uuids):
         if self.type is None:
@@ -208,12 +198,7 @@ def create_job_decision(self, *, action, reasoning, policy_uuids, job_id):
 
     def create_override_decision(self, *, action, reasoning, policy_uuids, decision_id):
         url = f'{settings.CINDER_SERVER_URL}decisions/{decision_id}/override/'
-        # TODO: send action too once
-        # https://lindie.app/share/6a21d831b39351d7c6fe898f6d22619af62dde98/PLAT-1834
-        # implements the same parameters for overrides
-        return self._send_create_decision(
-            url, {}, None, reasoning, policy_uuids, success_code=200
-        )
+        return self._send_create_decision(url, {}, action, reasoning, policy_uuids)
 
     def close_job(self, *, job_id):
         url = f'{settings.CINDER_SERVER_URL}jobs/{job_id}/cancel'

src/olympia/abuse/tests/test_cinder.py

@@ -1428,8 +1428,8 @@ def test_create_override_decision(self):
         )
         request = responses.calls[0].request
         request_body = json.loads(request.body)
-        assert b'enforcement_actions_slugs' not in request.body
-        assert b'enforcement_actions_update_strategy' not in request.body
+        assert request_body['enforcement_actions_slugs'] == ['amo-reject-version-addon']
+        assert request_body['enforcement_actions_update_strategy'] == 'set'
         assert request_body['policy_uuids'] == ['12345678']
         assert request_body['reasoning'] == 'some review text'
         assert 'entity' not in request_body