diff options
| author | Pablo H. <palonso@redhat.com> | 2024-11-26 18:59:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-26 18:59:37 +0100 |
| commit | 268ca7c78a2f654bd9b6db538bd2454763a1d878 (patch) | |
| tree | f471b6f08cac4a2c4d84cde2a39532568ca983df /awx_collection | |
| parent | Address unclosed fd warnings (diff) | |
| download | awx-268ca7c78a2f654bd9b6db538bd2454763a1d878.tar.xz awx-268ca7c78a2f654bd9b6db538bd2454763a1d878.zip | |
Remove oauth provider (#15666)
* Remove oauth provider
This removes the oauth provider functionality from awx. The
oauth2_provider app and all references to it have been removed.
Migrations to delete the two tables that locally overwrote
oauth2_provider tables are included. This change does not include
migrations to delete the tables provided by the oauth2_provider app.
Also not included here are changes to awxkit, awx_collection or the ui.
* Fix linters
* Update migrations after rebase
* Update collection tests for auth changes
The changes in https://github.com/ansible/awx/pull/15554 will cause a
few collection tests to fail, depending on what the test configuration
is. This changes the tests to look for a specific warning rather than
counting the number of warnings emitted.
* Update migration
* Removed unused oauth_scopes references
---------
Co-authored-by: Mike Graves <mgraves@redhat.com>
Co-authored-by: Alan Rominger <arominge@redhat.com>
Diffstat (limited to 'awx_collection')
| -rw-r--r-- | awx_collection/test/awx/test_job_template.py | 2 | ||||
| -rw-r--r-- | awx_collection/test/awx/test_project.py | 2 | ||||
| -rw-r--r-- | awx_collection/test/awx/test_user.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/awx_collection/test/awx/test_job_template.py b/awx_collection/test/awx/test_job_template.py index 5ee114359b..16ac36f82f 100644 --- a/awx_collection/test/awx/test_job_template.py +++ b/awx_collection/test/awx/test_job_template.py @@ -240,7 +240,7 @@ def test_job_template_with_survey_encrypted_default(run_module, admin_user, proj assert result.get('changed', False), result # not actually desired, but assert for sanity - silence_warning.assert_called_once_with( + silence_warning.assert_any_call( "The field survey_spec of job_template {0} has encrypted data and " "may inaccurately report task is changed.".format(result['id']) ) diff --git a/awx_collection/test/awx/test_project.py b/awx_collection/test/awx/test_project.py index 04ec05bbf7..27b7b96e05 100644 --- a/awx_collection/test/awx/test_project.py +++ b/awx_collection/test/awx/test_project.py @@ -14,7 +14,7 @@ def test_create_project(run_module, admin_user, organization, silence_warning): dict(name='foo', organization=organization.name, scm_type='git', scm_url='https://foo.invalid', wait=False, scm_update_cache_timeout=5), admin_user, ) - silence_warning.assert_called_once_with('scm_update_cache_timeout will be ignored since scm_update_on_launch was not set to true') + silence_warning.assert_any_call('scm_update_cache_timeout will be ignored since scm_update_on_launch was not set to true') assert result.pop('changed', None), result diff --git a/awx_collection/test/awx/test_user.py b/awx_collection/test/awx/test_user.py index 1513b05a91..a183c7a555 100644 --- a/awx_collection/test/awx/test_user.py +++ b/awx_collection/test/awx/test_user.py @@ -36,7 +36,7 @@ def test_password_no_op_warning(run_module, admin_user, mock_auth_stuff, silence assert result.get('changed') # not actually desired, but assert for sanity - silence_warning.assert_called_once_with( + silence_warning.assert_any_call( "The field password of user {0} has encrypted data and " "may inaccurately report task is changed.".format(result['id']) ) |