Move config version validation before unmarshal

aserto-dev · Oct 25, 2023 · b14d5c4 · b14d5c4
1 parent e4bd026
commit b14d5c4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/cc/config/config.go b/pkg/cc/config/config.go
@@ -139,6 +139,11 @@ func NewConfig(configPath Path, log *zerolog.Logger, overrides Overrider, certsG
 		if err := v.ReadConfig(r); err != nil {
 			return nil, errors.Wrapf(err, "failed to parse config file '%s'", file)
 		}
+
+		err = validateVersion(v.GetInt("version"))
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	v.AutomaticEnv()

diff --git a/pkg/cc/config/topaz_config.go b/pkg/cc/config/topaz_config.go
@@ -62,10 +62,14 @@ func (co *CallOptions) ForPath(path string) *Options {
 func defaults(v *viper.Viper) {
 }
 
-func (c *Config) validation() error {
-	if c.Version != ConfigFileVersion {
+func validateVersion(version int) error {
+	if version != ConfigFileVersion {
 		return errors.New("unsupported config version")
 	}
+	return nil
+}
+
+func (c *Config) validation() error {
 	if _, ok := c.APIConfig.Services["authorizer"]; ok {
 		if c.Command.Mode == CommandModeRun && c.OPA.InstanceID == "" {
 			return errors.New("opa.instance_id not set")