Merge pull request #3413 from ryanpetrello/bye-bye-v1

remove /api/v1 and deprecated credential fields

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/main/tests/unit/api/serializers/test_job_template_serializers.py

@@ -103,8 +103,7 @@ class TestJobTemplateSerializerGetSummaryFields():
         with mocker.patch("awx.api.serializers.role_summary_fields_generator", return_value='Can eat pie'):
             with mocker.patch("awx.main.access.JobTemplateAccess.can_change", return_value='foobar'):
                 with mocker.patch("awx.main.access.JobTemplateAccess.can_copy", return_value='foo'):
-                    with mock.patch.object(jt_obj.__class__, 'get_deprecated_credential', return_value=None):
-                        response = serializer.get_summary_fields(jt_obj)
+                    response = serializer.get_summary_fields(jt_obj)
 
         assert response['user_capabilities']['copy'] == 'foo'
         assert response['user_capabilities']['edit'] == 'foobar'

awx/main/tests/unit/test_tasks.py

@@ -688,13 +688,19 @@ class TestJobCredentials(TestJobExecution):
         job.websocket_emit_status = mock.Mock()
         job._credentials = []
 
+        def _credentials_filter(credential_type__kind=None):
+            creds = job._credentials
+            if credential_type__kind:
+                creds = [c for c in creds if c.credential_type.kind == credential_type__kind]
+            return mock.Mock(
+                __iter__ = lambda *args: iter(creds),
+                first = lambda: creds[0] if len(creds) else None
+            )
+
         credentials_mock = mock.Mock(**{
             'all': lambda: job._credentials,
             'add': job._credentials.append,
-            'filter.return_value': mock.Mock(
-                __iter__ = lambda *args: iter(job._credentials),
-                first = lambda: job._credentials[0]
-            ),
+            'filter.side_effect': _credentials_filter,
             'prefetch_related': lambda _: credentials_mock,
             'spec_set': ['all', 'add', 'filter', 'prefetch_related'],
         })

awx/main/tests/unit/test_views.py

@@ -7,7 +7,7 @@ from rest_framework.generics import ListAPIView
 
 # AWX
 from awx.main.views import ApiErrorView
-from awx.api.views import JobList, InventorySourceList
+from awx.api.views import JobList
 from awx.api.generics import ListCreateAPIView, SubListAttachDetachAPIView
 
 
@@ -40,20 +40,10 @@ def test_exception_view_raises_exception(api_view_obj_fixture, method_name):
         getattr(api_view_obj_fixture, method_name)(request_mock)
 
 
-@pytest.mark.parametrize('version, supports_post', [(1, True), (2, False)])
-def test_disable_post_on_v2_jobs_list(version, supports_post):
+def test_disable_post_on_v2_jobs_list():
     job_list = JobList()
     job_list.request = mock.MagicMock()
-    with mock.patch('awx.api.views.get_request_version', return_value=version):
-        assert ('POST' in job_list.allowed_methods) == supports_post
-
-
-@pytest.mark.parametrize('version, supports_post', [(1, False), (2, True)])
-def test_disable_post_on_v1_inventory_source_list(version, supports_post):
-    inv_source_list = InventorySourceList()
-    inv_source_list.request = mock.MagicMock()
-    with mock.patch('awx.api.views.get_request_version', return_value=version):
-        assert ('POST' in inv_source_list.allowed_methods) == supports_post
+    assert ('POST' in job_list.allowed_methods) is False
 
 
 def test_views_have_search_fields(all_views):