replic arange format and regex verification for serviceID in service.… (#1528)

prithvi081099 · web-flow · commit ed37cdaa500e · 2021-02-17T15:46:37.000+05:30
diff --git a/space-cli/cmd/modules/addons/database.go b/space-cli/cmd/modules/addons/database.go
@@ -26,7 +26,7 @@ func addDatabase(chartReleaseName, dbType, setValuesFlag, valuesYamlFile, chartL
 	}
 
 	// The regex stratifies kubernetes resource name specification
-	var validID = regexp.MustCompile(`[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*`)
+	var validID = regexp.MustCompile(`^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$`)
 	if !validID.MatchString(chartReleaseName) {
 		return fmt.Errorf(`invalid name for database: (%s): a DNS-1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'`, chartReleaseName)
 	}
diff --git a/space-cli/cmd/modules/deploy/commands.go b/space-cli/cmd/modules/deploy/commands.go
@@ -48,11 +48,8 @@ func Commands() []*cobra.Command {
 }
 
 func actionDeploy(cmd *cobra.Command, args []string) error {
-	projectID, check := utils.GetProjectID()
-	if !check {
-		_ = utils.LogError("Project not specified in flag", nil)
-		return nil
-	}
+	projectID, _ := utils.GetProjectID()
+
 	dockerFilePath := viper.GetString("docker-file")
 	dockerImage := viper.GetString("image-name")
 	serviceFilePath := viper.GetString("service-file")
diff --git a/space-cli/cmd/modules/services/generate.go b/space-cli/cmd/modules/services/generate.go
@@ -2,6 +2,7 @@ package services
 
 import (
 	"fmt"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -22,8 +23,15 @@ func GenerateService(projectID, dockerImage string) (*model.SpecObject, error) {
 	}
 
 	serviceID := ""
-	if err := input.Survey.AskOne(&survey.Input{Message: "Enter Service ID"}, &serviceID); err != nil {
-		return nil, err
+	for {
+		if err := input.Survey.AskOne(&survey.Input{Message: "Enter Service ID"}, &serviceID); err != nil {
+			return nil, err
+		}
+		var validID = regexp.MustCompile(`^(([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])\.)*([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$`)
+		if validID.MatchString(serviceID) {
+			break
+		}
+		fmt.Printf(`invalid name for serviceID: (%s): a DNS-1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'`, serviceID)
 	}
 
 	serviceVersion := ""
@@ -78,8 +86,15 @@ func GenerateService(projectID, dockerImage string) (*model.SpecObject, error) {
 	}
 
 	replicaRange := ""
-	if err := input.Survey.AskOne(&survey.Input{Message: "Enter Replica Range", Default: "1-100"}, &replicaRange); err != nil {
-		return nil, err
+	for {
+		if err := input.Survey.AskOne(&survey.Input{Message: "Enter Replica Range", Default: "1-100"}, &replicaRange); err != nil {
+			return nil, err
+		}
+		arr1 := strings.Split(replicaRange, "-")
+		if len(arr1) == 2 {
+			break
+		}
+		fmt.Println("Replica Range format should be lowerLimit-upperLimit (e.g. 1-100).")
 	}
 	replicaMin, replicaMax := 1, 100
 	arr := strings.Split(replicaRange, "-")
diff --git a/space-cli/cmd/modules/services/generate_test.go b/space-cli/cmd/modules/services/generate_test.go
@@ -71,7 +71,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",
@@ -88,7 +88,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",
@@ -110,7 +110,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",
@@ -153,7 +153,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",
@@ -180,7 +180,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",
@@ -212,7 +212,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",
@@ -244,7 +244,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",
@@ -281,7 +281,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",
@@ -323,7 +323,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",
@@ -365,7 +365,7 @@ func TestGenerateService(t *testing.T) {
 				{
 					method:         "AskOne",
 					args:           []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},
-					paramsReturned: []interface{}{nil, ""},
+					paramsReturned: []interface{}{nil, "basic"},
 				},
 				{
 					method:         "AskOne",

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func addDatabase(chartReleaseName, dbType, setValuesFlag, valuesYamlFile, chartL`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// The regex stratifies kubernetes resource name specification`
`29`		- var validID = regexp.MustCompile(`[a-z0-9]([-a-z0-9][a-z0-9])?(\.[a-z0-9]([-a-z0-9][a-z0-9])?)*`)
	`29`	+ var validID = regexp.MustCompile(`^(([a-z0-9]\|[a-z0-9][a-z0-9\-][a-z0-9])\.)([a-z0-9]\|[a-z0-9][a-z0-9\-]*[a-z0-9])$`)
`30`	`30`	`if !validID.MatchString(chartReleaseName) {`
`31`	`31`	return fmt.Errorf(`invalid name for database: (%s): a DNS-1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character (e.g. 'example.com', regex used for validation is '[a-z0-9]([-a-z0-9][a-z0-9])?(\.[a-z0-9]([-a-z0-9][a-z0-9])?)*'`, chartReleaseName)
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func TestGenerateService(t *testing.T) {`
`71`	`71`	`{`
`72`	`72`	`method: "AskOne",`
`73`	`73`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`74`		`- paramsReturned: []interface{}{nil, ""},`
	`74`	`+ paramsReturned: []interface{}{nil, "basic"},`
`75`	`75`	`},`
`76`	`76`	`{`
`77`	`77`	`method: "AskOne",`
`@@ -88,7 +88,7 @@ func TestGenerateService(t *testing.T) {`
`88`	`88`	`{`
`89`	`89`	`method: "AskOne",`
`90`	`90`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`91`		`- paramsReturned: []interface{}{nil, ""},`
	`91`	`+ paramsReturned: []interface{}{nil, "basic"},`
`92`	`92`	`},`
`93`	`93`	`{`
`94`	`94`	`method: "AskOne",`
`@@ -110,7 +110,7 @@ func TestGenerateService(t *testing.T) {`
`110`	`110`	`{`
`111`	`111`	`method: "AskOne",`
`112`	`112`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`113`		`- paramsReturned: []interface{}{nil, ""},`
	`113`	`+ paramsReturned: []interface{}{nil, "basic"},`
`114`	`114`	`},`
`115`	`115`	`{`
`116`	`116`	`method: "AskOne",`
`@@ -153,7 +153,7 @@ func TestGenerateService(t *testing.T) {`
`153`	`153`	`{`
`154`	`154`	`method: "AskOne",`
`155`	`155`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`156`		`- paramsReturned: []interface{}{nil, ""},`
	`156`	`+ paramsReturned: []interface{}{nil, "basic"},`
`157`	`157`	`},`
`158`	`158`	`{`
`159`	`159`	`method: "AskOne",`
`@@ -180,7 +180,7 @@ func TestGenerateService(t *testing.T) {`
`180`	`180`	`{`
`181`	`181`	`method: "AskOne",`
`182`	`182`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`183`		`- paramsReturned: []interface{}{nil, ""},`
	`183`	`+ paramsReturned: []interface{}{nil, "basic"},`
`184`	`184`	`},`
`185`	`185`	`{`
`186`	`186`	`method: "AskOne",`
`@@ -212,7 +212,7 @@ func TestGenerateService(t *testing.T) {`
`212`	`212`	`{`
`213`	`213`	`method: "AskOne",`
`214`	`214`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`215`		`- paramsReturned: []interface{}{nil, ""},`
	`215`	`+ paramsReturned: []interface{}{nil, "basic"},`
`216`	`216`	`},`
`217`	`217`	`{`
`218`	`218`	`method: "AskOne",`
`@@ -244,7 +244,7 @@ func TestGenerateService(t *testing.T) {`
`244`	`244`	`{`
`245`	`245`	`method: "AskOne",`
`246`	`246`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`247`		`- paramsReturned: []interface{}{nil, ""},`
	`247`	`+ paramsReturned: []interface{}{nil, "basic"},`
`248`	`248`	`},`
`249`	`249`	`{`
`250`	`250`	`method: "AskOne",`
`@@ -281,7 +281,7 @@ func TestGenerateService(t *testing.T) {`
`281`	`281`	`{`
`282`	`282`	`method: "AskOne",`
`283`	`283`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`284`		`- paramsReturned: []interface{}{nil, ""},`
	`284`	`+ paramsReturned: []interface{}{nil, "basic"},`
`285`	`285`	`},`
`286`	`286`	`{`
`287`	`287`	`method: "AskOne",`
`@@ -323,7 +323,7 @@ func TestGenerateService(t *testing.T) {`
`323`	`323`	`{`
`324`	`324`	`method: "AskOne",`
`325`	`325`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`326`		`- paramsReturned: []interface{}{nil, ""},`
	`326`	`+ paramsReturned: []interface{}{nil, "basic"},`
`327`	`327`	`},`
`328`	`328`	`{`
`329`	`329`	`method: "AskOne",`
`@@ -365,7 +365,7 @@ func TestGenerateService(t *testing.T) {`
`365`	`365`	`{`
`366`	`366`	`method: "AskOne",`
`367`	`367`	`args: []interface{}{&survey.Input{Message: "Enter Service ID"}, &surveyReturnValue, mock.Anything},`
`368`		`- paramsReturned: []interface{}{nil, ""},`
	`368`	`+ paramsReturned: []interface{}{nil, "basic"},`
`369`	`369`	`},`
`370`	`370`	`{`
`371`	`371`	`method: "AskOne",`