From 909cdc2425d144465eac4d1ea950d9920802f848 Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Wed, 19 May 2021 14:58:12 -0400 Subject: [PATCH] Remove explicit eula acceptance --- awx/api/views/root.py | 12 +----------- awx_collection/plugins/modules/tower_license.py | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/awx/api/views/root.py b/awx/api/views/root.py index e27715af92..ac5592207f 100644 --- a/awx/api/views/root.py +++ b/awx/api/views/root.py @@ -24,7 +24,7 @@ from awx.api.generics import APIView from awx.conf.registry import settings_registry from awx.main.analytics import all_collectors from awx.main.ha import is_ha_environment -from awx.main.utils import get_awx_version, get_custom_venv_choices, to_python_boolean +from awx.main.utils import get_awx_version, get_custom_venv_choices from awx.main.utils.licensing import validate_entitlement_manifest from awx.api.versioning import reverse, drf_reverse from awx.main.constants import PRIVILEGE_ESCALATION_METHODS @@ -313,16 +313,6 @@ class ApiV2ConfigView(APIView): def post(self, request): if not isinstance(request.data, dict): return Response({"error": _("Invalid subscription data")}, status=status.HTTP_400_BAD_REQUEST) - if "eula_accepted" not in request.data: - return Response({"error": _("Missing 'eula_accepted' property")}, status=status.HTTP_400_BAD_REQUEST) - try: - eula_accepted = to_python_boolean(request.data["eula_accepted"]) - except ValueError: - return Response({"error": _("'eula_accepted' value is invalid")}, status=status.HTTP_400_BAD_REQUEST) - - if not eula_accepted: - return Response({"error": _("'eula_accepted' must be True")}, status=status.HTTP_400_BAD_REQUEST) - request.data.pop("eula_accepted") try: data_actual = json.dumps(request.data) except Exception: diff --git a/awx_collection/plugins/modules/tower_license.py b/awx_collection/plugins/modules/tower_license.py index 37ce8531ff..90439b0a08 100644 --- a/awx_collection/plugins/modules/tower_license.py +++ b/awx_collection/plugins/modules/tower_license.py @@ -25,11 +25,6 @@ options: - file path to a Red Hat subscription manifest (a .zip file) required: True type: str - eula_accepted: - description: - - Whether or not the EULA is accepted. - required: True - type: bool force: description: - By default, the license manifest will only be applied if Tower is currently @@ -46,7 +41,6 @@ EXAMPLES = ''' - name: Set the license using a file tower_license: manifest: "/tmp/my_manifest.zip" - eula_accepted: True ''' import base64 @@ -58,16 +52,12 @@ def main(): module = TowerAPIModule( argument_spec=dict( manifest=dict(type='str', required=True), - eula_accepted=dict(type='bool', required=True), force=dict(type='bool', required=False), ), ) json_output = {'changed': False} - if not module.params.get('eula_accepted'): - module.fail_json(msg='You must accept the EULA by passing in the param eula_accepted as True') - try: manifest = base64.b64encode(open(module.params.get('manifest'), 'rb').read()) except OSError as e: @@ -94,7 +84,7 @@ def main(): # Do the actual install, if we need to if perform_install: json_output['changed'] = True - module.post_endpoint('config', data={'eula_accepted': True, 'manifest': manifest.decode()}) + module.post_endpoint('config', data={'manifest': manifest.decode()}) module.exit_json(**json_output)