update App.Attach.Domain

Author: Mehrad

cmd/application.go

@@ -283,34 +283,32 @@ func AppAttachDomain(appName, domainName, path, endpoint string) (*ybApi.AppStat
 
 func appAttachDomain(cmd *cobra.Command, args []string) {
 	var (
-		app  = cmd.Flag("application").Value.String()
-		dom  = cmd.Flag("domain").Value.String()
-		path = cmd.Flag("path").Value.String()
-		ep   = cmd.Flag("endpoint").Value.String()
+		app  = forceFlagGetStrValue(cmd, "application", "Enter Application Name:")
+		dom  = forceFlagGetStrValue(cmd, "domain", "Enter Domain:")
+		path = forceFlagGetStrValue(cmd, "path", "Enter Path:")
+		ep   = forceFlagGetStrValue(cmd, "endpoint", "Enter Endpoint [ format: 8080/http ]:")
 	)
 
-	if app == "" {
-		app = readFromConsole("Enter Application Name:")
-	}
-	if dom == "" {
-		dom = readFromConsole("Enter Domain:")
-	}
-	if path == "" {
-		dom = readFromConsole("Enter Path:")
-	}
-
 	res, err := AppAttachDomain(app, dom, path, ep)
 
 	uiCheckErr("Could not Attach the Domain for Application", err)
 	uiApplicationStatus(res)
 }
 
 func appDetachDomain(cmd *cobra.Command, args []string) {
+	var (
+		app  = forceFlagGetStrValue(cmd, "application", "Enter Application Name:")
+		dom  = forceFlagGetStrValue(cmd, "domain", "Enter Domain:")
+		path = forceFlagGetStrValue(cmd, "path", "Enter Path:")
+		ep   = forceFlagGetStrValue(cmd, "endpoint", "Enter Endpoint [ format: 8080/http ]:")
+	)
+
 	req := new(ybApi.SrvDomainAttachReq)
 	req.AttachIdentity = new(ybApi.AttachIdentity)
-	req.AttachIdentity.Name = cmd.Flag("application").Value.String()
-	req.AttachIdentity.Attachment = cmd.Flag("domain").Value.String()
-	req.Path = cmd.Flag("path").Value.String()
+	req.AttachIdentity.Name = app
+	req.AttachIdentity.Attachment = dom
+	req.Path = path
+	req.Endpoint = ep
 
 	client := grpcConnect()
 	defer client.Close()

cmd/utils.go

@@ -5,8 +5,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"log"
 	"io/ioutil"
+	"log"
 	"os"
 	"strings"
 	"syscall"
@@ -41,6 +41,14 @@ func arrayFlagToMap(flags []string) map[string]string {
 	return varMap
 }
 
+func forceFlagGetStrValue(cmd *cobra.Command, flagName, inputAnswr string) (val string) {
+	val = cmd.Flag(flagName).Value.String()
+	if val == "" {
+		val = readFromConsole(inputAnswr)
+	}
+	return
+}
+
 func readFromConsole(inputAnswr string) (val string) {
 	fmt.Print(inputAnswr)
 	reader := bufio.NewReader(os.Stdin)
@@ -62,7 +70,6 @@ func readPasswordFromConsole(inputAnswr string) (val string) {
 	return strings.TrimSpace(password)
 }
 
-
 func grpcConnect() ybApi.Client {
 	return ybApi.Connect(
 		viper.GetString(config.KEY_HOST),