[BE]:Handle validation check (#411)

* Handle validation check

* Fix

* Fix

* Update

* Refactor

* Refactor

* Fix bug related with silent mode

* Up version

* Lint

Author: PhilippPlotnikov

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.363
+VERSION=v0.0.364
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/common.go

@@ -215,21 +215,27 @@ func getRuntimeNameFromUserSelect(ctx context.Context) (string, error) {
 }
 
 func getRuntimeNameFromUserInput() (string, error) {
-	return getValueFromUserInput("Runtime name", "codefresh")
+	runtimeName, err := getValueFromUserInput("Runtime name", "codefresh", validateRuntimeName)
+	return runtimeName, err
 }
 
-func getValueFromUserInput(label, defaultValue string) (string, error) {
-	prompt := promptui.Prompt{
-		Label:   label,
-		Default: defaultValue,
-		// Validate: func (value string) error {
-		// 	if value == "" {
-		// 		return fmt.Errorf("Must supply value for \"%s\"", label)
-		// 	}
+func validateRuntimeName(runtime string) error {
+	isValid, err := IsValidName(runtime)
+	if err != nil {
+		return fmt.Errorf("failed to validate runtime name: %w", err)
+	}
+	if !isValid {
+		return fmt.Errorf("runtime name cannot have any uppercase letters, must start with a character, end with character or number, and be shorter than 63 chars")
+	}
+	return nil
+}
 
-		// 	return nil
-		// },
-		Pointer: promptui.PipeCursor,
+func getValueFromUserInput(label, defaultValue string, validate promptui.ValidateFunc) (string, error) {
+	prompt := promptui.Prompt{
+		Label:    label,
+		Default:  defaultValue,
+		Validate: validate,
+		Pointer:  promptui.PipeCursor,
 	}
 
 	return prompt.Run()
@@ -270,8 +276,10 @@ func inferProviderFromRepo(opts *git.CloneOptions) {
 }
 
 func ensureGitToken(cmd *cobra.Command, cloneOpts *git.CloneOptions, verify bool) error {
+	errMessage := "Value from environment variable TOKEN is not valid, enter another value"
 	if cloneOpts.Auth.Password == "" && !store.Get().Silent {
 		err := getGitTokenFromUserInput(cmd)
+		errMessage = "Entered git token is not valid, enter another value please"
 		if err != nil {
 			return err
 		}
@@ -280,10 +288,11 @@ func ensureGitToken(cmd *cobra.Command, cloneOpts *git.CloneOptions, verify bool
 	if verify {
 		err := cfgit.VerifyToken(cmd.Context(), cloneOpts.Provider, cloneOpts.Auth.Password, cfgit.RuntimeToken)
 		if err != nil {
-			return fmt.Errorf("failed to verify git token: %w", err)
+			// in case when we get invalid value from env variable TOKEN we clean
+			cloneOpts.Auth.Password = ""
+			return fmt.Errorf(errMessage)
 		}
 	}
-
 	return nil
 }
 
@@ -485,12 +494,7 @@ func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 }
 
 func getIngressHostFromUserInput(foundIngressHost string) (string, error) {
-	ingressHostInput, err := getValueFromUserInput("Ingress host", foundIngressHost)
-	if err != nil {
-		return "", err
-	}
-
-	err = validateIngressHost(ingressHostInput)
+	ingressHostInput, err := getValueFromUserInput("Ingress host", foundIngressHost, validateIngressHost)
 	if err != nil {
 		return "", err
 	}
@@ -592,6 +596,22 @@ func askUserIfToProceedWithInsecure(ctx context.Context) error {
 	return nil
 }
 
+type Callback func() error
+
+func handleValidationFailsWithRepeat(callback Callback) {
+	var err error
+	for {
+		err = callback()
+		if !isValidationError(err) {
+			break
+		}
+	}
+}
+
+func isValidationError(err error) bool {
+	return err != nil && err != promptui.ErrInterrupt
+}
+
 func setIscRepo(ctx context.Context, suggestedSharedConfigRepo string) (string, error) {
 	setIscRepoResponse, err := cfConfig.NewClient().V2().Runtime().SetSharedConfigRepo(ctx, suggestedSharedConfigRepo)
 	if err != nil {

cmd/commands/runtime.go

@@ -346,7 +346,7 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 
 	inferProviderFromRepo(opts.InsCloneOpts)
 
-	err = ensureGitToken(cmd, opts.InsCloneOpts, true)
+	err = getGitToken(cmd, opts)
 	handleCliStep(reporter.InstallStepPreCheckEnsureGitToken, "Getting git token", err, true, false)
 	if err != nil {
 		return err
@@ -393,6 +393,23 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 	return nil
 }
 
+func getGitToken(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
+	var err error
+	if store.Get().Silent {
+		err = ensureGitToken(cmd, opts.InsCloneOpts, true)
+	} else {
+		handleValidationFailsWithRepeat(func() error {
+			err = ensureGitToken(cmd, opts.InsCloneOpts, true)
+			if isValidationError(err) && !store.Get().Silent {
+				fmt.Println(err)
+				return err
+			}
+			return nil
+		})
+	}
+	return err
+}
+
 func runtimeUninstallCommandPreRunHandler(cmd *cobra.Command, args []string, opts *RuntimeUninstallOptions) error {
 	var err error
 	handleCliStep(reporter.UninstallPhasePreCheckStart, "Starting pre checks", nil, true, false)
@@ -2632,18 +2649,6 @@ func createAnalyticsReporter(ctx context.Context, flow reporter.FlowType, disabl
 	reporter.Init(user, flow)
 }
 
-func validateRuntimeName(runtime string) error {
-	var err error
-	isValid, err := IsValidName(runtime)
-	if err != nil {
-		err = fmt.Errorf("failed to check the validity of the runtime name: %w", err)
-	} else if !isValid {
-		err = fmt.Errorf("runtime name cannot have any uppercase letters, must start with a character, end with character or number, and be shorter than 63 chars")
-	}
-
-	return err
-}
-
 func getVersionIfExists(versionStr string) (*semver.Version, error) {
 	if versionStr != "" {
 		log.G().Infof("vesionStr: %s", versionStr)

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.363/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.364/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.363/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.364/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.363
+  version: 0.0.364
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events