Skip to content

WIP: Use a sequence instead of raw string #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fridex wants to merge 1 commit into from
Closed

WIP: Use a sequence instead of raw string #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions thoth/package_extract/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import os
import tempfile
import typing
from shlex import quote

from .handlers import HandlerBase
from .image import construct_rootfs
Expand All @@ -28,7 +27,6 @@ def extract_buildlog(input_text: str) -> typing.List[dict]:

def extract_image(image_name: str, timeout: int = None, registry_credentials: str = None) -> dict:
"""Extract dependencies from an image."""
image_name = quote(image_name)
with tempfile.TemporaryDirectory() as dir_path:
download_image(image_name, dir_path, timeout=timeout or None, registry_credentials=registry_credentials or None)

Expand Down
19 changes: 7 additions & 12 deletions thoth/package_extract/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import os
import tarfile
import typing
from shlex import quote

from thoth.analyzer import run_command
from thoth.common import cwd
Expand Down Expand Up @@ -63,7 +62,7 @@ def _parse_repoquery(output: str) -> dict:

def _run_rpm_repoquery(path: str, timeout: int = None) -> list:
"""Run repoquery and return it's output (parsed)."""
cmd = 'repoquery --deplist --installed --installroot {!r}'.format(path)
cmd = ['repoquery', '--deplist', '--installed', '--installroot', path]
output = _parse_repoquery(run_command(cmd, timeout=timeout).stdout)

result = []
Expand All @@ -86,18 +85,14 @@ def _run_rpm_repoquery(path: str, timeout: int = None) -> list:

def _run_mercator(path: str, timeout: int = None) -> dict:
"""Run mercator-go to find all packages that were installed inside an image."""
cmd = '{mercator_bin} -config {mercator_handlers_yaml} {path}'.format(
mercator_bin=_MERCATOR_BIN,
mercator_handlers_yaml=_MERCATOR_HANDLERS_YAML,
path=path
)
cmd = [_MERCATOR_BIN, '-config', _MERCATOR_HANDLERS_YAML, path]
output = run_command(cmd, env={'MERCATOR_INTERPRET_SETUP_PY': 'true'}, timeout=timeout, is_json=True).stdout
return _normalize_mercator_output(path, output)


def _run_rpm(path: str, timeout: int = None) -> typing.List[str]:
"""Query for installed rpm packages in the given root described by path."""
cmd = 'rpm -qa --root {!r}'.format(path)
cmd = ['rpm', '-qa', '--root', path]
output = run_command(cmd, timeout=timeout).stdout
packages = output.split('\n')
if not packages[-1]:
Expand Down Expand Up @@ -145,18 +140,18 @@ def download_image(image_name: str, dir_path: str, timeout: int = None, registry
_LOGGER.debug("Downloading image %r", image_name)
# TODO: make TLS verify configurable

cmd = 'skopeo copy --src-tls-verify=false '
cmd = ['skopeo', 'copy', '--src-tls-verify=false']
if registry_credentials:
cmd += '--src-creds={} '.format(quote(registry_credentials))
cmd.append('--src-creds=' + registry_credentials)

cmd += 'docker://{} dir:/{}'.format(quote(image_name), quote(dir_path))
cmd.append('docker://' + image_name)
cmd.append('dir:/{}' + dir_path)
stdout = run_command(cmd, timeout=timeout).stdout
_LOGGER.debug("skopeo stdout: %s", stdout)


def run_analyzers(path: str, timeout: int = None) -> dict:
"""Run analyzers on the given path (directory) and extract found packages."""
path = quote(path)
return {
'mercator': _run_mercator(path, timeout=timeout),
'rpm': _run_rpm(path, timeout=timeout),
Expand Down