config/fcos/v1_5_exp: use array of extension instead of string

coreos · Jan 27, 2022 · ac77c2b · ac77c2b
1 parent 3d00ece
commit ac77c2b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/config/fcos/v1_5_exp/schema.go b/config/fcos/v1_5_exp/schema.go
@@ -20,8 +20,8 @@ import (
 
 type Config struct {
 	base.Config `yaml:",inline"`
-	BootDevice  BootDevice `yaml:"boot_device"`
-	Extensions  Extensions `yaml:"extensions"`
+	BootDevice  BootDevice  `yaml:"boot_device"`
+	Extensions  []Extension `yaml:"extensions"`
 }
 
 type BootDevice struct {
@@ -40,4 +40,6 @@ type BootDeviceMirror struct {
 	Devices []string `yaml:"devices"`
 }
 
-type Extensions []string
+type Extension struct {
+	Name string `yaml:"name"`
+}
diff --git a/config/fcos/v1_5_exp/translate.go b/config/fcos/v1_5_exp/translate.go
@@ -309,11 +309,14 @@ func (c Config) processPackages(options common.TranslateOptions) (types.Config,
 	if len(c.Extensions) == 0 {
 		return ret, ts, r
 	}
-
+	var extensions []string
+	for _, ex := range c.Extensions {
+		extensions = append(extensions, ex.Name)
+	}
 	treeFileContents, err := yaml.Marshal(&struct {
 		Packages []string `yaml:"packages"`
 	}{
-		Packages: c.Extensions,
+		Packages: extensions,
 	})
 	if err != nil {
 		r.AddOnError(yamlPath, err)

diff --git a/config/fcos/v1_5_exp/translate_test.go b/config/fcos/v1_5_exp/translate_test.go
@@ -1432,7 +1432,14 @@ func TestTranslateExtensions(t *testing.T) {
 		// config with two extensions/packages
 		{
 			Config{
-				Extensions: []string{"strace", "zsh"},
+				Extensions: []Extension{
+					{
+						Name: "strace",
+					},
+					{
+						Name: "zsh",
+					},
+				},
 			},
 			types.Config{
 				Ignition: types.Ignition{