cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Separate the galaxy lib from the cli (#69473)

Browse source 
The galaxy lib knew about the cli args in context.  This shouldn't be
the case as it makes it hard to use the lib in other contexts.  Moved
the context knowledge into cli/galaxy.py.
This commit is contained in:
Toshio Kuratomi 2020-05-13 10:13:30 -07:00 committed by GitHub
parent 0aa76503dc
commit 3b3c811be5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/cli/galaxy.py
View file

@ -424,6 +424,8 @@ class GalaxyCLI(CLI):
server_def = [('url', True), ('username', False), ('password', False), ('token', False), server_def = [('url', True), ('username', False), ('password', False), ('token', False),
('auth_url', False)] ('auth_url', False)]
validate_certs = not context.CLIARGS['ignore_certs']
config_servers = [] config_servers = []
# Need to filter out empty strings or non truthy values as an empty server list env var is equal to ['']. # Need to filter out empty strings or non truthy values as an empty server list env var is equal to [''].
@ -453,11 +455,13 @@ class GalaxyCLI(CLI):
if auth_url: if auth_url:
server_options['token'] = KeycloakToken(access_token=token_val, server_options['token'] = KeycloakToken(access_token=token_val,
auth_url=auth_url, auth_url=auth_url,
validate_certs=not context.CLIARGS['ignore_certs']) validate_certs=validate_certs)
else: else:
# The galaxy v1 / github / django / 'Token' # The galaxy v1 / github / django / 'Token'
server_options['token'] = GalaxyToken(token=token_val) server_options['token'] = GalaxyToken(token=token_val)
server_options['validate_certs'] = validate_certs
config_servers.append(GalaxyAPI(self.galaxy, server_key, **server_options)) config_servers.append(GalaxyAPI(self.galaxy, server_key, **server_options))
cmd_server = context.CLIARGS['api_server'] cmd_server = context.CLIARGS['api_server']
@ -469,13 +473,15 @@ class GalaxyCLI(CLI):
if config_server: if config_server:
self.api_servers.append(config_server) self.api_servers.append(config_server)
else: else:
self.api_servers.append(GalaxyAPI(self.galaxy, 'cmd_arg', cmd_server, token=cmd_token)) self.api_servers.append(GalaxyAPI(self.galaxy, 'cmd_arg', cmd_server, token=cmd_token,
validate_certs=validate_certs))
else: else:
self.api_servers = config_servers self.api_servers = config_servers
# Default to C.GALAXY_SERVER if no servers were defined # Default to C.GALAXY_SERVER if no servers were defined
if len(self.api_servers) == 0: if len(self.api_servers) == 0:
self.api_servers.append(GalaxyAPI(self.galaxy, 'default', C.GALAXY_SERVER, token=cmd_token)) self.api_servers.append(GalaxyAPI(self.galaxy, 'default', C.GALAXY_SERVER, token=cmd_token,
validate_certs=validate_certs))
context.CLIARGS['func']() context.CLIARGS['func']()
@ -583,7 +589,10 @@ class GalaxyCLI(CLI):
# Try and match up the requirement source with our list of Galaxy API servers defined in the # Try and match up the requirement source with our list of Galaxy API servers defined in the
# config, otherwise create a server with that URL without any auth. # config, otherwise create a server with that URL without any auth.
req_source = next(iter([a for a in self.api_servers if req_source in [a.name, a.api_server]]), req_source = next(iter([a for a in self.api_servers if req_source in [a.name, a.api_server]]),
GalaxyAPI(self.galaxy, "explicit_requirement_%s" % req_name, req_source)) GalaxyAPI(self.galaxy,
"explicit_requirement_%s" % req_name,
req_source,
validate_certs=not context.CLIARGS['ignore_certs']))
requirements['collections'].append((req_name, req_version, req_source)) requirements['collections'].append((req_name, req_version, req_source))
else: else:

7
lib/ansible/galaxy/api.py
View file

@ -12,7 +12,6 @@ import tarfile
import uuid import uuid
import time import time
from ansible import context
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.galaxy.user_agent import user_agent from ansible.galaxy.user_agent import user_agent
from ansible.module_utils.six import string_types from ansible.module_utils.six import string_types
@ -169,14 +168,14 @@ class CollectionVersionMetadata:
class GalaxyAPI: class GalaxyAPI:
""" This class is meant to be used as a API client for an Ansible Galaxy server """ """ This class is meant to be used as a API client for an Ansible Galaxy server """
def __init__(self, galaxy, name, url, username=None, password=None, token=None): def __init__(self, galaxy, name, url, username=None, password=None, token=None, validate_certs=True):
self.galaxy = galaxy self.galaxy = galaxy
self.name = name self.name = name
self.username = username self.username = username
self.password = password self.password = password
self.token = token self.token = token
self.api_server = url self.api_server = url
self.validate_certs = not context.CLIARGS['ignore_certs'] self.validate_certs = validate_certs
self._available_api_versions = {} self._available_api_versions = {}
display.debug('Validate TLS certificates for %s: %s' % (self.api_server, self.validate_certs)) display.debug('Validate TLS certificates for %s: %s' % (self.api_server, self.validate_certs))
@ -526,7 +525,7 @@ class GalaxyAPI:
:param namespace: The collection namespace. :param namespace: The collection namespace.
:param name: The collection name. :param name: The collection name.
:param version: Optional version of the collection to get the information for. :param version: Version of the collection to get the information for.
:return: CollectionVersionMetadata about the collection at the version requested. :return: CollectionVersionMetadata about the collection at the version requested.
""" """
api_path = self.available_api_versions.get('v3', self.available_api_versions.get('v2')) api_path = self.available_api_versions.get('v3', self.available_api_versions.get('v2'))