CLOUDDST-24254 : Merge index image failing with FBC operator present … #808
Conversation
ashwini3326
force-pushed
the
fix_merge_index_issue
branch
2 times, most recently
from
c0ee208 to
b803aa2
Compare
ashwini3326
force-pushed
the
fix_merge_index_issue
branch
4 times, most recently
from
083f509 to
1b1b5de
Compare
iib/workers/tasks/utils.py
Outdated
| @@ -1265,3 +1265,31 @@ def get_bundle_metadata( | |||
| for pullspec in operator_csv.get_pullspecs(): | |||
| bundle_metadata['found_pullspecs'].add(pullspec) | |||
| return bundle_metadata | |||
|
|
|||
|
|
|||
| def filter_deprecation_operator_from_db( | |||
There was a problem hiding this comment.
I am thinking about this name - if I did not know more I would think that the function will filter out the operators from DB (that it will remove them from DB) but we want to get only list of operators present in DB.
what about something like get_operators_present_in_db or filter_operators_present_in_db or just filter_operators ?
@chandwanitulsi is good with naming :) maybe she could suggest something.
There was a problem hiding this comment.
going with filter_operators_present_in_db
| :param str temp_dir: temp directory where opm will be executed | ||
|
|
||
| :return: A List of operator bundle to be deprecated | ||
| """ |
iib/workers/tasks/utils.py
Outdated
| filter(lambda bundlepath: bundlepath in available_bundlepaths, deprecation_bundles) | ||
| ) | ||
|
|
||
| log.info(f"Deprecation bundle after filter is : {deprecation_bundles}") |
There was a problem hiding this comment.
For logging we should not use f-string formatting but %s notation because logging lib is optimized for it.
https://docs.python.org/3/howto/logging-cookbook.html#formatting-styles
There was a problem hiding this comment.
fixed, will reflect in next push.
iib/workers/tasks/utils.py
Outdated
| bundles_list = get_list_bundles(index_db_file, temp_dir) | ||
|
|
||
| available_bundlepaths = [] | ||
| for bundle in bundles_list: |
There was a problem hiding this comment.
Can we do the filtering in one cycle? Something like:
available_bundlepaths = [
bundle["bundlePath"] for bundle in bundles_list if bundle["bundlePath"] in deprecation_bundles
]then just log and return available_bundlepaths
There was a problem hiding this comment.
changed, will reflect in next push.
|
|
||
|
|
||
| @mock.patch('iib.workers.tasks.utils.get_list_bundles') | ||
| def test_no_matching_filter_deprecation_operator_from_db_(mock_bundle_list): |
There was a problem hiding this comment.
extra _ at the end of name test_no_matching_filter_deprecation_operator_from_db_
There was a problem hiding this comment.
removed, will reflect in next push.
| ] | ||
|
|
||
| deprecation_bundles = [ | ||
| "op1@sha", |
There was a problem hiding this comment.
Do you think you could add "op3@sha", here as well?
The result should be the same
There was a problem hiding this comment.
It makes unittest more specific, so I thought of not testing both cases in single unitest.
| ] | ||
|
|
||
| deprecation_bundles = [ | ||
| "op3@sha", |
There was a problem hiding this comment.
Do we need this tests if we include this in the previous one?
…in source This commit fix this bug by ignoring deprecation operators which are not available in database.
ashwini3326
force-pushed
the
fix_merge_index_issue
branch
from
1b1b5de to
a2c2e17
Compare
This commit fix this bug by ignoring deprecation operators which are not available in database.
@release-engineering/exd-guild-hello-operator