Skip to content

translate: allow special mode bits in v34tov33 translation #62

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.

Sign up for GitHub

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

Closed
prestist wants to merge 1 commit into from
Closed

translate: allow special mode bits in v34tov33 translation #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions translate/v34tov33/v34tov33.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,18 +135,6 @@ func checkValue(v reflect.Value) error {
if len(luks.OpenOptions) > 0 {
return fmt.Errorf("invalid input config: luks openOptions is not supported in spec v3.3")
}
case reflect.TypeOf(old_types.FileEmbedded1{}):
f := v.Interface().(old_types.FileEmbedded1)
// 3.3 does not support special mode bits in files
if f.Mode != nil && (*f.Mode&07000) != 0 {
return fmt.Errorf("invalid input config: special mode bits are not supported in spec v3.3")
}
case reflect.TypeOf(old_types.DirectoryEmbedded1{}):
d := v.Interface().(old_types.DirectoryEmbedded1)
// 3.3 does not support special mode bits in directories
if d.Mode != nil && (*d.Mode&07000) != 0 {
return fmt.Errorf("invalid input config: special mode bits are not supported in spec v3.3")
}
case reflect.TypeOf(old_types.Resource{}):
resource := v.Interface().(old_types.Resource)
// 3.3 does not support arn: scheme for s3
Expand Down
13 changes: 9 additions & 4 deletions translate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2828,7 +2828,8 @@ func TestTranslate3_4to3_3(t *testing.T) {
})
assert.Error(t, err)

_, err = v34tov33.Translate(types3_4.Config{
// Test that special mode bits are correctly masked out during translation
res, err = v34tov33.Translate(types3_4.Config{
Ignition: types3_4.Ignition{
Version: "3.4.0",
},
Expand All @@ -2845,9 +2846,11 @@ func TestTranslate3_4to3_3(t *testing.T) {
},
},
})
assert.Error(t, err)
assert.NoError(t, err)
// Verify that special mode bits were masked out (01777 -> 0777)
assert.Equal(t, util.IntP(0777), res.Storage.Files[0].Mode)

_, err = v34tov33.Translate(types3_4.Config{
res, err = v34tov33.Translate(types3_4.Config{
Ignition: types3_4.Ignition{
Version: "3.4.0",
},
Expand All @@ -2871,7 +2874,9 @@ func TestTranslate3_4to3_3(t *testing.T) {
},
},
})
assert.Error(t, err)
assert.NoError(t, err)
// Verify that special mode bits were masked out (01777 -> 0777)
assert.Equal(t, util.IntP(0777), res.Storage.Directories[0].Mode)

_, err = v34tov33.Translate(types3_4.Config{
Ignition: types3_4.Ignition{
Expand Down
Loading