From 7501ad6836467c0aee5f3978f60d30dd618cf102 Mon Sep 17 00:00:00 2001 From: jessicamack Date: Tue, 5 Dec 2023 17:27:20 -0500 Subject: [PATCH] add django-ansible-base Signed-off-by: jessicamack --- awx/settings/defaults.py | 1 + licenses/django-ansible-base.txt | 168 ++++++++++++++++++++++++++++++ requirements/requirements.in | 4 +- requirements/requirements.txt | 50 +++++++-- requirements/requirements_git.txt | 1 + 5 files changed, 214 insertions(+), 10 deletions(-) create mode 100644 licenses/django-ansible-base.txt diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index d12fa8d223..0b5e000b40 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -336,6 +336,7 @@ INSTALLED_APPS = [ 'awx.ui', 'awx.sso', 'solo', + 'ansible_base', ] INTERNAL_IPS = ('127.0.0.1',) diff --git a/licenses/django-ansible-base.txt b/licenses/django-ansible-base.txt new file mode 100644 index 0000000000..cb92985570 --- /dev/null +++ b/licenses/django-ansible-base.txt @@ -0,0 +1,168 @@ +Apache License +============== + +_Version 2.0, January 2004_ +_<>_ + +### Terms and Conditions for use, reproduction, and distribution + +#### 1. Definitions + +“License” shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +“Licensor” shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +“Legal Entity” shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, “control” means **(i)** the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the +outstanding shares, or **(iii)** beneficial ownership of such entity. + +“You” (or “Your”) shall mean an individual or Legal Entity exercising +permissions granted by this License. + +“Source” form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +“Object” form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +“Work” shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +“Derivative Works” shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +“Contribution” shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +“submitted” means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as “Not a Contribution.” + +“Contributor” shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +#### 2. Grant of Copyright License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +#### 3. Grant of Patent License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +#### 4. Redistribution + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +* **(a)** You must give any other recipients of the Work or Derivative Works a copy of +this License; and +* **(b)** You must cause any modified files to carry prominent notices stating that You +changed the files; and +* **(c)** You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. + +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +#### 5. Submission of Contributions + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +#### 6. Trademarks + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +#### 7. Disclaimer of Warranty + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +#### 8. Limitation of Liability + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +#### 9. Accepting Warranty or Additional Liability + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. \ No newline at end of file diff --git a/requirements/requirements.in b/requirements/requirements.in index d32837ad2a..fdb3608308 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -47,8 +47,8 @@ python-tss-sdk>=1.2.1 python-ldap pyyaml>=6.0.1 receptorctl -social-auth-core[openidconnect]==4.3.0 # see UPGRADE BLOCKERs -social-auth-app-django==5.0.0 # see UPGRADE BLOCKERs +social-auth-core[openidconnect]==4.4.2 # see UPGRADE BLOCKERs +social-auth-app-django==5.4.0 # see UPGRADE BLOCKERs sqlparse >= 0.4.4 # Required by django https://github.com/ansible/awx/security/dependabot/96 redis requests diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 24ac4cf1e2..4f24c624db 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -83,6 +83,7 @@ cryptography==41.0.3 # adal # autobahn # azure-keyvault + # django-ansible-base # jwcrypto # pyopenssl # service-identity @@ -105,23 +106,35 @@ django==4.2.6 # via # -r /awx_devel/requirements/requirements.in # channels + # django-ansible-base # django-auth-ldap # django-cors-headers # django-crum # django-extensions + # django-filter # django-guid # django-oauth-toolkit # django-polymorphic # django-solo # djangorestframework + # drf-spectacular + # social-auth-app-django +django-ansible-base @ git+https://github.com/ansible/django-ansible-base.git@devel + # via -r /awx_devel/requirements/requirements_git.txt django-auth-ldap==4.1.0 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # django-ansible-base django-cors-headers==3.13.0 # via -r /awx_devel/requirements/requirements.in django-crum==0.7.9 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # django-ansible-base django-extensions==3.2.1 # via -r /awx_devel/requirements/requirements.in +django-filter==23.5 + # via django-ansible-base django-guid==3.2.1 # via -r /awx_devel/requirements/requirements.in django-oauth-toolkit==1.7.1 @@ -136,11 +149,16 @@ django-solo==2.0.0 django-split-settings==1.0.0 # via -r /awx_devel/requirements/requirements.in djangorestframework==3.14.0 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # django-ansible-base + # drf-spectacular djangorestframework-yaml==2.0.0 # via -r /awx_devel/requirements/requirements.in docutils==0.19 # via python-daemon +drf-spectacular==0.26.5 + # via django-ansible-base ecdsa==0.18.0 # via python-jose enum-compat==0.0.3 @@ -179,6 +197,10 @@ incremental==22.10.0 # via twisted inflect==6.0.2 # via jaraco-text +inflection==0.5.1 + # via + # django-ansible-base + # drf-spectacular irc==20.1.0 # via -r /awx_devel/requirements/requirements.in isodate==0.6.1 @@ -213,7 +235,9 @@ jmespath==1.0.1 json-log-formatter==0.5.1 # via -r /awx_devel/requirements/requirements.in jsonschema==4.17.3 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # drf-spectacular jwcrypto==1.4.2 # via django-oauth-toolkit kubernetes==25.3.0 @@ -328,6 +352,7 @@ python-jose==3.3.0 python-ldap==3.4.3 # via # -r /awx_devel/requirements/requirements.in + # django-ansible-base # django-auth-ldap python-string-utils==1.0.0 # via openshift @@ -335,7 +360,9 @@ python-tss-sdk==1.2.1 # via -r /awx_devel/requirements/requirements.in python3-openid==3.2.0 # via social-auth-core - # via -r /awx_devel/requirements/requirements_git.txt + # via + # -r /awx_devel/requirements/requirements_git.txt + # django-ansible-base pytz==2022.6 # via # djangorestframework @@ -347,6 +374,7 @@ pyyaml==6.0.1 # -r /awx_devel/requirements/requirements.in # ansible-runner # djangorestframework-yaml + # drf-spectacular # kubernetes # receptorctl receptorctl==1.4.2 @@ -406,9 +434,11 @@ slack-sdk==3.19.4 # via -r /awx_devel/requirements/requirements.in smmap==5.0.0 # via gitdb -social-auth-app-django==5.0.0 - # via -r /awx_devel/requirements/requirements.in -social-auth-core[openidconnect]==4.3.0 +social-auth-app-django==5.4.0 + # via + # -r /awx_devel/requirements/requirements.in + # django-ansible-base +social-auth-core[openidconnect]==4.4.2 # via # -r /awx_devel/requirements/requirements.in # social-auth-app-django @@ -416,6 +446,8 @@ sqlparse==0.4.4 # via # -r /awx_devel/requirements/requirements.in # django +tabulate==0.9.0 + # via django-ansible-base tacacs-plus==1.0 # via -r /awx_devel/requirements/requirements.in tempora==5.1.0 @@ -439,6 +471,8 @@ typing-extensions==4.4.0 # setuptools-rust # setuptools-scm # twisted +uritemplate==4.1.1 + # via drf-spectacular urllib3==1.26.13 # via # botocore diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index f04010b84e..d4820f02d0 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -5,3 +5,4 @@ git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner # specifically need https://github.com/robgolding/django-radius/pull/27 git+https://github.com/ansible/django-radius.git@develop#egg=django-radius git+https://github.com/ansible/python3-saml.git@devel#egg=python3-saml +git+https://github.com/ansible/django-ansible-base.git@devel#egg=django-ansible-base \ No newline at end of file