Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions iib/web/api_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
from iib.web.s3_utils import get_object_from_s3_bucket
from botocore.response import StreamingBody
from iib.web.utils import pagination_metadata, str_to_bool
from iib.workers.tasks.build import (
handle_add_request,
from iib.workers.tasks.build_containerized_add import (
handle_containerized_add_request,
)
from iib.workers.tasks.build_containerized_rm import handle_containerized_rm_request
from iib.workers.tasks.build_add_deprecations import handle_add_deprecations_request
Expand Down Expand Up @@ -619,7 +619,7 @@ def add_bundles() -> Tuple[flask.Response, int]:
args.append(current_user.username)

try:
handle_add_request.apply_async(
handle_containerized_add_request.apply_async(
args=args,
link_error=error_callback,
argsrepr=repr(safe_args),
Expand Down Expand Up @@ -1066,7 +1066,7 @@ def add_rm_batch() -> Tuple[flask.Response, int]:
error_callback = failed_request_callback.s(request.id)
try:
if isinstance(request, RequestAdd):
handle_add_request.apply_async(
handle_containerized_add_request.apply_async(
args=args,
link_error=error_callback,
argsrepr=repr(safe_args),
Expand Down
1 change: 1 addition & 0 deletions iib/workers/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ class Config(object):
'iib.workers.tasks.build_create_empty_index',
'iib.workers.tasks.build_fbc_operations',
'iib.workers.tasks.build_add_deprecations',
'iib.workers.tasks.build_containerized_add',
'iib.workers.tasks.build_containerized_fbc_operations',
'iib.workers.tasks.build_containerized_rm',
'iib.workers.tasks.general',
Expand Down
7 changes: 4 additions & 3 deletions iib/workers/tasks/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,11 +397,12 @@ def get_index_database(from_index: str, base_dir: str) -> str:
return local_path


def _get_present_bundles(from_index: str, base_dir: str) -> Tuple[List[BundleImage], List[str]]:
def _get_present_bundles(input_data: str, base_dir: str) -> Tuple[List[BundleImage], List[str]]:
"""
Get a list of bundles already present in the index image.

:param str from_index: index image to inspect.
:param str input_data: input data to inspect.
Example: catalog-image | catalog-directory | bundle-image | bundle-directory | sqlite-file
:param str base_dir: base directory to create temporary files in.
:return: list of unique present bundles as provided by the grpc query and a list of unique
bundle pull_specs
Expand All @@ -411,7 +412,7 @@ def _get_present_bundles(from_index: str, base_dir: str) -> Tuple[List[BundleIma
# Get list of bundles
unique_present_bundles: List[BundleImage] = []
unique_present_bundles_pull_spec: List[str] = []
present_bundles: List[BundleImage] = get_list_bundles(from_index, base_dir)
present_bundles: List[BundleImage] = get_list_bundles(input_data, base_dir)

# If no data is returned there are no bundles present
if not present_bundles:
Expand Down
Loading