feat: skip install tools cmd #741
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
Commented out the hardcoded install command and introduced a new method to dynamically generate the command based on the available package managers and missing tools in the tooling image. This enhancement increases flexibility and ensures the tooling image has all required tools installed using the detected package manager. Signed-off-by: Miaha Cybersec <MiahaCybersec@gmail.com>
Extended the list of package managers to include 'rpm' in the pkgmgr. Added error handling for unsupported RedHat and RockyLinux source policies due to missing busybox in their repos. Signed-off-by: Miaha Cybersec <MiahaCybersec@gmail.com>
Changed `generateToolInstallCmd` to accept pointer of llb.State for better efficiency. Removed redundant `rpm` package manager as it cannot connect to RPM repos. Signed-off-by: Miaha Cybersec <MiahaCybersec@gmail.com>
MiahaCybersec
requested review from
jeremyrickard,
sozercan and
ashnamehrotra
as code owners
|
Currently working on fixing the failing test |
Added `tdnf` as a required package manager in test cases for `Test_unpackAndMergeUpdates_RPM`. This ensures tests do not fail due to the absence of a specified package manager. Signed-off-by: Miaha Cybersec <MiahaCybersec@gmail.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #741 +/- ##
==========================================
- Coverage 47.46% 47.43% -0.04%
==========================================
Files 18 18
Lines 1677 1714 +37
==========================================
+ Hits 796 813 +17
- Misses 826 843 +17
- Partials 55 58 +3 ☔ View full report in Codecov by Sentry. |
Simplify the loop for checking required tools by using more descriptive variable names and range iteration syntax. This improves readability and maintainability of the code. Signed-off-by: Miaha Cybersec <MiahaCybersec@gmail.com>
|
@MiahaCybersec when testing this locally, it does work with a cbl-mariner to Fedora conversion source policy and doesn't work with Redhat conversion (as expected when patching a mariner image). However, I still see "dnf install busybox dnf-utils cpio -y" in the logs with Fedora, which should already have busybox? |
Co-authored-by: Ashna Mehrotra <ashnamehrotra@gmail.com> Signed-off-by: Miaha <143584635+MiahaCybersec@users.noreply.github.com>
Co-authored-by: Ashna Mehrotra <ashnamehrotra@gmail.com> Signed-off-by: Miaha <143584635+MiahaCybersec@users.noreply.github.com>
|
BusyBox is not preinstalled on Fedora, but it is available in the Fedora repos. However, BusyBox is not available in the RHEL or Rocky repos. |
Simplify the detection of installed package managers and required tools by using `strings.Contains` instead of splitting the applications list. This change reduces nested loops and enhances code readability while maintaining functionality for checking missing tools and package managers. Signed-off-by: Miaha Cybersec <MiahaCybersec@gmail.com>
|
Only failing check is codecov/project - presumably a similar case to #706 |
ashnamehrotra
approved these changes
Aug 30, 2024
1 task
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.
Closes #651, #652