[master] MGMT-20756 assisted installer naive string concatenation for partition finding #1214
+6
−18
Conversation
This file contains hidden or 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
Replace naive string concatenation for partition finding with robust lsblk --json based approach. This fixes mounting issues with device mapper devices (dm-*) where the old approach would try to mount /dev/dm-02 instead of the correct /dev/dm-2. - Add getPartitionPathFromLsblk() function using lsblk --json output - Update OverwriteOsImage() to use new partition discovery method - Fix calculateFreePercent() to use proper array indexing - Add test for device mapper devices to verify the fix - Maintain backward compatibility with existing device types (sda, nvme, mmcblk)
- Add 16 unit tests covering all device types and edge cases - Test SATA, NVMe, MMC, and Device Mapper devices - Test error handling: invalid JSON, missing devices, no partitions - Test boundary conditions: invalid partition numbers, out of range - Test realistic multi-device scenarios - Verify exact ticket scenario: /dev/dm-0 partition 2 → /dev/dm-2 - All tests placed at end of file following best practices - 100% test coverage for the new lsblk-based partition discovery
len() returns 0 for nil slices, so explicit nil check is unnecessary
openshift-ci
bot
added
the
size/XS
shay23bra
changed the title
shay23bra
changed the title
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1214 +/- ##
==========================================
- Coverage 55.82% 54.98% -0.84%
==========================================
Files 15 15
Lines 3477 3468 -9
==========================================
- Hits 1941 1907 -34
- Misses 1329 1358 +29
+ Partials 207 203 -4
🚀 New features to boost your workflow:
|
|
/retest |
openshift-ci
bot
added
size/S
|
Looks good but failing unit tests |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: omertuc, shay23bra The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/retest |
|
@shay23bra: The following tests failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
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.
Summary
Improve partition detection by querying
lsblkdirectly for the device and using its JSON to resolve the EFI partition path, eliminating brittle string concatenation.Problem
findEfiDirectorypreviously constructed the EFI partition path via naive string concatenation (e.g.,device + "2"), which fails for device name patterns likenvme(/dev/nvme0n1p2) anddm-*.Changes
findEfiDirectorynow useso.getPartitionPathFromLsblk(device, "2")to obtain the correct partition path fromlsblk.lsblkinvocation: Replacelsblk -b -Jwithlsblk --bytes --json <device>and rely on the scoped output instead of manual filtering.nilcheck (S1009) insrc/ops/ops.go.src/ops/ops_test.goto reflect the newlsblkarguments and single-device behavior.Validation
go test ./...passes locally.Manually verified EFI partition resolution for
sda,nvme0n1, anddm-*style names.