Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FR-5403 - Pathname for manual customization not relative to image definition file #144

Merged
merged 13 commits into from
Oct 6, 2023

Conversation

upils
Copy link
Collaborator

@upils upils commented Sep 26, 2023

No description provided.

@codecov
Copy link

codecov bot commented Sep 27, 2023

Codecov Report

Merging #144 (5e2322d) into main (6193013) will increase coverage by 1.26%.
Report is 2 commits behind head on main.
The diff coverage is 92.42%.

@@            Coverage Diff             @@
##             main     #144      +/-   ##
==========================================
+ Coverage   89.17%   90.44%   +1.26%     
==========================================
  Files          11       11              
  Lines        2449     2449              
==========================================
+ Hits         2184     2215      +31     
+ Misses        244      208      -36     
- Partials       21       26       +5     
Files Coverage Δ
cmd/ubuntu-image/main.go 91.57% <ø> (ø)
internal/statemachine/classic.go 100.00% <100.00%> (ø)
internal/statemachine/helper.go 98.66% <100.00%> (-0.01%) ⬇️
internal/statemachine/snap.go 100.00% <100.00%> (ø)
internal/statemachine/state_machine.go 98.00% <ø> (ø)
internal/statemachine/classic_states.go 97.22% <82.75%> (-0.64%) ⬇️

... and 1 file with indirect coverage changes

@upils upils marked this pull request as ready for review September 27, 2023 12:06
@upils upils requested a review from sil2100 October 3, 2023 12:57
Copy link
Collaborator

@sil2100 sil2100 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on the changes, thanks! One recommendation would be do update the README.rst manual customization path entries to also mention that the path will be relative to the definition file.

// Copy the file into the specified location in the chroot
dest := filepath.Join(targetDir, copyFile.Dest)
func manualCopyFile(customizations []*imagedefinition.CopyFile, confDefPath string, targetDir string, debug bool) error {
for _, c := range customizations {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, looks much cleaner this way indeed!

@upils upils force-pushed the path-relative-to-image-definition branch from 8762e99 to 5e2322d Compare October 6, 2023 10:03
@upils upils merged commit c5f0cdc into main Oct 6, 2023
10 of 12 checks passed
@upils upils deleted the path-relative-to-image-definition branch November 28, 2023 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants