fix: error out correctly from ValidateDomain
This commit is contained in:
parent
ecbeacf10f
commit
823f869f1d
|
@ -148,7 +148,7 @@ func ValidateApp(c *cli.Context) config.App {
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateDomain ensures the domain name arg is valid.
|
// ValidateDomain ensures the domain name arg is valid.
|
||||||
func ValidateDomain(c *cli.Context) (string, error) {
|
func ValidateDomain(c *cli.Context) string {
|
||||||
domainName := c.Args().First()
|
domainName := c.Args().First()
|
||||||
|
|
||||||
if domainName == "" && !NoInput {
|
if domainName == "" && !NoInput {
|
||||||
|
@ -157,7 +157,7 @@ func ValidateDomain(c *cli.Context) (string, error) {
|
||||||
Default: "example.com",
|
Default: "example.com",
|
||||||
}
|
}
|
||||||
if err := survey.AskOne(prompt, &domainName); err != nil {
|
if err := survey.AskOne(prompt, &domainName); err != nil {
|
||||||
return domainName, err
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -167,7 +167,7 @@ func ValidateDomain(c *cli.Context) (string, error) {
|
||||||
|
|
||||||
logrus.Debugf("validated %s as domain argument", domainName)
|
logrus.Debugf("validated %s as domain argument", domainName)
|
||||||
|
|
||||||
return domainName, nil
|
return domainName
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateSubCmdFlags ensures flag order conforms to correct order
|
// ValidateSubCmdFlags ensures flag order conforms to correct order
|
||||||
|
|
|
@ -427,6 +427,8 @@ developer machine.
|
||||||
internal.ShowSubcommandHelpAndError(c, err)
|
internal.ShowSubcommandHelpAndError(c, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
domainName := internal.ValidateDomain(c)
|
||||||
|
|
||||||
if local {
|
if local {
|
||||||
if err := newLocalServer(c, "default"); err != nil {
|
if err := newLocalServer(c, "default"); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
|
@ -434,11 +436,6 @@ developer machine.
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
domainName, err := internal.ValidateDomain(c)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
username := c.Args().Get(1)
|
username := c.Args().Get(1)
|
||||||
if username == "" {
|
if username == "" {
|
||||||
systemUser, err := user.Current()
|
systemUser, err := user.Current()
|
||||||
|
|
Loading…
Reference in New Issue