Load controller defaults from config

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.
• I have read the CONTRIBUTING document.
• I have added tests to cover my changes.
• All new and existing tests passed.

nucleus/config.go

@@ -11,45 +11,49 @@ type Config struct {
 	BaseSouthBoundUUID uuid.UUID
 }
 
+func getUUIDFromViper(viperKey string) (uuid.UUID, error) {
+	UUIDAsString := viper.GetString(viperKey)
+	if UUIDAsString == "" {
+		newUUID := uuid.New()
+		viper.Set(viperKey, newUUID.String())
+		viper.WriteConfig()
+
+		return newUUID, nil
+	} else {
+		parsedUUID, err := uuid.Parse(UUIDAsString)
+		if err != nil {
+			return uuid.Nil, err
+		}
+
+		return parsedUUID, nil
+	}
+}
+
 func (c *Config) InitializeConfig() error {
 	var err error
 	basePNDUUIDConfigLookupKey := "basePNDUUID"
 	baseSouthBoundTypeConfigLookupKey := "baseSouthBoundType"
 	baseSouthBoundUUIDConfigLookupKey := "baseSouthBoundUUID"
 
-	// Check if there is already an PND uuid persistet in the viper config.
-	pndUUIDAsString := viper.GetString(basePNDUUIDConfigLookupKey)
+	basePNDUUID, err := getUUIDFromViper(basePNDUUIDConfigLookupKey)
+	if err != nil {
+		return err
+	}
 
-	if pndUUIDAsString == "" {
-		c.BasePndUUID = uuid.New()
-		viper.Set(basePNDUUIDConfigLookupKey, c.BasePndUUID.String())
-		viper.WriteConfig()
-	} else {
-		c.BasePndUUID, err = uuid.Parse(pndUUIDAsString)
-		if err != nil {
-			return err
-		}
+	c.BasePndUUID = basePNDUUID
+
+	baseSouthBoundUUID, err := getUUIDFromViper(baseSouthBoundUUIDConfigLookupKey)
+	if err != nil {
+		return err
 	}
 
+	c.BaseSouthBoundUUID = baseSouthBoundUUID
+
 	c.BaseSouthBoundType = viper.GetInt32("BaseSouthBoundType")
 	if c.BaseSouthBoundType != 0 {
 		viper.Set(baseSouthBoundTypeConfigLookupKey, 0)
 		viper.WriteConfig()
 	}
 
-	// Check if there is already an PND uuid persistet in the viper config.
-	southBoundUUIDAsString := viper.GetString(basePNDUUIDConfigLookupKey)
-
-	if southBoundUUIDAsString == "" {
-		c.BaseSouthBoundUUID = uuid.New()
-		viper.Set(baseSouthBoundUUIDConfigLookupKey, c.BaseSouthBoundUUID.String())
-		viper.WriteConfig()
-	} else {
-		c.BaseSouthBoundUUID, err = uuid.Parse(southBoundUUIDAsString)
-		if err != nil {
-			return err
-		}
-	}
-
 	return nil
 }