base/v0_6_exp: add parent directory sugar #508
+313
−5
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
|
still adding unit tests and cleaning up code. |
prestist
force-pushed
the
directories-sugar
branch
2 times, most recently
from
d532226
to
9f25bc1
Compare
|
Ooof, ok Looking at other tests they correctly have a storage translation set you can see this here with this |
prestist
force-pushed
the
directories-sugar
branch
2 times, most recently
from
1451196
to
3125dcd
Compare
prestist
force-pushed
the
directories-sugar
branch
3 times, most recently
from
eb5115d
to
07d381f
Compare
prestist
force-pushed
the
directories-sugar
branch
from
07d381f
to
0892fbf
Compare
jlebon
reviewed
Mar 15, 2024
| @@ -67,6 +67,12 @@ type File struct { | |||
| Append []Resource `yaml:"append"` | |||
| Contents Resource `yaml:"contents"` | |||
| Mode *int `yaml:"mode"` | |||
| Parent Parent `yaml:"parent"` | |||
There was a problem hiding this comment.
I think we also need to add this to Directory and Link.
| @@ -134,6 +184,22 @@ func translateFile(from File, options common.TranslateOptions) (to types.File, t | |||
| return | |||
| } | |||
|
|
|||
| func translateLuks(from Luks, options common.TranslateOptions) (to types.Luks, tm translate.TranslationSet, r report.Report) { | |||
There was a problem hiding this comment.
It feels weird to me that we need to rewrite this since IIUC nothing in what we do is related to LUKS (right?).
Comment on lines
+128
to
+133
| translate.MergeP(tr, tm, &r, "disks", &from.Disks, &to.Disks) | ||
| translate.MergeP(tr, tm, &r, "files", &from.Files, &to.Files) | ||
| translate.MergeP(tr, tm, &r, "filesystems", &from.Filesystems, &to.Filesystems) | ||
| translate.MergeP(tr, tm, &r, "links", &from.Links, &to.Links) | ||
| translate.MergeP(tr, tm, &r, "luks", &from.Luks, &to.Luks) | ||
| translate.MergeP(tr, tm, &r, "raid", &from.Raid, &to.Raid) |
There was a problem hiding this comment.
Is there precedence for other sugar we have in Butane which ends up having to relist every other section at the level it's operating at?
yasminvalim
force-pushed
the
directories-sugar
branch
from
0892fbf
to
fc1f76a
Compare
yasminvalim
force-pushed
the
directories-sugar
branch
14 times, most recently
from
d5a0200
to
8998a97
Compare
yasminvalim
force-pushed
the
directories-sugar
branch
6 times, most recently
from
63c3086
to
da97cc0
Compare
yasminvalim
force-pushed
the
directories-sugar
branch
8 times, most recently
from
a62ab0e
to
f72f747
Compare
Add a field called 'Parent' which is used to specify a file's parent directory. When a parent is specified, all directories from the parent to the file will be created, with the 'mode' supplied in the parent directory. resolves: coreos#380 Co-authored-by: Yasmin Valim <ydesouza@redhat.com> Co-authored-by: Joseph Corchado <jmarrero@redhat.com> Co-authored-by: Adam Piasecki <apiaseck@redhat.com>
yasminvalim
force-pushed
the
directories-sugar
branch
from
f72f747
to
c586218
Compare
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.
Add a field called 'Parent' which is used to specify a file's parent directory. When a parent is specified, all directories from the parent to the file will be created, with the 'mode' supplied in the parent directory.