Enable a containerized version of the ADD API endpoint

[CLOUDDST-28643]

Author: lipoja

iib/web/api_v1.py

@@ -44,8 +44,8 @@
 from iib.web.s3_utils import get_object_from_s3_bucket
 from botocore.response import StreamingBody
 from iib.web.utils import pagination_metadata, str_to_bool
-from iib.workers.tasks.build import (
-    handle_add_request,
+from iib.workers.tasks.build_containerized_add import (
+    handle_containerized_add_request,
 )
 from iib.workers.tasks.build_containerized_rm import handle_containerized_rm_request
 from iib.workers.tasks.build_add_deprecations import handle_add_deprecations_request
@@ -619,7 +619,7 @@ def add_bundles() -> Tuple[flask.Response, int]:
         args.append(current_user.username)
 
     try:
-        handle_add_request.apply_async(
+        handle_containerized_add_request.apply_async(
             args=args,
             link_error=error_callback,
             argsrepr=repr(safe_args),
@@ -1066,7 +1066,7 @@ def add_rm_batch() -> Tuple[flask.Response, int]:
         error_callback = failed_request_callback.s(request.id)
         try:
             if isinstance(request, RequestAdd):
-                handle_add_request.apply_async(
+                handle_containerized_add_request.apply_async(
                     args=args,
                     link_error=error_callback,
                     argsrepr=repr(safe_args),

iib/workers/config.py

@@ -94,6 +94,7 @@ class Config(object):
         'iib.workers.tasks.build_create_empty_index',
         'iib.workers.tasks.build_fbc_operations',
         'iib.workers.tasks.build_add_deprecations',
+        'iib.workers.tasks.build_containerized_add',
         'iib.workers.tasks.build_containerized_fbc_operations',
         'iib.workers.tasks.build_containerized_rm',
         'iib.workers.tasks.general',

tests/test_web/test_api_v1.py

@@ -587,7 +587,7 @@ def test_add_bundles_graph_update_mode_not_allowed(
 
 @pytest.mark.parametrize('from_index', ('some-common-index:v4.15', 'another-common-index:v4.15'))
 @mock.patch('iib.web.api_v1.messaging.send_message_for_state_change')
-@mock.patch('iib.web.api_v1.handle_add_request')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request')
 def test_add_bundles_graph_update_mode_allowed(
     mock_har, mock_smfsc, app, client, auth_env, db, from_index
 ):
@@ -611,7 +611,7 @@ def test_add_bundles_graph_update_mode_allowed(
 @mock.patch('iib.web.api_v1.db.session')
 @mock.patch('iib.web.api_v1.flask.jsonify')
 @mock.patch('iib.web.api_v1.RequestAdd')
-@mock.patch('iib.web.api_v1.handle_add_request.apply_async')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request.apply_async')
 @mock.patch('iib.web.api_v1.messaging.send_message_for_state_change')
 def test_add_bundles_unique_bundles(mock_smfsc, mock_har, mock_radd, mock_fj, mock_dbs, client):
     data = {
@@ -830,7 +830,7 @@ def test_add_bundle_from_index_and_add_arches_missing(mock_smfsc, db, auth_env,
         ('scratch', True, 'username:password', [], 'some:thing', 'DeV', 'semver'),
     ),
 )
-@mock.patch('iib.web.api_v1.handle_add_request')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request')
 @mock.patch('iib.web.api_v1.messaging.send_message_for_state_change')
 def test_add_bundle_success(
     mock_smfsc,
@@ -926,7 +926,7 @@ def test_add_bundle_success(
 
 
 @pytest.mark.parametrize('force_backport', (False, True))
-@mock.patch('iib.web.api_v1.handle_add_request')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request')
 def test_add_bundle_force_backport(mock_har, force_backport, db, auth_env, client):
     data = {
         'bundles': ['some:thing'],
@@ -942,7 +942,7 @@ def test_add_bundle_force_backport(mock_har, force_backport, db, auth_env, clien
     assert mock_har.apply_async.call_args[1]['args'][7] == force_backport
 
 
-@mock.patch('iib.web.api_v1.handle_add_request')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request')
 @mock.patch('iib.web.api_v1.messaging.send_message_for_state_change')
 def test_add_bundle_overwrite_token_redacted(mock_smfsc, mock_har, app, auth_env, client, db):
     token = 'username:password'
@@ -1002,7 +1002,7 @@ def test_add_bundle_overwrite_token_redacted(mock_smfsc, mock_har, app, auth_env
         ({'[email protected]': 'Patriots'}, True, None),
     ),
 )
-@mock.patch('iib.web.api_v1.handle_add_request')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request')
 @mock.patch('iib.web.api_v1.messaging.send_message_for_state_change')
 def test_add_bundle_custom_user_queue(
     mock_smfsc, mock_har, app, auth_env, client, user_to_queue, overwrite_from_index, expected_queue
@@ -1807,7 +1807,7 @@ def test_regenerate_bundle_batch_invalid_input(payload, error_msg, app, auth_env
     assert rv.json == {'error': error_msg}
 
 
-@mock.patch('iib.web.api_v1.handle_add_request')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request')
 @mock.patch('iib.web.api_v1.handle_containerized_rm_request')
 @mock.patch('iib.web.api_v1.messaging.send_messages_for_new_batch_of_requests')
 @mock.patch.dict('iib.web.api_v1.flask.current_app.config', {'IIB_INDEX_TO_GITLAB_PUSH_MAP': {}})

tests/test_web/test_broker_error.py

@@ -15,7 +15,7 @@ def assert_testing(rv, mock_smfsc, db):
     assert req_state.state.state == RequestStateMapping.failed.value
 
 
-@mock.patch('iib.web.api_v1.handle_add_request')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request')
 @mock.patch('iib.web.api_v1.messaging.send_message_for_state_change')
 def test_catch_add_bundle_failure(mock_smfsc, mock_har, db, auth_env, client):
     mock_har.apply_async.side_effect = OperationalError
@@ -108,7 +108,7 @@ def test_catch_regenerate_bundle_batch_failure(
         assert r.state == RequestStateMapping.failed.value
 
 
-@mock.patch('iib.web.api_v1.handle_add_request')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request')
 @mock.patch('iib.web.api_v1.handle_containerized_rm_request')
 @mock.patch('iib.web.api_v1.messaging.send_messages_for_new_batch_of_requests')
 def test_add_rm_batch_add_failure(mock_smfnbor, mock_hrr, mock_har, app, auth_env, client, db):
@@ -158,7 +158,7 @@ def test_add_rm_batch_add_failure(mock_smfnbor, mock_hrr, mock_har, app, auth_en
     assert req_rm.state.state == RequestStateMapping.failed.value
 
 
-@mock.patch('iib.web.api_v1.handle_add_request')
+@mock.patch('iib.web.api_v1.handle_containerized_add_request')
 @mock.patch('iib.web.api_v1.handle_containerized_rm_request')
 @mock.patch('iib.web.api_v1.messaging.send_messages_for_new_batch_of_requests')
 def test_add_rm_batch_rm_failure(mock_smfnbor, mock_hrr, mock_har, app, auth_env, client, db):