adding support and validation for providing FQDN (#137)

vmware-tanzu · Jan 3, 2022 · 4adbee3 · 4adbee3
1 parent 595198f
commit 4adbee3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/vdoctl/cmd/drivers.go b/vdoctl/cmd/drivers.go
@@ -131,7 +131,7 @@ var driversCmd = &cobra.Command{
 		isCPIRequired := utils.PromptGetInput("Do you want to configure CloudProvider? (Y/N)", errors.New("invalid input"), utils.IsString)
 
 		if strings.EqualFold(isCPIRequired, "Y") {
-			fmt.Printf("Please provide the vcenter IP for configuring CloudProvider \n")
+			fmt.Printf("Please provide the vcenter IP/FQDN for configuring CloudProvider \n")
 
 		multivcloop:
 			for {
@@ -217,7 +217,7 @@ var driversCmd = &cobra.Command{
 			csi.insecure = cpi.insecure
 			csi.thumbprint = cpi.thumbprint
 		} else {
-			fmt.Printf("Please provide the vcenter IP for configuring StorageProvider \n")
+			fmt.Printf("Please provide the vcenter IP/FQDN for configuring StorageProvider \n")
 			fetchVCIP(&csi, labels)
 			if !csi.insecure {
 				fetchThumbprint(&csi, labels)
@@ -422,7 +422,7 @@ func createVDOConfig(cl client.Client, ctx context.Context, cpi credentials, csi
 }
 
 func fetchVCIP(cred *credentials, labels credentials) {
-	vcIp := utils.PromptGetInput(labels.vcIp, errors.New("unable to get the IP Address - Invalid input"), utils.IsIP)
+	vcIp := utils.PromptGetInput(labels.vcIp, errors.New("unable to get the IP Address/ FQDN - Invalid input"), utils.IsIPorFQDN)
 	cred.vcIp = vcIp
 
 	res := utils.PromptGetInput("Do you want to establish a secure connection? (Y/N)", errors.New("invalid input"), utils.IsString)

diff --git a/vdoctl/pkg/utils/promptutil.go b/vdoctl/pkg/utils/promptutil.go
@@ -7,16 +7,17 @@ import (
 	"net"
 	"net/url"
 	"os"
+	"regexp"
 	"strings"
 )
 
 type ValidationFlags string
 
 const (
-	IsPwd    ValidationFlags = "isPwd"
-	IsURL    ValidationFlags = "isURL"
-	IsIP     ValidationFlags = "isIP"
-	IsString ValidationFlags = "isString"
+	IsPwd      ValidationFlags = "isPwd"
+	IsURL      ValidationFlags = "isURL"
+	IsIPorFQDN ValidationFlags = "isIPorFQDN"
+	IsString   ValidationFlags = "isString"
 )
 
 func CheckIfUrl(str string) bool {
@@ -39,6 +40,12 @@ func checkIPAddress(ip string) bool {
 	return net.ParseIP(ip) != nil
 }
 
+func checkIfFQDN(domain string) bool {
+	RegExp := 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})+[\._]?[^\.]$`)
+	return RegExp.MatchString(domain)
+
+}
+
 func PromptGetInput(label string, err error, flag ValidationFlags) string {
 	validate := func(input string) error {
 		if len(input) <= 0 {
@@ -50,8 +57,8 @@ func PromptGetInput(label string, err error, flag ValidationFlags) string {
 
 		}
 
-		if flag == IsIP && !checkIPAddress(input) {
-			return errors.New("Please provide a valid IP address")
+		if flag == IsIPorFQDN && !(checkIPAddress(input) || checkIfFQDN(input)) {
+			return errors.New("Please provide a valid IP address/ FQDN")
 		}
 		return nil
 	}