diff options
| author | Alan Rominger <arominge@redhat.com> | 2024-11-04 22:21:36 +0100 |
|---|---|---|
| committer | Alan Rominger <arominge@redhat.com> | 2024-11-20 17:18:52 +0100 |
| commit | 6599f3f827f4a5eef9a0b2bb965b7087e71d404a (patch) | |
| tree | 318336f3bce0be7f6a582d1849c197a8acfc7a67 /awx_collection | |
| parent | Fix server error from system job detail view (#15640) (diff) | |
| download | awx-6599f3f827f4a5eef9a0b2bb965b7087e71d404a.tar.xz awx-6599f3f827f4a5eef9a0b2bb965b7087e71d404a.zip | |
Removal of OAuth2 stuff from CLI
also from awxkit generally
Remove login command
Diffstat (limited to 'awx_collection')
| -rw-r--r-- | awx_collection/plugins/module_utils/awxkit.py | 3 | ||||
| -rw-r--r-- | awx_collection/plugins/modules/export.py | 5 | ||||
| -rw-r--r-- | awx_collection/test/awx/test_export.py | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/awx_collection/plugins/module_utils/awxkit.py b/awx_collection/plugins/module_utils/awxkit.py index 770b0c7aee..02549b73e3 100644 --- a/awx_collection/plugins/module_utils/awxkit.py +++ b/awx_collection/plugins/module_utils/awxkit.py @@ -34,7 +34,8 @@ class ControllerAWXKitModule(ControllerModule): def authenticate(self): try: if self.oauth_token: - self.connection.login(None, None, token=self.oauth_token) + # MERGE: fix conflicts with removal of OAuth2 token from collection branch + self.connection.login(None, None) self.authenticated = True elif self.username: self.connection.login(username=self.username, password=self.password) diff --git a/awx_collection/plugins/modules/export.py b/awx_collection/plugins/modules/export.py index 1080b4889b..537a8e2fe9 100644 --- a/awx_collection/plugins/modules/export.py +++ b/awx_collection/plugins/modules/export.py @@ -86,11 +86,6 @@ options: - workflow names, IDs, or named URLs to export type: list elements: str - applications: - description: - - OAuth2 application names, IDs, or named URLs to export - type: list - elements: str schedules: description: - schedule names, IDs, or named URLs to export diff --git a/awx_collection/test/awx/test_export.py b/awx_collection/test/awx/test_export.py index 70c8466ec0..7438c6ba1c 100644 --- a/awx_collection/test/awx/test_export.py +++ b/awx_collection/test/awx/test_export.py @@ -23,7 +23,6 @@ ASSETS = set([ "job_templates", "workflow_job_templates", "execution_environments", - "applications", "schedules", ]) |