strict decoder for dynconfig

Author: kobzonega

api/v1alpha1/configuration.go

@@ -1,6 +1,7 @@
 package v1alpha1
 
 import (
+	"bytes"
 	"crypto/sha256"
 	"fmt"
 	"path"
@@ -89,7 +90,7 @@ func tryFillMissingSections(
 	}
 }
 
-func buildConfiguration(cr *Storage, crDB *Database) (string, error) {
+func buildConfiguration(cr *Storage, crDB *Database) ([]byte, error) {
 	// If any kind of configuration exists on Database object, then
 	// it will be used to fully override storage object.
 	// This is a temporary solution that should go away when it would
@@ -101,34 +102,24 @@ func buildConfiguration(cr *Storage, crDB *Database) (string, error) {
 		rawYamlConfiguration = cr.Spec.Configuration
 	}
 
-	dynconfig, err := TryParseDynconfig(rawYamlConfiguration)
-	if err == nil {
-		config, err := yaml.Marshal(dynconfig.Config)
-		return string(config), err
+	config := make(map[string]interface{})
+	if err := yaml.Unmarshal([]byte(rawYamlConfiguration), &config); err != nil {
+		return []byte(""), err
 	}
 
-	config := make(map[string]interface{})
-	err = yaml.Unmarshal([]byte(rawYamlConfiguration), &config)
-	if err != nil {
-		return "", err
+	dynconfig := schema.Dynconfig{}
+	if err := TryParseDynconfig(rawYamlConfiguration, &dynconfig); err == nil {
+		return yaml.Marshal(dynconfig.Config)
 	}
 
 	generatedConfig := generateSomeDefaults(cr, crDB)
 	tryFillMissingSections(config, generatedConfig)
 
-	data, err := yaml.Marshal(config)
-	if err != nil {
-		return "", err
-	}
-
-	return string(data), nil
+	return yaml.Marshal(config)
 }
 
-func TryParseDynconfig(rawYamlConfiguration string) (schema.Dynconfig, error) {
-	dynconfig := schema.Dynconfig{}
-	err := yaml.Unmarshal([]byte(rawYamlConfiguration), &dynconfig)
-	if err != nil {
-		return schema.Dynconfig{}, err
-	}
-	return dynconfig, nil
+func TryParseDynconfig(rawYamlConfiguration string, dynconfig *schema.Dynconfig) error {
+	dec := yaml.NewDecoder(bytes.NewReader([]byte(rawYamlConfiguration)))
+	dec.KnownFields(true)
+	return dec.Decode(&dynconfig)
 }

api/v1alpha1/database_webhook.go

@@ -145,7 +145,7 @@ func (r *DatabaseDefaulter) Default(ctx context.Context, obj runtime.Object) err
 	if err != nil {
 		return err
 	}
-	database.Spec.Configuration = configuration
+	database.Spec.Configuration = string(configuration)
 
 	return nil
 }

api/v1alpha1/storage_webhook.go

@@ -170,7 +170,7 @@ func (r *StorageDefaulter) Default(ctx context.Context, obj runtime.Object) erro
 	if err != nil {
 		return err
 	}
-	storage.Spec.Configuration = configuration
+	storage.Spec.Configuration = string(configuration)
 
 	return nil
 }

internal/configuration/schema/schema_test.go

@@ -70,7 +70,8 @@ func TestSchema(t *testing.T) {
 
 var _ = Describe("Testing schema", func() {
 	It("Parse dynconfig", func() {
-		dynconfig, err := v1alpha1.TryParseDynconfig(dynconfigExample)
+		dynconfig := schema.Dynconfig{}
+		err := v1alpha1.TryParseDynconfig(dynconfigExample, &dynconfig)
 		Expect(err).ShouldNot(HaveOccurred())
 		Expect(*dynconfig.Metadata).Should(BeEquivalentTo(schema.Metadata{
 			Version: 1,
@@ -79,6 +80,12 @@ var _ = Describe("Testing schema", func() {
 		Expect(dynconfig.Config["yaml_config_enabled"]).Should(BeTrue())
 	})
 
+	It("Try parse static config as dynconfig", func() {
+		dynconfig := schema.Dynconfig{}
+		err := v1alpha1.TryParseDynconfig(configurationExample, &dynconfig)
+		Expect(err).Should(HaveOccurred())
+	})
+
 	It("Parse static config", func() {
 		yamlConfig := schema.Configuration{}
 		err := yaml.Unmarshal([]byte(configurationExample), &yamlConfig)