From fcf1d78a1acc7a24d4d11b86ded29d4bedda47a2 Mon Sep 17 00:00:00 2001 From: "Yashvardhan (Yash) V. Nanavati" Date: Mon, 20 Feb 2023 12:57:47 -0500 Subject: [PATCH] Update dependabot.yml --- iib/workers/tasks/build.py | 6 +++--- iib/workers/tasks/build_create_empty_index.py | 2 +- iib/workers/tasks/build_fbc_operations.py | 2 +- iib/workers/tasks/build_merge_index_image.py | 2 +- iib/workers/tasks/build_recursive_related_bundles.py | 2 +- iib/workers/tasks/build_regenerate_bundle.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/iib/workers/tasks/build.py b/iib/workers/tasks/build.py index f6e8aff8..f06df36b 100644 --- a/iib/workers/tasks/build.py +++ b/iib/workers/tasks/build.py @@ -597,7 +597,7 @@ def _overwrite_from_index( # of the manifest-tool to create the manifest list locally which means this workaround # can be removed. if output_pull_spec_registry == from_index_registry: - temp_dir = tempfile.TemporaryDirectory(prefix='iib-') + temp_dir = tempfile.TemporaryDirectory(prefix=f'iib-{request_id}-') new_index_src = f'oci:{temp_dir.name}' log.info( 'The registry used by IIB (%s) is also the registry where from_index (%s) will ' @@ -856,7 +856,7 @@ def handle_add_request( _update_index_image_build_state(request_id, prebuild_info) present_bundles: List[BundleImage] = [] present_bundles_pull_spec: List[str] = [] - with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: + with tempfile.TemporaryDirectory(prefix=f'iib-{request_id}-') as temp_dir: if from_index: msg = 'Checking if bundles are already present in index image' log.info(msg) @@ -1071,7 +1071,7 @@ def handle_rm_request( from_index_resolved = prebuild_info['from_index_resolved'] - with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: + with tempfile.TemporaryDirectory(prefix=f'iib-{request_id}-') as temp_dir: with set_registry_token(overwrite_from_index_token, from_index_resolved, append=True): image_is_fbc = is_image_fbc(from_index_resolved) diff --git a/iib/workers/tasks/build_create_empty_index.py b/iib/workers/tasks/build_create_empty_index.py index 4ae7b935..7afce306 100644 --- a/iib/workers/tasks/build_create_empty_index.py +++ b/iib/workers/tasks/build_create_empty_index.py @@ -100,7 +100,7 @@ def handle_create_empty_index_request( _update_index_image_build_state(request_id, prebuild_info) - with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: + with tempfile.TemporaryDirectory(prefix=f'iib-{request_id}-') as temp_dir: set_request_state(request_id, 'in_progress', 'Checking operators present in index image') operators = _get_present_operators(from_index_resolved, temp_dir) diff --git a/iib/workers/tasks/build_fbc_operations.py b/iib/workers/tasks/build_fbc_operations.py index 6f9e7715..aa6437e7 100644 --- a/iib/workers/tasks/build_fbc_operations.py +++ b/iib/workers/tasks/build_fbc_operations.py @@ -81,7 +81,7 @@ def handle_fbc_operation_request( _update_index_image_build_state(request_id, prebuild_info) - with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: + with tempfile.TemporaryDirectory(prefix=f'iib-{request_id}-') as temp_dir: opm_registry_add_fbc_fragment( request_id, temp_dir, diff --git a/iib/workers/tasks/build_merge_index_image.py b/iib/workers/tasks/build_merge_index_image.py index b14447d7..dfbd3f2b 100644 --- a/iib/workers/tasks/build_merge_index_image.py +++ b/iib/workers/tasks/build_merge_index_image.py @@ -219,7 +219,7 @@ def handle_merge_request( target_index_resolved = prebuild_info['target_index_resolved'] dockerfile_name = 'index.Dockerfile' - with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: + with tempfile.TemporaryDirectory(prefix=f'iib-{request_id}-') as temp_dir: with set_registry_token(overwrite_target_index_token, target_index, append=True): source_fbc = is_image_fbc(source_from_index_resolved) target_fbc = is_image_fbc(target_index_resolved) diff --git a/iib/workers/tasks/build_recursive_related_bundles.py b/iib/workers/tasks/build_recursive_related_bundles.py index 56460cce..a32e1c55 100644 --- a/iib/workers/tasks/build_recursive_related_bundles.py +++ b/iib/workers/tasks/build_recursive_related_bundles.py @@ -141,7 +141,7 @@ def process_parent_bundle_image( # Pull the bundle_image to ensure steps later on don't fail due to registry timeouts podman_pull(bundle_image_resolved) - with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: + with tempfile.TemporaryDirectory(prefix=f'iib-{request_id}-') as temp_dir: manifests_path = os.path.join(temp_dir, 'manifests') _copy_files_from_image(bundle_image_resolved, '/manifests', manifests_path) metadata_path = os.path.join(temp_dir, 'metadata') diff --git a/iib/workers/tasks/build_regenerate_bundle.py b/iib/workers/tasks/build_regenerate_bundle.py index 78571450..b830bbb5 100644 --- a/iib/workers/tasks/build_regenerate_bundle.py +++ b/iib/workers/tasks/build_regenerate_bundle.py @@ -101,7 +101,7 @@ def handle_regenerate_bundle_request( # Pull the from_bundle_image to ensure steps later on don't fail due to registry timeouts podman_pull(from_bundle_image_resolved) - with tempfile.TemporaryDirectory(prefix='iib-') as temp_dir: + with tempfile.TemporaryDirectory(prefix=f'iib-{request_id}-') as temp_dir: manifests_path = os.path.join(temp_dir, 'manifests') _copy_files_from_image(from_bundle_image_resolved, '/manifests', manifests_path) metadata_path = os.path.join(temp_dir, 'metadata')