Use strict unmarshalling for YAML configs

Signed-off-by: Stephen Augustus <[email protected]>
uwu-tools · Sep 4, 2023 · 5597ea1 · 5597ea1
1 parent 1339ea7
commit 5597ea1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -128,7 +128,7 @@ func rootCmd(o *root.Options) error {
 			logrus.WithError(err).Fatal("Could not read --config-path file")
 		}
 
-		if err := yaml.Unmarshal(raw, &cfg); err != nil {
+		if err := yaml.UnmarshalStrict(raw, &cfg); err != nil {
 			logrus.WithError(err).Fatal("Failed to load configuration")
 		}
 	}

diff --git a/cmd/restrictions/main.go b/cmd/restrictions/main.go
@@ -111,7 +111,7 @@ func unmarshalPathToRestrictionsConfig(path string) (*Config, error) {
 		return nil, fmt.Errorf("read restrictions config: %v", err)
 	}
 	var restrictionsCfg Config
-	if err := yaml.Unmarshal(buf, &restrictionsCfg); err != nil {
+	if err := yaml.UnmarshalStrict(buf, &restrictionsCfg); err != nil {
 		return nil, fmt.Errorf("unmarshal restrictions config: %v", err)
 	}
 	return &restrictionsCfg, nil

diff --git a/config/config_test.go b/config/config_test.go
@@ -49,7 +49,7 @@ func TestMain(m *testing.M) {
 		os.Exit(1)
 	}
 
-	if err := yaml.Unmarshal(raw, &cfg); err != nil {
+	if err := yaml.UnmarshalStrict(raw, &cfg); err != nil {
 		fmt.Printf("cannot unmarshal generated config.yaml from %s: %v\n", *configPath, err)
 		os.Exit(1)
 	}
@@ -68,7 +68,7 @@ func readInto(path string, i interface{}) error {
 	if err != nil {
 		return fmt.Errorf("read: %v", err)
 	}
-	if err := yaml.Unmarshal(buf, i); err != nil {
+	if err := yaml.UnmarshalStrict(buf, i); err != nil {
 		return fmt.Errorf("unmarshal: %v", err)
 	}
 	return nil

diff --git a/internal/helpers/helper.go b/internal/helpers/helper.go
@@ -63,7 +63,7 @@ func UnmarshalPathToOrgConfig(path string) (*org.Config, error) {
 		return nil, fmt.Errorf("read: %v", err)
 	}
 	var cfg org.Config
-	if err := yaml.Unmarshal(buf, &cfg); err != nil {
+	if err := yaml.UnmarshalStrict(buf, &cfg); err != nil {
 		return nil, fmt.Errorf("unmarshal: %v", err)
 	}
 	return &cfg, nil

diff --git a/options/merge/merge.go b/options/merge/merge.go
@@ -89,7 +89,7 @@ func unmarshal(path string) (*org.Config, error) {
 		return nil, fmt.Errorf("read: %v", err)
 	}
 	var cfg org.Config
-	if err := yaml.Unmarshal(buf, &cfg); err != nil {
+	if err := yaml.UnmarshalStrict(buf, &cfg); err != nil {
 		return nil, fmt.Errorf("unmarshal: %v", err)
 	}
 	return &cfg, nil