Fix: change selinux path to name and add module

coreos · Oct 10, 2023 · 2a7e202 · 2a7e202
1 parent d79bea2
commit 2a7e202
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 26 deletions.
diff --git a/config/common/errors.go b/config/common/errors.go
@@ -96,7 +96,7 @@ var (
 
 	// Selinux Module
 	ErrContentInvalid = errors.New("Content is empty, please provide content.")
-	ErrPathInvalid    = errors.New("Path is empty, please provide a valid path.")
+	ErrNameInvalid    = errors.New("Name is empty, please provide a valid name.")
 )
 
 type ErrUnmarshal struct {

diff --git a/config/fcos/v1_6_exp/schema.go b/config/fcos/v1_6_exp/schema.go
@@ -19,10 +19,10 @@ import (
 )
 
 type Config struct {
-	base.Config   `yaml:",inline"`
-	BootDevice    BootDevice      `yaml:"boot_device"`
-	Grub          Grub            `yaml:"grub"`
-	SelinuxModule []SelinuxModule `yaml:"selinux_module"`
+	base.Config `yaml:",inline"`
+	BootDevice  BootDevice `yaml:"boot_device"`
+	Grub        Grub       `yaml:"grub"`
+	Selinux     []Selinux  `yaml:"selinux"`
 }
 
 type BootDevice struct {
@@ -51,7 +51,11 @@ type GrubUser struct {
 	PasswordHash *string `yaml:"password_hash"`
 }
 
-type SelinuxModule struct {
+type Selinux struct {
+	Module []Module `yaml:"module"`
+}
+
+type Module struct {
+	Name    string `yaml:"name"`
 	Content string `yaml:"content"`
-	Path    string `yaml:"path"`
 }
diff --git a/config/fcos/v1_6_exp/validate.go b/config/fcos/v1_6_exp/validate.go
@@ -78,13 +78,13 @@ func (user GrubUser) Validate(c path.ContextPath) (r report.Report) {
 	return
 }
 
-func (se SelinuxModule) Validate(c path.ContextPath) (r report.Report) {
-	if se.Path != "" && se.Content == "" {
+func (m Module) Validate(c path.ContextPath) (r report.Report) {
+	if m.Name != "" && m.Content == "" {
 		r.AddOnError(c.Append("content"), common.ErrContentInvalid)
 	}
 
-	if se.Content != "" && se.Path == "" {
-		r.AddOnError(c.Append("path"), common.ErrPathInvalid)
+	if m.Content != "" && m.Name == "" {
+		r.AddOnError(c.Append("name"), common.ErrNameInvalid)
 	}
 	return r
 }
diff --git a/config/fcos/v1_6_exp/validate_test.go b/config/fcos/v1_6_exp/validate_test.go
@@ -480,41 +480,41 @@ func TestValidateConfig(t *testing.T) {
 	}
 }
 
-func TestValidateSelinuxModule(t *testing.T) {
+func TestValidateModule(t *testing.T) {
 	tests := []struct {
-		in      SelinuxModule
+		in      Module
 		out     error
 		errPath path.ContextPath
 	}{
 		{
-			// content is empty, path is specified
-			in: SelinuxModule{
+			// name is empty, path is specified
+			in: Module{
 				Content: "",
-				Path:    "/some/path",
+				Name:    "some name",
 			},
 			out:     common.ErrContentInvalid,
 			errPath: path.New("yaml", "content"),
 		},
 		{
-			// path is empty, content is specified
-			in: SelinuxModule{
-				Path:    "",
+			// name is empty, content is specified
+			in: Module{
+				Name:    "",
 				Content: "some content",
 			},
-			out:     common.ErrPathInvalid,
-			errPath: path.New("yaml", "path"),
+			out:     common.ErrNameInvalid,
+			errPath: path.New("yaml", "name"),
 		},
 		{
-			// path and content are empty
-			in:      SelinuxModule{},
+			// name and content are empty
+			in:      Module{},
 			out:     nil,
 			errPath: path.New("yaml"),
 		},
 		{
-			// path and content are specified
-			in: SelinuxModule{
+			// name and content are specified
+			in: Module{
 				Content: "some content",
-				Path:    "/some/path",
+				Name:    "some name",
 			},
 			out:     nil,
 			errPath: path.New("yaml"),