Wizard: Add kernel append input (HMS-5299) #2734

regexowl · 2025-01-10T09:59:17Z

This adds the kernel append input, removes kernel append from the OpenSCAP step and adds basic tests to cover the functionality.

TO DO:

parse "Required by OpenSCAP" correctly on edit
check for duplicate arguments

JIRA: HMS-5299

regexowl · 2025-01-10T09:59:36Z

/jira-epic HMS-5192

codecov · 2025-01-10T10:21:55Z

Codecov Report

Attention: Patch coverage is 97.63780% with 3 lines in your changes missing coverage. Please review.

Project coverage is 84.81%. Comparing base (1c50407) to head (11b7f49).
Report is 7 commits behind head on main.

Files with missing lines	Patch %	Lines
src/Components/CreateImageWizard/validators.ts	66.66%	2 Missing ⚠️
src/store/wizardSlice.ts	95.83%	1 Missing ⚠️

@@            Coverage Diff             @@
##             main    #2734      +/-   ##
==========================================
+ Coverage   84.77%   84.81%   +0.04%     
==========================================
  Files         187      187              
  Lines       21298    21388      +90     
  Branches     2099     2120      +21     
==========================================
+ Hits        18055    18141      +86     
- Misses       3221     3225       +4     
  Partials       22       22

Files with missing lines	Coverage Δ
src/Components/CreateImageWizard/ChippingInput.tsx	`100.00% <100.00%> (ø)`
...Wizard/steps/Kernel/components/KernelArguments.tsx	`100.00% <100.00%> (ø)`
...Components/CreateImageWizard/steps/Oscap/Oscap.tsx	`92.80% <100.00%> (+0.17%)`	⬆️
...mageWizard/steps/Oscap/OscapProfileInformation.tsx	`100.00% <ø> (ø)`
...Components/CreateImageWizard/steps/Oscap/index.tsx	`98.27% <100.00%> (ø)`
...nents/CreateImageWizard/utilities/requestMapper.ts	`94.79% <100.00%> (+0.07%)`	⬆️
src/test/fixtures/oscap.ts	`100.00% <100.00%> (ø)`
src/store/wizardSlice.ts	`88.94% <95.83%> (+0.16%)`	⬆️
src/Components/CreateImageWizard/validators.ts	`93.39% <66.66%> (-1.61%)`	⬇️

... and 1 file with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 199dd3d...11b7f49. Read the comment docs.

mgold1234 · 2025-01-13T10:53:31Z

I think there is a bug when creating an image with OScap -> required kernel added to the kernel step,
and if you open the edit image, the required kernel change to false
https://github.com/user-attachments/assets/13668299-9b04-4b45-8a1f-c185646147a9

mgold1234 · 2025-01-13T10:40:30Z

src/Components/CreateImageWizard/steps/Kernel/components/KernelArguments.tsx

+        setErrorText('');
+      }
+
+      if (kernelAppend.some((arg) => arg.name === value)) {


should I see this error in case I am adding the same kernel name?
now I dont see any error when adding the same name

Hmm, yeah, we don't want duplicates. Will add a check for that!

Tried to add a duplicate and got the correct error

What arguments did you try to add?

I tried 'test' value

Screen.Recording.2025-01-14.at.14.03.32.mov

ok, I got you, I think I check that I am adding 2 times the same value 'test',
if I tried to add same value that comes from the oscap profile the validation also doesnt work for me.
but, maybe we also want to check if user try to add same value ?

Aah, gotcha, the validation was triggered only on keyDown 😳 will add a fix in a bit. Nice catch, thanks!

regexowl · 2025-01-13T10:56:11Z

I think there is a bug when creating an image with OScap -> required kernel added to the kernel step, and if you open the edit image, the required kernel change to false https://github.com/user-attachments/assets/13668299-9b04-4b45-8a1f-c185646147a9

Ooh, I left the default parsing there, didn't I? Great catch! Will revert this to draft

regexowl · 2025-01-16T09:26:57Z

The chipping input might be extractable from this one as well, moving to draft for the time being. #2747 will need to get merged first.

regexowl · 2025-01-24T08:06:18Z

/retest

regexowl · 2025-01-24T09:37:34Z

src/Components/CreateImageWizard/ChippingInput.tsx

@@ -64,7 +66,7 @@ const ChippingInput = ({
  };

  const handleKeyDown = (e: React.KeyboardEvent, value: string) => {
-    if (e.key === ' ' || e.key === 'Enter' || e.key === ',') {
+    if (e.key === ' ' || e.key === 'Enter') {


Comma should be a valid character for kernel argument, I've removed it from the keyDown for the consistency sake.

kingsleyzissou

Looks good, just a small nitpick that I added inline, but should block the PR.

src/Components/CreateImageWizard/steps/Kernel/components/KernelArguments.tsx

regexowl · 2025-01-24T13:50:26Z

/retest

This adds the kernel append input. New arguments can be added by pressing the "Add" button or hitting Enter after the argument. The kernel arguments linked to a selected OpenSCAP profile are rendered in a category marked as "Required by OpenSCAP" and are read only.

Removed redundant code and updated `addItem` to check for duplicate arguments in both required and non-required list.

regexowl · 2025-01-27T11:36:13Z

/retest

schutzbot changed the title ~~Wizard: Add kernel append input~~ Wizard: Add kernel append input (HMS-5299) Jan 10, 2025

regexowl force-pushed the kernel-append-input branch from 6199c02 to 418f4aa Compare January 10, 2025 09:59

regexowl added ✅ ready for review and removed ✅ ready for review labels Jan 10, 2025

regexowl force-pushed the kernel-append-input branch from 418f4aa to 265fa11 Compare January 10, 2025 10:13

mgold1234 reviewed Jan 13, 2025

View reviewed changes

regexowl marked this pull request as draft January 13, 2025 10:56

regexowl force-pushed the kernel-append-input branch from 265fa11 to 74217f1 Compare January 14, 2025 08:38

regexowl marked this pull request as ready for review January 14, 2025 08:38

regexowl force-pushed the kernel-append-input branch from 74217f1 to b6c7247 Compare January 14, 2025 09:12

regexowl added the ✅ ready for review label Jan 14, 2025

regexowl force-pushed the kernel-append-input branch 3 times, most recently from 728676c to 60653e7 Compare January 15, 2025 13:03

regexowl marked this pull request as draft January 16, 2025 09:27

regexowl force-pushed the kernel-append-input branch from 60653e7 to 526afe0 Compare January 17, 2025 10:48

regexowl removed the ✅ ready for review label Jan 17, 2025

regexowl force-pushed the kernel-append-input branch 4 times, most recently from 7bab478 to f1fb5ff Compare January 22, 2025 12:02

regexowl marked this pull request as ready for review January 22, 2025 12:11

regexowl force-pushed the kernel-append-input branch 3 times, most recently from 2fbfe23 to c0c13fc Compare January 23, 2025 08:10

regexowl requested a review from mgold1234 January 23, 2025 08:20

regexowl mentioned this pull request Jan 23, 2025

Blueprints: Add kernel to on-prem mapper (HMS-5384) #2793

Merged

regexowl force-pushed the kernel-append-input branch from c0c13fc to a1415d7 Compare January 24, 2025 07:48

regexowl requested a review from lucasgarfield January 24, 2025 08:35

regexowl mentioned this pull request Jan 24, 2025

test: Kernel edit tests (HMS-5387) #2799

Merged

regexowl commented Jan 24, 2025

View reviewed changes

kingsleyzissou reviewed Jan 24, 2025

View reviewed changes

src/Components/CreateImageWizard/steps/Kernel/components/KernelArguments.tsx Outdated Show resolved Hide resolved

regexowl added 2 commits January 27, 2025 08:48

Wizard: Remove redundant code, fix addItem

11b7f49

Removed redundant code and updated `addItem` to check for duplicate arguments in both required and non-required list.

regexowl force-pushed the kernel-append-input branch from c8ac4e9 to 11b7f49 Compare January 27, 2025 07:48

regexowl requested a review from kingsleyzissou January 27, 2025 08:21

kingsleyzissou approved these changes Jan 27, 2025

View reviewed changes

regexowl enabled auto-merge (rebase) January 27, 2025 12:07

regexowl merged commit 6a29f7f into osbuild:main Jan 27, 2025
17 of 19 checks passed

regexowl deleted the kernel-append-input branch January 27, 2025 12:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wizard: Add kernel append input (HMS-5299) #2734

Wizard: Add kernel append input (HMS-5299) #2734

regexowl commented Jan 10, 2025 •

edited

Loading

regexowl commented Jan 10, 2025

codecov bot commented Jan 10, 2025 •

edited

Loading

mgold1234 commented Jan 13, 2025 •

edited

Loading

mgold1234 Jan 13, 2025

regexowl Jan 13, 2025

regexowl Jan 14, 2025

mgold1234 Jan 14, 2025 •

edited

Loading

mgold1234 Jan 14, 2025 •

edited

Loading

regexowl Jan 14, 2025

regexowl commented Jan 13, 2025

regexowl commented Jan 16, 2025

regexowl commented Jan 24, 2025

regexowl Jan 24, 2025

kingsleyzissou left a comment

regexowl commented Jan 24, 2025

regexowl commented Jan 27, 2025

Wizard: Add kernel append input (HMS-5299) #2734

Wizard: Add kernel append input (HMS-5299) #2734

Conversation

regexowl commented Jan 10, 2025 • edited Loading

regexowl commented Jan 10, 2025

codecov bot commented Jan 10, 2025 • edited Loading

Codecov Report

mgold1234 commented Jan 13, 2025 • edited Loading

mgold1234 Jan 13, 2025

Choose a reason for hiding this comment

regexowl Jan 13, 2025

Choose a reason for hiding this comment

regexowl Jan 14, 2025

Choose a reason for hiding this comment

mgold1234 Jan 14, 2025 • edited Loading

Choose a reason for hiding this comment

mgold1234 Jan 14, 2025 • edited Loading

Choose a reason for hiding this comment

regexowl Jan 14, 2025

Choose a reason for hiding this comment

regexowl commented Jan 13, 2025

regexowl commented Jan 16, 2025

regexowl commented Jan 24, 2025

regexowl Jan 24, 2025

Choose a reason for hiding this comment

kingsleyzissou left a comment

Choose a reason for hiding this comment

regexowl commented Jan 24, 2025

regexowl commented Jan 27, 2025

regexowl commented Jan 10, 2025 •

edited

Loading

codecov bot commented Jan 10, 2025 •

edited

Loading

mgold1234 commented Jan 13, 2025 •

edited

Loading

mgold1234 Jan 14, 2025 •

edited

Loading

mgold1234 Jan 14, 2025 •

edited

Loading