Fix bug on fbc_utils.enforce_json_config_dir
#675
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit fixes a bug on `fbc_utils.enforce_json_config_dir` which was
caused by the incoming `catalog.yaml` being composed of multiple data
chunks (multiple "inner yamls").
The bugfix was tested alongisde opm validate and can be verified
manually with the following steps:
1. Pull ` registry-proxy.engineering.redhat.com/rh-osbs/iib-pub:v4.12`
2. Copy the directory `configs/rhbk-operator/` to a temporary location
in your machine.
3. Create two sub-directories called `in` and `out`
3. Move the `catalog.yaml` to the sub-directory `in`
4. Create a new file named `converter.py` with the following snippet and
run it:
```
import contextlib
import json
import os
import ruamel.yaml
yaml = ruamel.yaml.YAML()
with contextlib.suppress(FileNotFoundError):
os.remove('out/catalog.json')
with open('in/catalog.yaml', 'r') as yaml_in, open('out/catalog.json', 'a') as json_out:
data = yaml.load_all(yaml_in)
for chunk in data:
json.dump(chunk, json_out)
```
5. Use `opm validate out` to validate the output catalog.
Refers to CLOUDDST-22904
yashvardhannanavati
approved these changes
May 22, 2024
lipoja
approved these changes
May 28, 2024
|
@JAVGan Did you test it with the problematic index image on dev-env? |
chandwanitulsi
approved these changes
May 28, 2024
Yes, using the steps from the description |
I tested using 4.12 index as well, lgtm |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes a bug on
fbc_utils.enforce_json_config_dirwhich was caused by the incomingcatalog.yamlbeing composed of multiple data chunks (multiple "inner yamls").The bugfix was tested alongisde opm validate and can be verified manually with the following steps:
registry-proxy.engineering.redhat.com/rh-osbs/iib-pub:v4.12configs/rhbk-operator/to a temporary location in your machine.inandoutcatalog.yamlto the sub-directoryinconverter.pywith the following snippet and run it:opm validate outto validate the output catalog.Refers to CLOUDDST-22904