config: Don't export the validate* functions

cfergeau · anjannath · commit 6d83a8383940 · 2023-05-29T14:38:30.000+05:30
They are not used outside of the `config` package except for ValidateBool
(which is used in the preflight package to register the skip-* settings,
and which is still exported after this commit)

Since validateMemory can be overridden, it's better if it's only
possible to do this from within the `config` package, ie it's better if
it's validateMemory() and not ValidateMemory().
diff --git a/pkg/crc/config/secret_config_test.go b/pkg/crc/config/secret_config_test.go
@@ -15,8 +15,8 @@ const (
 func newTestConfigSecret() (*Config, error) {
 	cfg := New(NewEmptyInMemoryStorage(), NewEmptyInMemorySecretStorage())
 
-	cfg.AddSetting(password, Secret(""), ValidateString, SuccessfullyApplied, "")
-	cfg.AddSetting(secret, Secret("apples"), ValidateString, SuccessfullyApplied, "")
+	cfg.AddSetting(password, Secret(""), validateString, SuccessfullyApplied, "")
+	cfg.AddSetting(secret, Secret("apples"), validateString, SuccessfullyApplied, "")
 	return cfg, nil
 }
 
diff --git a/pkg/crc/config/settings.go b/pkg/crc/config/settings.go
@@ -46,16 +46,16 @@ func RegisterSettings(cfg *Config) {
 		return ValidateBool(value)
 	}
 
-	validateCPUs := func(value interface{}) (bool, string) {
-		return ValidateCPUs(value, GetPreset(cfg))
+	validCPUs := func(value interface{}) (bool, string) {
+		return validateCPUs(value, GetPreset(cfg))
 	}
 
-	validateMemory := func(value interface{}) (bool, string) {
-		return ValidateMemory(value, GetPreset(cfg))
+	validMemory := func(value interface{}) (bool, string) {
+		return validateMemory(value, GetPreset(cfg))
 	}
 
-	validateBundlePath := func(value interface{}) (bool, string) {
-		return ValidateBundlePath(value, GetPreset(cfg))
+	validBundlePath := func(value interface{}) (bool, string) {
+		return validateBundlePath(value, GetPreset(cfg))
 	}
 
 	validateSmbSharedDirs := func(value interface{}) (bool, string) {
@@ -73,16 +73,16 @@ func RegisterSettings(cfg *Config) {
 	cfg.AddSetting(Preset, version.GetDefaultPreset().String(), validatePreset, RequiresDeleteAndSetupMsg,
 		fmt.Sprintf("Virtual machine preset (valid values are: %s)", preset.AllPresets()))
 	// Start command settings in config
-	cfg.AddSetting(Bundle, defaultBundlePath(cfg), validateBundlePath, SuccessfullyApplied, BundleHelpMsg(cfg))
-	cfg.AddSetting(CPUs, defaultCPUs(cfg), validateCPUs, RequiresRestartMsg,
+	cfg.AddSetting(Bundle, defaultBundlePath(cfg), validBundlePath, SuccessfullyApplied, BundleHelpMsg(cfg))
+	cfg.AddSetting(CPUs, defaultCPUs(cfg), validCPUs, RequiresRestartMsg,
 		fmt.Sprintf("Number of CPU cores (must be greater than or equal to '%d')", defaultCPUs(cfg)))
-	cfg.AddSetting(Memory, defaultMemory(cfg), validateMemory, RequiresRestartMsg,
+	cfg.AddSetting(Memory, defaultMemory(cfg), validMemory, RequiresRestartMsg,
 		fmt.Sprintf("Memory size in MiB (must be greater than or equal to '%d')", defaultMemory(cfg)))
-	cfg.AddSetting(DiskSize, constants.DefaultDiskSize, ValidateDiskSize, RequiresRestartMsg,
+	cfg.AddSetting(DiskSize, constants.DefaultDiskSize, validateDiskSize, RequiresRestartMsg,
 		fmt.Sprintf("Total size in GiB of the disk (must be greater than or equal to '%d')", constants.DefaultDiskSize))
-	cfg.AddSetting(NameServer, "", ValidateIPAddress, SuccessfullyApplied,
+	cfg.AddSetting(NameServer, "", validateIPAddress, SuccessfullyApplied,
 		"IPv4 address of nameserver (string, like '1.1.1.1 or 8.8.8.8')")
-	cfg.AddSetting(PullSecretFile, "", ValidatePath, SuccessfullyApplied,
+	cfg.AddSetting(PullSecretFile, "", validatePath, SuccessfullyApplied,
 		fmt.Sprintf("Path of image pull secret (download from %s)", constants.CrcLandingPageURL))
 	cfg.AddSetting(DisableUpdateCheck, false, ValidateBool, SuccessfullyApplied,
 		"Disable update check (true/false, default: false)")
@@ -91,7 +91,7 @@ func RegisterSettings(cfg *Config) {
 
 	// Shared directories configs
 	if runtime.GOOS == "windows" {
-		cfg.AddSetting(SharedDirPassword, Secret(""), ValidateString, SuccessfullyApplied,
+		cfg.AddSetting(SharedDirPassword, Secret(""), validateString, SuccessfullyApplied,
 			"Password used while using CIFS/SMB file sharing (It is the password for the current logged in user)")
 
 		cfg.AddSetting(EnableSharedDirs, false, validateSmbSharedDirs, SuccessfullyApplied,
@@ -109,27 +109,27 @@ func RegisterSettings(cfg *Config) {
 	cfg.AddSetting(HostNetworkAccess, false, validateHostNetworkAccess, RequiresCleanupAndSetupMsg,
 		"Allow TCP/IP connections from the CRC VM to services running on the host (true/false, default: false)")
 	// Proxy Configuration
-	cfg.AddSetting(HTTPProxy, "", ValidateHTTPProxy, SuccessfullyApplied,
+	cfg.AddSetting(HTTPProxy, "", validateHTTPProxy, SuccessfullyApplied,
 		"HTTP proxy URL (string, like 'http://my-proxy.com:8443')")
-	cfg.AddSetting(HTTPSProxy, "", ValidateHTTPSProxy, SuccessfullyApplied,
+	cfg.AddSetting(HTTPSProxy, "", validateHTTPSProxy, SuccessfullyApplied,
 		"HTTPS proxy URL (string, like 'https://my-proxy.com:8443')")
-	cfg.AddSetting(NoProxy, "", ValidateNoProxy, SuccessfullyApplied,
+	cfg.AddSetting(NoProxy, "", validateNoProxy, SuccessfullyApplied,
 		"Hosts, ipv4 addresses or CIDR which do not use a proxy (string, comma-separated list such as '127.0.0.1,192.168.100.1/24')")
-	cfg.AddSetting(ProxyCAFile, "", ValidatePath, SuccessfullyApplied,
+	cfg.AddSetting(ProxyCAFile, "", validatePath, SuccessfullyApplied,
 		"Path to an HTTPS proxy certificate authority (CA)")
 
 	cfg.AddSetting(EnableClusterMonitoring, false, ValidateBool, SuccessfullyApplied,
 		"Enable cluster monitoring Operator (true/false, default: false)")
 
 	// Telemeter Configuration
-	cfg.AddSetting(ConsentTelemetry, "", ValidateYesNo, SuccessfullyApplied,
+	cfg.AddSetting(ConsentTelemetry, "", validateYesNo, SuccessfullyApplied,
 		"Consent to collection of anonymous usage data (yes/no)")
 
-	cfg.AddSetting(KubeAdminPassword, "", ValidateString, SuccessfullyApplied,
+	cfg.AddSetting(KubeAdminPassword, "", validateString, SuccessfullyApplied,
 		"User defined kubeadmin password")
-	cfg.AddSetting(IngressHTTPPort, constants.OpenShiftIngressHTTPPort, ValidatePort, RequiresHTTPPortChangeWarning,
+	cfg.AddSetting(IngressHTTPPort, constants.OpenShiftIngressHTTPPort, validatePort, RequiresHTTPPortChangeWarning,
 		fmt.Sprintf("HTTP port to use for OpenShift ingress/routes on the host (1024-65535, default: %d)", constants.OpenShiftIngressHTTPPort))
-	cfg.AddSetting(IngressHTTPSPort, constants.OpenShiftIngressHTTPSPort, ValidatePort, RequiresHTTPSPortChangeWarning,
+	cfg.AddSetting(IngressHTTPSPort, constants.OpenShiftIngressHTTPSPort, validatePort, RequiresHTTPSPortChangeWarning,
 		fmt.Sprintf("HTTPS port to use for OpenShift ingress/routes on the host (1024-65535, default: %d)", constants.OpenShiftIngressHTTPSPort))
 
 	if err := cfg.RegisterNotifier(Preset, presetChanged); err != nil {
diff --git a/pkg/crc/config/settings_test.go b/pkg/crc/config/settings_test.go
@@ -26,7 +26,7 @@ func validateMemoryNoPhysicalCheck(value interface{}, preset crcpreset.Preset) (
 }
 
 func newInMemoryConfig() (*Config, error) {
-	ValidateMemory = validateMemoryNoPhysicalCheck
+	validateMemory = validateMemoryNoPhysicalCheck
 	cfg := New(NewEmptyInMemoryStorage(), NewEmptyInMemorySecretStorage())
 
 	RegisterSettings(cfg)
diff --git a/pkg/crc/config/validations.go b/pkg/crc/config/validations.go
@@ -21,15 +21,15 @@ func ValidateBool(value interface{}) (bool, string) {
 	return true, ""
 }
 
-func ValidateString(value interface{}) (bool, string) {
+func validateString(value interface{}) (bool, string) {
 	if _, err := cast.ToStringE(value); err != nil {
 		return false, "must be a valid string"
 	}
 	return true, ""
 }
 
-// ValidateDiskSize checks if provided disk size is valid in the config
-func ValidateDiskSize(value interface{}) (bool, string) {
+// validateDiskSize checks if provided disk size is valid in the config
+func validateDiskSize(value interface{}) (bool, string) {
 	diskSize, err := cast.ToIntE(value)
 	if err != nil {
 		return false, fmt.Sprintf("could not convert '%s' to integer", value)
@@ -41,8 +41,8 @@ func ValidateDiskSize(value interface{}) (bool, string) {
 	return true, ""
 }
 
-// ValidateCPUs checks if provided cpus count is valid in the config
-func ValidateCPUs(value interface{}, preset crcpreset.Preset) (bool, string) {
+// validateCPUs checks if provided cpus count is valid in the config
+func validateCPUs(value interface{}, preset crcpreset.Preset) (bool, string) {
 	v, err := cast.ToIntE(value)
 	if err != nil {
 		return false, fmt.Sprintf("requires integer value >= %d", constants.GetDefaultCPUs(preset))
@@ -53,9 +53,9 @@ func ValidateCPUs(value interface{}, preset crcpreset.Preset) (bool, string) {
 	return true, ""
 }
 
-// ValidateMemory checks if provided memory is valid in the config
+// validateMemory checks if provided memory is valid in the config
 // It's defined as a variable so that it can be overridden in tests to disable the physical memory check
-var ValidateMemory = func(value interface{}, preset crcpreset.Preset) (bool, string) {
+var validateMemory = func(value interface{}, preset crcpreset.Preset) (bool, string) {
 	v, err := cast.ToIntE(value)
 	if err != nil {
 		return false, fmt.Sprintf("requires integer value in MiB >= %d", constants.GetDefaultMemory(preset))
@@ -66,55 +66,55 @@ var ValidateMemory = func(value interface{}, preset crcpreset.Preset) (bool, str
 	return true, ""
 }
 
-// ValidateBundlePath checks if the provided bundle path is valid
-func ValidateBundlePath(value interface{}, preset crcpreset.Preset) (bool, string) {
+// validateBundlePath checks if the provided bundle path is valid
+func validateBundlePath(value interface{}, preset crcpreset.Preset) (bool, string) {
 	if err := validation.ValidateBundlePath(cast.ToString(value), preset); err != nil {
 		return false, err.Error()
 	}
 	return true, ""
 }
 
-// ValidateIP checks if provided IP is valid
-func ValidateIPAddress(value interface{}) (bool, string) {
+// validateIP checks if provided IP is valid
+func validateIPAddress(value interface{}) (bool, string) {
 	if err := validation.ValidateIPAddress(cast.ToString(value)); err != nil {
 		return false, err.Error()
 	}
 	return true, ""
 }
 
-// ValidatePath checks if provided path is exist
-func ValidatePath(value interface{}) (bool, string) {
+// validatePath checks if provided path is exist
+func validatePath(value interface{}) (bool, string) {
 	if err := validation.ValidatePath(cast.ToString(value)); err != nil {
 		return false, err.Error()
 	}
 	return true, ""
 }
 
-// ValidateHTTPProxy checks if given URI is valid for a HTTP proxy
-func ValidateHTTPProxy(value interface{}) (bool, string) {
+// validateHTTPProxy checks if given URI is valid for a HTTP proxy
+func validateHTTPProxy(value interface{}) (bool, string) {
 	if err := network.ValidateProxyURL(cast.ToString(value), false); err != nil {
 		return false, err.Error()
 	}
 	return true, ""
 }
 
-// ValidateHTTPSProxy checks if given URI is valid for a HTTPS proxy
-func ValidateHTTPSProxy(value interface{}) (bool, string) {
+// validateHTTPSProxy checks if given URI is valid for a HTTPS proxy
+func validateHTTPSProxy(value interface{}) (bool, string) {
 	if err := network.ValidateProxyURL(cast.ToString(value), true); err != nil {
 		return false, err.Error()
 	}
 	return true, ""
 }
 
-// ValidateNoProxy checks if the NoProxy string has the correct format
-func ValidateNoProxy(value interface{}) (bool, string) {
+// validateNoProxy checks if the NoProxy string has the correct format
+func validateNoProxy(value interface{}) (bool, string) {
 	if strings.Contains(cast.ToString(value), " ") {
 		return false, "NoProxy string can't contain spaces"
 	}
 	return true, ""
 }
 
-func ValidateYesNo(value interface{}) (bool, string) {
+func validateYesNo(value interface{}) (bool, string) {
 	if cast.ToString(value) == "yes" || cast.ToString(value) == "no" {
 		return true, ""
 	}
@@ -129,7 +129,7 @@ func validatePreset(value interface{}) (bool, string) {
 	return true, ""
 }
 
-func ValidatePort(value interface{}) (bool, string) {
+func validatePort(value interface{}) (bool, string) {
 	port, err := cast.ToUintE(value)
 	if err != nil {
 		return false, "Requires integer value in range of 1024-65535"
diff --git a/pkg/crc/config/viper_config_test.go b/pkg/crc/config/viper_config_test.go
@@ -17,8 +17,8 @@ const (
 )
 
 func newTestConfig(configFile, envPrefix string) (*Config, error) {
-	validateCPUs := func(value interface{}) (bool, string) {
-		return ValidateCPUs(value, preset.OpenShift)
+	validCPUs := func(value interface{}) (bool, string) {
+		return validateCPUs(value, preset.OpenShift)
 	}
 	storage, err := NewViperStorage(configFile, envPrefix)
 	if err != nil {
@@ -27,8 +27,8 @@ func newTestConfig(configFile, envPrefix string) (*Config, error) {
 
 	secretStorage := NewEmptyInMemorySecretStorage()
 	config := New(storage, secretStorage)
-	config.AddSetting(cpus, 4, validateCPUs, RequiresRestartMsg, "")
-	config.AddSetting(nameServer, "", ValidateIPAddress, SuccessfullyApplied, "")
+	config.AddSetting(cpus, 4, validCPUs, RequiresRestartMsg, "")
+	config.AddSetting(nameServer, "", validateIPAddress, SuccessfullyApplied, "")
 	return config, nil
 }
 
@@ -142,14 +142,14 @@ func TestViperConfigBindFlagSet(t *testing.T) {
 	dir := t.TempDir()
 	configFile := filepath.Join(dir, "crc.json")
 
-	validateCPUs := func(value interface{}) (bool, string) {
-		return ValidateCPUs(value, preset.OpenShift)
+	validCPUs := func(value interface{}) (bool, string) {
+		return validateCPUs(value, preset.OpenShift)
 	}
 	storage, err := NewViperStorage(configFile, "CRC")
 	require.NoError(t, err)
 	config := New(storage, NewEmptyInMemorySecretStorage())
-	config.AddSetting(cpus, 4, validateCPUs, RequiresRestartMsg, "")
-	config.AddSetting(nameServer, "", ValidateIPAddress, SuccessfullyApplied, "")
+	config.AddSetting(cpus, 4, validCPUs, RequiresRestartMsg, "")
+	config.AddSetting(nameServer, "", validateIPAddress, SuccessfullyApplied, "")
 
 	flagSet := pflag.NewFlagSet("start", pflag.ExitOnError)
 	flagSet.IntP(cpus, "c", 4, "")

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ const (`
`15`	`15`	`func newTestConfigSecret() (*Config, error) {`
`16`	`16`	`cfg := New(NewEmptyInMemoryStorage(), NewEmptyInMemorySecretStorage())`
`17`	`17`
`18`		`- cfg.AddSetting(password, Secret(""), ValidateString, SuccessfullyApplied, "")`
`19`		`- cfg.AddSetting(secret, Secret("apples"), ValidateString, SuccessfullyApplied, "")`
	`18`	`+ cfg.AddSetting(password, Secret(""), validateString, SuccessfullyApplied, "")`
	`19`	`+ cfg.AddSetting(secret, Secret("apples"), validateString, SuccessfullyApplied, "")`
`20`	`20`	`return cfg, nil`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func validateMemoryNoPhysicalCheck(value interface{}, preset crcpreset.Preset) (`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func newInMemoryConfig() (*Config, error) {`
`29`		`- ValidateMemory = validateMemoryNoPhysicalCheck`
	`29`	`+ validateMemory = validateMemoryNoPhysicalCheck`
`30`	`30`	`cfg := New(NewEmptyInMemoryStorage(), NewEmptyInMemorySecretStorage())`
`31`	`31`
`32`	`32`	`RegisterSettings(cfg)`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@ func ValidateBool(value interface{}) (bool, string) {`
`21`	`21`	`return true, ""`
`22`	`22`	`}`
`23`	`23`
`24`		`-func ValidateString(value interface{}) (bool, string) {`
	`24`	`+func validateString(value interface{}) (bool, string) {`
`25`	`25`	`if _, err := cast.ToStringE(value); err != nil {`
`26`	`26`	`return false, "must be a valid string"`
`27`	`27`	`}`
`28`	`28`	`return true, ""`
`29`	`29`	`}`
`30`	`30`
`31`		`-// ValidateDiskSize checks if provided disk size is valid in the config`
`32`		`-func ValidateDiskSize(value interface{}) (bool, string) {`
	`31`	`+// validateDiskSize checks if provided disk size is valid in the config`
	`32`	`+func validateDiskSize(value interface{}) (bool, string) {`
`33`	`33`	`diskSize, err := cast.ToIntE(value)`
`34`	`34`	`if err != nil {`
`35`	`35`	`return false, fmt.Sprintf("could not convert '%s' to integer", value)`
`@@ -41,8 +41,8 @@ func ValidateDiskSize(value interface{}) (bool, string) {`
`41`	`41`	`return true, ""`
`42`	`42`	`}`
`43`	`43`
`44`		`-// ValidateCPUs checks if provided cpus count is valid in the config`
`45`		`-func ValidateCPUs(value interface{}, preset crcpreset.Preset) (bool, string) {`
	`44`	`+// validateCPUs checks if provided cpus count is valid in the config`
	`45`	`+func validateCPUs(value interface{}, preset crcpreset.Preset) (bool, string) {`
`46`	`46`	`v, err := cast.ToIntE(value)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return false, fmt.Sprintf("requires integer value >= %d", constants.GetDefaultCPUs(preset))`
`@@ -53,9 +53,9 @@ func ValidateCPUs(value interface{}, preset crcpreset.Preset) (bool, string) {`
`53`	`53`	`return true, ""`
`54`	`54`	`}`
`55`	`55`
`56`		`-// ValidateMemory checks if provided memory is valid in the config`
	`56`	`+// validateMemory checks if provided memory is valid in the config`
`57`	`57`	`// It's defined as a variable so that it can be overridden in tests to disable the physical memory check`
`58`		`-var ValidateMemory = func(value interface{}, preset crcpreset.Preset) (bool, string) {`
	`58`	`+var validateMemory = func(value interface{}, preset crcpreset.Preset) (bool, string) {`
`59`	`59`	`v, err := cast.ToIntE(value)`
`60`	`60`	`if err != nil {`
`61`	`61`	`return false, fmt.Sprintf("requires integer value in MiB >= %d", constants.GetDefaultMemory(preset))`
`@@ -66,55 +66,55 @@ var ValidateMemory = func(value interface{}, preset crcpreset.Preset) (bool, str`
`66`	`66`	`return true, ""`
`67`	`67`	`}`
`68`	`68`
`69`		`-// ValidateBundlePath checks if the provided bundle path is valid`
`70`		`-func ValidateBundlePath(value interface{}, preset crcpreset.Preset) (bool, string) {`
	`69`	`+// validateBundlePath checks if the provided bundle path is valid`
	`70`	`+func validateBundlePath(value interface{}, preset crcpreset.Preset) (bool, string) {`
`71`	`71`	`if err := validation.ValidateBundlePath(cast.ToString(value), preset); err != nil {`
`72`	`72`	`return false, err.Error()`
`73`	`73`	`}`
`74`	`74`	`return true, ""`
`75`	`75`	`}`
`76`	`76`
`77`		`-// ValidateIP checks if provided IP is valid`
`78`		`-func ValidateIPAddress(value interface{}) (bool, string) {`
	`77`	`+// validateIP checks if provided IP is valid`
	`78`	`+func validateIPAddress(value interface{}) (bool, string) {`
`79`	`79`	`if err := validation.ValidateIPAddress(cast.ToString(value)); err != nil {`
`80`	`80`	`return false, err.Error()`
`81`	`81`	`}`
`82`	`82`	`return true, ""`
`83`	`83`	`}`
`84`	`84`
`85`		`-// ValidatePath checks if provided path is exist`
`86`		`-func ValidatePath(value interface{}) (bool, string) {`
	`85`	`+// validatePath checks if provided path is exist`
	`86`	`+func validatePath(value interface{}) (bool, string) {`
`87`	`87`	`if err := validation.ValidatePath(cast.ToString(value)); err != nil {`
`88`	`88`	`return false, err.Error()`
`89`	`89`	`}`
`90`	`90`	`return true, ""`
`91`	`91`	`}`
`92`	`92`
`93`		`-// ValidateHTTPProxy checks if given URI is valid for a HTTP proxy`
`94`		`-func ValidateHTTPProxy(value interface{}) (bool, string) {`
	`93`	`+// validateHTTPProxy checks if given URI is valid for a HTTP proxy`
	`94`	`+func validateHTTPProxy(value interface{}) (bool, string) {`
`95`	`95`	`if err := network.ValidateProxyURL(cast.ToString(value), false); err != nil {`
`96`	`96`	`return false, err.Error()`
`97`	`97`	`}`
`98`	`98`	`return true, ""`
`99`	`99`	`}`
`100`	`100`
`101`		`-// ValidateHTTPSProxy checks if given URI is valid for a HTTPS proxy`
`102`		`-func ValidateHTTPSProxy(value interface{}) (bool, string) {`
	`101`	`+// validateHTTPSProxy checks if given URI is valid for a HTTPS proxy`
	`102`	`+func validateHTTPSProxy(value interface{}) (bool, string) {`
`103`	`103`	`if err := network.ValidateProxyURL(cast.ToString(value), true); err != nil {`
`104`	`104`	`return false, err.Error()`
`105`	`105`	`}`
`106`	`106`	`return true, ""`
`107`	`107`	`}`
`108`	`108`
`109`		`-// ValidateNoProxy checks if the NoProxy string has the correct format`
`110`		`-func ValidateNoProxy(value interface{}) (bool, string) {`
	`109`	`+// validateNoProxy checks if the NoProxy string has the correct format`
	`110`	`+func validateNoProxy(value interface{}) (bool, string) {`
`111`	`111`	`if strings.Contains(cast.ToString(value), " ") {`
`112`	`112`	`return false, "NoProxy string can't contain spaces"`
`113`	`113`	`}`
`114`	`114`	`return true, ""`
`115`	`115`	`}`
`116`	`116`
`117`		`-func ValidateYesNo(value interface{}) (bool, string) {`
	`117`	`+func validateYesNo(value interface{}) (bool, string) {`
`118`	`118`	`if cast.ToString(value) == "yes" \|\| cast.ToString(value) == "no" {`
`119`	`119`	`return true, ""`
`120`	`120`	`}`
`@@ -129,7 +129,7 @@ func validatePreset(value interface{}) (bool, string) {`
`129`	`129`	`return true, ""`
`130`	`130`	`}`
`131`	`131`
`132`		`-func ValidatePort(value interface{}) (bool, string) {`
	`132`	`+func validatePort(value interface{}) (bool, string) {`
`133`	`133`	`port, err := cast.ToUintE(value)`
`134`	`134`	`if err != nil {`
`135`	`135`	`return false, "Requires integer value in range of 1024-65535"`