[ENG-8045] Reference PR for reviewing merge conflicts

[cslzchen]

Purpose

Reference PR for merge develop into VRL feature branch

[cslzchen]

Ah, the conflicts comes from #11032

# api/share/utils.py
<<<<<<< develop
=======
def sharev2_push_url():
    return f'{settings.SHARE_URL}api/v2/normalizeddata/'

>>>>>>> feature/verified-resource-linking

Note: this can be removed

# api_tests/share/_utils.py
<<<<<<< develop
=======
                    # for legacy sharev2 support:
                    _rsps.add(responses.POST, sharev2_push_url(), status=200)
                    _rsps.add(responses.GET, re.compile(gv_url()), status=200, body='{}')
>>>>>>> feature/verified-resource-linking
                    yield _rsps
...
<<<<<<< develop
=======
    _legacy_push_calls = []
    _gv_links_calls = []
>>>>>>> feature/verified-resource-linking
...

Note: remove lines with `sharev2_push_url` and `_legacy_push_calls`

<<<<<<< develop
    assert len(_trove_ingest_calls) == count
    assert len(_trove_supp_ingest_calls) == count * _trove_supplementary_count_per_item
=======
        elif _call.request.url.startswith(settings.GRAVYVALET_URL):
            _gv_links_calls.append(_call)
        else:
            _legacy_push_calls.append(_call)
    assert len(_trove_ingest_calls) == count
    assert len(_trove_supp_ingest_calls) == count * _trove_supplementary_count_per_item
    assert len(_legacy_push_calls) == count
    assert len(_gv_links_calls) == (count if expect_gv_call else 0)
>>>>>>> feature/verified-resource-linking

Note: remove lines with `_legacy_push_calls`

# api_tests/share/test_share_node.py
<<<<<<< develop
        with expect_ingest_request(mock_share_responses, node._id, count=2):
=======
        mock_share_responses.replace(responses.POST, sharev2_push_url(), status=500)
        mock_share_responses.add(responses.POST, sharev2_push_url(), status=200)
        with expect_ingest_request(mock_share_responses, node, count=2):
>>>>>>> feature/verified-resource-linking
...
<<<<<<< develop
        with expect_ingest_request(mock_share_responses, node._id, count=5):  # tries five times
=======
        mock_share_responses.replace(responses.POST, sharev2_push_url(), status=500)
        with expect_ingest_request(mock_share_responses, node, count=5):  # tries five times
>>>>>>> feature/verified-resource-linking
...
<<<<<<< develop
        with expect_ingest_request(mock_share_responses, node._id):
=======
        mock_share_responses.replace(responses.POST, sharev2_push_url(), status=400)
        with expect_ingest_request(mock_share_responses, node):
>>>>>>> feature/verified-resource-linking

Note: remove lines with sharev2_push_url; for expect_ingest_request calls keep the ones with node and remove those with node._id