diff options
author | Sloane Hertel <shertel@redhat.com> | 2020-02-14 09:57:04 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-14 08:57:04 -0600 |
commit | 97f011cf94853fa41e7b1540db1526048c7f71eb (patch) | |
tree | 7c41ee3c0d004c5c9d84bb8b1ca9a9196b22e0a5 /lib/ansible/cli | |
parent | 1b9b551b616a926e68a8cb29b9d166c00508caa1 (diff) | |
download | ansible-97f011cf94853fa41e7b1540db1526048c7f71eb.tar.gz |
Add verify subcommand to 'ansible-galaxy collection' (#65618)
* [WIP] Add verify subcommand command to 'ansible-galaxy collection'
* Fix pep8 and use consistent display order
* WIP - docs
* Remove some redundancy in verify display messages by using an error queue for each collection
* Share common code and improve output format
* clean up documentation
* typo
* Apply suggestions from code review
Co-Authored-By: Sandra McCann <samccann@redhat.com>
* Move ModifiedContent namedtuple to the global scope
Add a public metadata property
Rename function to _get_json_from_tar_file
* Add some unit tests
* fix using common functions after rebase
* changelog
* Improve efficiency finding specific installed collections
Improve efficiency by only downloading the tar.gz from the galaxy server for comparison after checking that the collection has been installed
Handle multiple collection paths
Fix up tests
* pep8
* reword that for accuracy
* use more common code and verify collection name
* Improve error message and add documentation
* Update unit tests and add coverage for both local and remote collections that are unable to be located
* Only validate collections using the format collection_namespace.collection_name
Fix tests to reflect that
Fix documentation
* Fix a bug when a local collection does not contain a file
* pep8
* Fix formatting
Co-authored-by: Sandra McCann <samccann@redhat.com>
Diffstat (limited to 'lib/ansible/cli')
-rw-r--r-- | lib/ansible/cli/galaxy.py | 72 |
1 files changed, 53 insertions, 19 deletions
diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py index 0d8ebac3d0..b1f5290d7f 100644 --- a/lib/ansible/cli/galaxy.py +++ b/lib/ansible/cli/galaxy.py @@ -28,6 +28,7 @@ from ansible.galaxy.collection import ( publish_collection, validate_collection_name, validate_collection_path, + verify_collections ) from ansible.galaxy.login import GalaxyLogin from ansible.galaxy.role import GalaxyRole @@ -117,6 +118,7 @@ class GalaxyCLI(CLI): self.add_build_options(collection_parser, parents=[common, force]) self.add_publish_options(collection_parser, parents=[common]) self.add_install_options(collection_parser, parents=[common, force]) + self.add_verify_options(collection_parser, parents=[common, collections_path]) # Add sub parser for the Galaxy role actions role = type_parser.add_parser('role', help='Manage an Ansible Galaxy role.') @@ -235,6 +237,19 @@ class GalaxyCLI(CLI): info_parser.add_argument('args', nargs='+', help='role', metavar='role_name[,version]') + def add_verify_options(self, parser, parents=None): + galaxy_type = 'collection' + verify_parser = parser.add_parser('verify', parents=parents, help='Compare checksums with the collection(s) ' + 'found on the server and the installed copy. This does not verify dependencies.') + verify_parser.set_defaults(func=self.execute_verify) + + verify_parser.add_argument('args', metavar='{0}_name'.format(galaxy_type), nargs='*', help='The collection(s) name or ' + 'path/url to a tar.gz collection artifact. This is mutually exclusive with --requirements-file.') + verify_parser.add_argument('-i', '--ignore-errors', dest='ignore_errors', action='store_true', default=False, + help='Ignore errors during verification and continue with the next specified collection.') + verify_parser.add_argument('-r', '--requirements-file', dest='requirements', + help='A file containing a list of collections to be verified.') + def add_install_options(self, parser, parents=None): galaxy_type = 'collection' if parser.metavar == 'COLLECTION_ACTION' else 'role' @@ -583,6 +598,27 @@ class GalaxyCLI(CLI): return meta_value + def _require_one_of_collections_requirements(self, collections, requirements_file): + if collections and requirements_file: + raise AnsibleError("The positional collection_name arg and --requirements-file are mutually exclusive.") + elif not collections and not requirements_file: + raise AnsibleError("You must specify a collection name or a requirements file.") + elif requirements_file: + requirements_file = GalaxyCLI._resolve_path(requirements_file) + requirements = self._parse_requirements_file(requirements_file, allow_old_format=False)['collections'] + else: + requirements = [] + for collection_input in collections: + requirement = None + if os.path.isfile(to_bytes(collection_input, errors='surrogate_or_strict')) or \ + urlparse(collection_input).scheme.lower() in ['http', 'https']: + # Arg is a file path or URL to a collection + name = collection_input + else: + name, dummy, requirement = collection_input.partition(':') + requirements.append((name, requirement or '*', None)) + return requirements + ############################ # execute actions ############################ @@ -794,6 +830,22 @@ class GalaxyCLI(CLI): self.pager(data) + def execute_verify(self): + + collections = context.CLIARGS['args'] + search_paths = context.CLIARGS['collections_path'] + ignore_certs = context.CLIARGS['ignore_certs'] + ignore_errors = context.CLIARGS['ignore_errors'] + requirements_file = context.CLIARGS['requirements'] + + requirements = self._require_one_of_collections_requirements(collections, requirements_file) + + resolved_paths = [validate_collection_path(GalaxyCLI._resolve_path(path)) for path in search_paths] + + verify_collections(requirements, resolved_paths, self.api_servers, (not ignore_certs), ignore_errors) + + return 0 + def execute_install(self): """ Install one or more roles(``ansible-galaxy role install``), or one or more collections(``ansible-galaxy collection install``). @@ -811,25 +863,7 @@ class GalaxyCLI(CLI): no_deps = context.CLIARGS['no_deps'] force_deps = context.CLIARGS['force_with_deps'] - if collections and requirements_file: - raise AnsibleError("The positional collection_name arg and --requirements-file are mutually exclusive.") - elif not collections and not requirements_file: - raise AnsibleError("You must specify a collection name or a requirements file.") - - if requirements_file: - requirements_file = GalaxyCLI._resolve_path(requirements_file) - requirements = self._parse_requirements_file(requirements_file, allow_old_format=False)['collections'] - else: - requirements = [] - for collection_input in collections: - requirement = None - if os.path.isfile(to_bytes(collection_input, errors='surrogate_or_strict')) or \ - urlparse(collection_input).scheme.lower() in ['http', 'https']: - # Arg is a file path or URL to a collection - name = collection_input - else: - name, dummy, requirement = collection_input.partition(':') - requirements.append((name, requirement or '*', None)) + requirements = self._require_one_of_collections_requirements(collections, requirements_file) output_path = GalaxyCLI._resolve_path(output_path) collections_path = C.COLLECTIONS_PATHS |