feat(config): ip address should be required and can be a domain

budimanjojo · Sep 21, 2022 · af36ff3 · af36ff3
1 parent 84f50ed
commit af36ff3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/pkg/config/validate/config.go b/pkg/config/validate/config.go
@@ -33,7 +33,7 @@ type CNIConfig struct {
 
 type Node struct {
 	Hostname            string                   `validate:"required"`
-	IPAddress           string                   `validate:"isIP"`
+	IPAddress           string                   `validate:"required|isDomainOrIP"`
 	ControlPlane        string                   `validate:"isBool"`
 	InstallDisk         string                   `validate:"requiredWithout:Nodes.InstallDiskSelector"`
 	InstallDiskSelector *InstallDiskSelector
@@ -160,5 +160,6 @@ func (c Config) Messages() map[string]string {
 		"isBool":                    "{field} is not a valid boolean (true or false)",
 		"isInt":                     "{field} is not a valid integer",
 		"isUint":                    "{field} is not a valid unsigned integer",
+		"isDomainOrIP":				 "{field} is not a valid domain or IP address",
 	}
 }
diff --git a/pkg/config/validate/validator.go b/pkg/config/validate/validator.go
@@ -85,3 +85,11 @@ func (c Config) IsDomain(domain string) bool {
 	}
 	return regexp.MustCompile(`^([a-zA-Z0-9_]{1}[a-zA-Z0-9_-]{0,62}){1}(\.[a-zA-Z0-9_]{1}[a-zA-Z0-9_-]{0,62})*[\._]?$`).MatchString(domain)
 }
+
+func (c Config) IsDomainOrIP(domainIP string) bool {
+	if c.IsDomain(domainIP) || validate.IsIP(domainIP) {
+		return true
+	}
+
+	return false
+}