Skip to content

Commit 87e2d0c

Browse files
traviertravier
committed
config/v3_6_experimental: adapt for new experimental spec
1 parent 68efbc1 commit 87e2d0c

File tree

6 files changed

+26
-41
lines changed

6 files changed

+26
-41
lines changed

‎config/v3_6_experimental/config.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v3_5
15+
package v3_6_experimental
1616

1717
import (
1818
"github.com/coreos/ignition/v2/config/merge"
1919
"github.com/coreos/ignition/v2/config/shared/errors"
2020
"github.com/coreos/ignition/v2/config/util"
21-
prev "github.com/coreos/ignition/v2/config/v3_4"
22-
"github.com/coreos/ignition/v2/config/v3_5/translate"
23-
"github.com/coreos/ignition/v2/config/v3_5/types"
21+
prev "github.com/coreos/ignition/v2/config/v3_5"
22+
"github.com/coreos/ignition/v2/config/v3_6_experimental/translate"
23+
"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
2424
"github.com/coreos/ignition/v2/config/validate"
2525

2626
"github.com/coreos/go-semver/semver"
@@ -58,8 +58,8 @@ func Parse(rawConfig []byte) (types.Config, report.Report, error) {
5858
return config, rpt, nil
5959
}
6060

61-
// ParseCompatibleVersion parses the raw config of version 3.5.0 or
62-
// lesser into a 3.5 types.Config struct and generates a report of any errors,
61+
// ParseCompatibleVersion parses the raw config of version 3.5.0-experimental or
62+
// lesser into a 3.5-exp types.Config struct and generates a report of any errors,
6363
// warnings, info, and deprecations it encountered
6464
func ParseCompatibleVersion(raw []byte) (types.Config, report.Report, error) {
6565
version, rpt, err := util.GetConfigVersion(raw)

‎config/v3_6_experimental/config_test.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package v3_5
15+
package v3_6_experimental
1616

1717
import (
1818
"testing"
1919

2020
"github.com/coreos/ignition/v2/config/shared/errors"
21-
"github.com/coreos/ignition/v2/config/v3_5/types"
21+
"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
2222
"github.com/stretchr/testify/assert"
2323
)
2424

@@ -85,7 +85,7 @@ func TestParse(t *testing.T) {
8585
},
8686
{
8787
in: in{config: []byte(`{"ignition": {"version": "3.5.0"}}`)},
88-
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
88+
out: out{err: errors.ErrUnknownVersion},
8989
},
9090
{
9191
in: in{config: []byte(`{"ignition": {"version": "2.0.0-experimental"}}`)},
@@ -135,6 +135,10 @@ func TestParse(t *testing.T) {
135135
in: in{config: []byte(`{"ignition": {"version": "3.5.0-experimental"}}`)},
136136
out: out{err: errors.ErrUnknownVersion},
137137
},
138+
{
139+
in: in{config: []byte(`{"ignition": {"version": "3.6.0-experimental"}}`)},
140+
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
141+
},
138142
{
139143
in: in{config: []byte(`{"ignition": {"version": "2.0.0"},}`)},
140144
out: out{err: errors.ErrInvalid},
@@ -152,7 +156,7 @@ func TestParse(t *testing.T) {
152156
out: out{err: errors.ErrEmpty},
153157
},
154158
{
155-
in: in{config: []byte(`{"ignition": {"version": "3.5.0"}, "storage": {"filesystems": [{"format": "ext4", "label": "zzzzzzzzzzzzzzzzzzzzzzzzzzz"}]}}`)},
159+
in: in{config: []byte(`{"ignition": {"version": "3.6.0-experimental"}, "storage": {"filesystems": [{"format": "ext4", "label": "zzzzzzzzzzzzzzzzzzzzzzzzzzz"}]}}`)},
156160
out: out{err: errors.ErrInvalid},
157161
},
158162
}
@@ -187,6 +191,10 @@ func TestParse(t *testing.T) {
187191
},
188192
{
189193
in: in{config: []byte(`{"ignition": {"version": "3.6.0-experimental"}}`)},
194+
out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
195+
},
196+
{
197+
in: in{config: []byte(`{"ignition": {"version": "3.6.0"}}`)},
190198
out: out{err: errors.ErrUnknownVersion},
191199
},
192200
{
@@ -202,7 +210,7 @@ func TestParse(t *testing.T) {
202210
out: out{err: errors.ErrInvalid},
203211
},
204212
{
205-
in: in{config: []byte(`{"ignition": {"version": "3.5.0"}, "storage": {"filesystems": [{"format": "ext4", "label": "zzzzzzzzzzzzzzzzzzzzzzzzzzz"}]}}`)},
213+
in: in{config: []byte(`{"ignition": {"version": "3.6.0-experimental"}, "storage": {"filesystems": [{"format": "ext4", "label": "zzzzzzzzzzzzzzzzzzzzzzzzzzz"}]}}`)},
206214
out: out{err: errors.ErrInvalid},
207215
},
208216
}

‎config/v3_6_experimental/translate/translate.go

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ package translate
1616

1717
import (
1818
"github.com/coreos/ignition/v2/config/translate"
19-
old_types "github.com/coreos/ignition/v2/config/v3_4/types"
20-
"github.com/coreos/ignition/v2/config/v3_5/types"
19+
old_types "github.com/coreos/ignition/v2/config/v3_5/types"
20+
"github.com/coreos/ignition/v2/config/v3_6_experimental/types"
2121
)
2222

2323
func translateIgnition(old old_types.Ignition) (ret types.Ignition) {
@@ -27,33 +27,9 @@ func translateIgnition(old old_types.Ignition) (ret types.Ignition) {
2727
return
2828
}
2929

30-
func translateLuks(old old_types.Luks) (ret types.Luks) {
31-
tr := translate.NewTranslator()
32-
tr.AddCustomTranslator(translateTang)
33-
tr.Translate(&old.Clevis, &ret.Clevis)
34-
tr.Translate(&old.Device, &ret.Device)
35-
tr.Translate(&old.KeyFile, &ret.KeyFile)
36-
tr.Translate(&old.Label, &ret.Label)
37-
tr.Translate(&old.Name, &ret.Name)
38-
tr.Translate(&old.OpenOptions, &ret.OpenOptions)
39-
tr.Translate(&old.Options, &ret.Options)
40-
tr.Translate(&old.Discard, &ret.Discard)
41-
tr.Translate(&old.UUID, &ret.UUID)
42-
tr.Translate(&old.WipeVolume, &ret.WipeVolume)
43-
return
44-
}
45-
46-
func translateTang(old old_types.Tang) (ret types.Tang) {
47-
tr := translate.NewTranslator()
48-
tr.Translate(&old.Thumbprint, &ret.Thumbprint)
49-
tr.Translate(&old.URL, &ret.URL)
50-
return
51-
}
52-
5330
func Translate(old old_types.Config) (ret types.Config) {
5431
tr := translate.NewTranslator()
5532
tr.AddCustomTranslator(translateIgnition)
56-
tr.AddCustomTranslator(translateLuks)
5733
tr.Translate(&old, &ret)
5834
return
5935
}

‎config/v3_6_experimental/translate/translate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"testing"
2020

2121
"github.com/coreos/ignition/v2/config/util"
22-
old "github.com/coreos/ignition/v2/config/v3_4/types"
22+
old "github.com/coreos/ignition/v2/config/v3_5/types"
2323
)
2424

2525
// Check that we have valid translators for the complete config struct

‎config/v3_6_experimental/types/config.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ import (
2525

2626
var (
2727
MaxVersion = semver.Version{
28-
Major: 3,
29-
Minor: 5,
28+
Major: 3,
29+
Minor: 6,
30+
PreRelease: "experimental",
3031
}
3132
)
3233

‎config/v3_6_experimental/types/schema.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package types
22

3-
// generated by "schematyper --package=types config/v3_5/schema/ignition.json -o config/v3_5/types/schema.go --root-type=Config" -- DO NOT EDIT
3+
// generated by "schematyper --package=types config/v3_6_experimental/schema/ignition.json -o config/v3_6_experimental/types/schema.go --root-type=Config" -- DO NOT EDIT
44

55
type Cex struct {
66
Enabled *bool `json:"enabled,omitempty"`

0 commit comments

Comments
 (0)