From 0d1f8a06ced47f226fdc5a3b0cb0de4f8fcdd5b2 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Fri, 29 Oct 2021 09:27:42 -0400 Subject: [PATCH] Revert default EE authfile support for inventory_import --- .../management/commands/inventory_import.py | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index 94bcabb2a1..a3c6acdab3 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -2,15 +2,12 @@ # All Rights Reserved. # Python -from base64 import b64encode import json import logging import os import re -import stat import subprocess import sys -import tempfile import time import traceback from collections import OrderedDict @@ -81,21 +78,6 @@ class AnsibleInventoryLoader(object): bargs.extend(['-e', '{0}={1}'.format(key, value)]) ee = get_default_execution_environment() - if ee.credential: - if not ee.credential.has_inputs(field_names=('host', 'username', 'password')): - raise RuntimeError(f"Registry credential for execution environment `{ee}` is missing either the host, username, or password.") - - host = ee.credential.get_input('host') - username = ee.credential.get_input('username') - password = ee.credential.get_input('password') - token = f"{username}:{password}" - auth_data = {'auths': {host: {'auth': b64encode(token.encode('utf-8')).decode('utf-8')}}} - self.authfile.write(json.dumps(auth_data, indent=4).encode('utf-8')) - bargs.append(f'--authfile={self.authfile.name}') - - if ee.pull: - bargs.append(f'--pull={ee.pull}') - bargs.extend([ee.image]) bargs.extend(['ansible-inventory', '-i', self.source]) @@ -131,12 +113,9 @@ class AnsibleInventoryLoader(object): return data def load(self): - with tempfile.NamedTemporaryFile() as f: - self.authfile = f - os.chmod(self.authfile.name, stat.S_IRUSR | stat.S_IWUSR) - base_args = self.get_base_args() - logger.info('Reading Ansible inventory source: %s', self.source) - return self.command_to_json(base_args) + base_args = self.get_base_args() + logger.info('Reading Ansible inventory source: %s', self.source) + return self.command_to_json(base_args) class Command(BaseCommand):