add validation retry for gcp service account file prompts (#948)

Co-authored-by: Miguel Pereira <[email protected]>

Author: miguelhbrito

cmd/ocm/create/cluster/cmd.go

@@ -1613,16 +1613,22 @@ func promptGcpAuth(fs *pflag.FlagSet, connection *sdk.Connection) error {
 			return err
 		}
 	case c.AuthenticationKey:
-		// TODO: re-prompt when selected file is not readable / invalid JSON
-		err = arguments.PromptFilePath(fs, "service-account-file", true)
-		if err != nil {
-			return err
-		}
-
-		if args.gcpServiceAccountFile == "" {
-			return fmt.Errorf("a valid GCP service account file must be specified for CCS clusters")
-		}
-		err = constructGCPCredentials(args.gcpServiceAccountFile, &args.ccs)
+		err = arguments.PromptFilePath(fs, "service-account-file", true,
+			func(val interface{}) error {
+				gcpServiceAccountFile, ok := val.(string)
+				if !ok {
+					return fmt.Errorf("invalid file path")
+				}
+				gcpServiceAccountFile, err := arguments.ResolveRelativePath(gcpServiceAccountFile)
+				if err != nil {
+					return fmt.Errorf("invalid file path: %v", err)
+				}
+				if err := constructGCPCredentials(gcpServiceAccountFile, &args.ccs); err != nil {
+					return err
+				}
+				return nil
+			},
+		)
 		if err != nil {
 			return err
 		}
@@ -1870,9 +1876,9 @@ func fetchFlavours(client *cmv1.Client) (flavours []*cmv1.Flavour, err error) {
 	return
 }
 
-func constructGCPCredentials(filePath arguments.FilePath, value *c.CCS) error {
+func constructGCPCredentials(filePath string, value *c.CCS) error {
 	// Open our jsonFile
-	jsonFile, err := os.Open(filePath.String())
+	jsonFile, err := os.Open(filePath)
 	if err != nil {
 		return err
 	}

pkg/arguments/interactive.go

@@ -254,7 +254,12 @@ func PromptPassword(fs *pflag.FlagSet, flagName string) error {
 
 // PromptFilePath sets a FilePath flag value interactively, unless already set.
 // Does nothing in non-interactive mode.
-func PromptFilePath(fs *pflag.FlagSet, flagName string, required bool) error {
+func PromptFilePath(
+	fs *pflag.FlagSet,
+	flagName string,
+	required bool,
+	validators ...survey.Validator,
+) error {
 	flag := fs.Lookup(flagName)
 	if flag.Value.Type() != "filepath" {
 		return fmt.Errorf("PromptFilePath can't be used on flag %q of type %q",
@@ -277,11 +282,14 @@ func PromptFilePath(fs *pflag.FlagSet, flagName string, required bool) error {
 			if required {
 				validator = survey.WithValidator(survey.Required)
 			}
-			err := survey.AskOne(prompt, &response, validator)
+			err := survey.AskOne(prompt, &response, validator, func(options *survey.AskOptions) error {
+				options.Validators = append(options.Validators, validators...)
+				return nil
+			})
 			if err != nil {
 				return err
 			}
-			response, err = resolveRelativePath(response)
+			response, err = ResolveRelativePath(response)
 			if err != nil {
 				return err
 			}
@@ -293,7 +301,7 @@ func PromptFilePath(fs *pflag.FlagSet, flagName string, required bool) error {
 
 // Golang does not support tilde file paths https://github.com/golang/go/issues/57569
 // However, we try to resolve this by manually so user can proceed further
-func resolveRelativePath(path string) (string, error) {
+func ResolveRelativePath(path string) (string, error) {
 	if !strings.Contains(path, "~") {
 		return path, nil
 	}