forked from coop-cloud/abra
fix: server inputs handling + better logging
This commit is contained in:
parent
1d7cb0d9b6
commit
8e3f90a7f3
|
@ -146,9 +146,9 @@ var CapsulInstanceURL string
|
|||
|
||||
var CapsulInstanceURLFlag = &cli.StringFlag{
|
||||
Name: "capsul-url",
|
||||
Value: "",
|
||||
Value: "yolo.servers.coop",
|
||||
Aliases: []string{"cu"},
|
||||
Usage: "Capsul instance URL",
|
||||
Usage: "capsul instance URL",
|
||||
Destination: &CapsulInstanceURL,
|
||||
}
|
||||
|
||||
|
@ -158,7 +158,7 @@ var CapsulNameFlag = &cli.StringFlag{
|
|||
Name: "capsul-name",
|
||||
Value: "",
|
||||
Aliases: []string{"cn"},
|
||||
Usage: "Capsul name",
|
||||
Usage: "capsul name",
|
||||
Destination: &CapsulName,
|
||||
}
|
||||
|
||||
|
@ -166,9 +166,9 @@ var CapsulType string
|
|||
|
||||
var CapsulTypeFlag = &cli.StringFlag{
|
||||
Name: "capsul-type",
|
||||
Value: "",
|
||||
Value: "f1-xs",
|
||||
Aliases: []string{"ct"},
|
||||
Usage: "Capsul type",
|
||||
Usage: "capsul type",
|
||||
Destination: &CapsulType,
|
||||
}
|
||||
|
||||
|
@ -178,7 +178,7 @@ var CapsulImageFlag = &cli.StringFlag{
|
|||
Name: "capsul-image",
|
||||
Value: "debian10",
|
||||
Aliases: []string{"ci"},
|
||||
Usage: "Capsul image",
|
||||
Usage: "capsul image",
|
||||
Destination: &CapsulImage,
|
||||
}
|
||||
|
||||
|
@ -187,7 +187,7 @@ var CapsulSSHKeys cli.StringSlice
|
|||
var CapsulSSHKeysFlag = &cli.StringSliceFlag{
|
||||
Name: "capsul-ssh-keys",
|
||||
Aliases: []string{"cs"},
|
||||
Usage: "Capsul SSH key (e.g. me@foo.com)",
|
||||
Usage: "capsul SSH key",
|
||||
Destination: &CapsulSSHKeys,
|
||||
}
|
||||
|
||||
|
@ -196,7 +196,7 @@ var CapsulAPIToken string
|
|||
var CapsulAPITokenFlag = &cli.StringFlag{
|
||||
Name: "capsul-token",
|
||||
Aliases: []string{"ca"},
|
||||
Usage: "Capsul API token",
|
||||
Usage: "capsul API token",
|
||||
EnvVars: []string{"CAPSUL_TOKEN"},
|
||||
Destination: &CapsulAPIToken,
|
||||
}
|
||||
|
|
|
@ -40,30 +40,30 @@ func EnsureNewCapsulVPSFlags(c *cli.Context) error {
|
|||
}
|
||||
}
|
||||
|
||||
if CapsulInstanceURL == "" && !NoInput {
|
||||
if !NoInput {
|
||||
prompt := &survey.Input{
|
||||
Message: "specify capsul instance URL",
|
||||
Default: "yolo.servers.coop",
|
||||
Default: CapsulInstanceURL,
|
||||
}
|
||||
if err := survey.AskOne(prompt, &CapsulInstanceURL); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if CapsulType == "" && !NoInput {
|
||||
if !NoInput {
|
||||
prompt := &survey.Input{
|
||||
Message: "specify capsul type",
|
||||
Default: "f1-xs",
|
||||
Default: CapsulType,
|
||||
}
|
||||
if err := survey.AskOne(prompt, &CapsulType); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if CapsulImage == "" && !NoInput {
|
||||
if !NoInput {
|
||||
prompt := &survey.Input{
|
||||
Message: "specify capsul image",
|
||||
Default: "debian10",
|
||||
Default: CapsulImage,
|
||||
}
|
||||
if err := survey.AskOne(prompt, &CapsulImage); err != nil {
|
||||
return err
|
||||
|
@ -129,20 +129,20 @@ func EnsureNewHetznerCloudVPSFlags(c *cli.Context) error {
|
|||
}
|
||||
}
|
||||
|
||||
if HetznerCloudType == "" && !NoInput {
|
||||
if !NoInput {
|
||||
prompt := &survey.Input{
|
||||
Message: "specify hetzner cloud VPS type",
|
||||
Default: "cx11",
|
||||
Default: HetznerCloudType,
|
||||
}
|
||||
if err := survey.AskOne(prompt, &HetznerCloudType); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if HetznerCloudImage == "" && !NoInput {
|
||||
if !NoInput {
|
||||
prompt := &survey.Input{
|
||||
Message: "specify hetzner cloud VPS image",
|
||||
Default: "debian-10",
|
||||
Default: HetznerCloudImage,
|
||||
}
|
||||
if err := survey.AskOne(prompt, &HetznerCloudImage); err != nil {
|
||||
return err
|
||||
|
@ -161,9 +161,10 @@ func EnsureNewHetznerCloudVPSFlags(c *cli.Context) error {
|
|||
HetznerCloudSSHKeys = *cli.NewStringSlice(strings.Split(sshKeys, ",")...)
|
||||
}
|
||||
|
||||
if HetznerCloudLocation == "" && !NoInput {
|
||||
if !NoInput {
|
||||
prompt := &survey.Input{
|
||||
Message: "specify hetzner cloud VPS location",
|
||||
Default: HetznerCloudLocation,
|
||||
}
|
||||
if err := survey.AskOne(prompt, &HetznerCloudLocation); err != nil {
|
||||
return err
|
||||
|
|
|
@ -17,8 +17,11 @@ func CreateServerDir(serverName string) error {
|
|||
return err
|
||||
}
|
||||
|
||||
logrus.Infof("'%s' already exists, moving on...", serverPath)
|
||||
logrus.Infof("%s already exists", serverPath)
|
||||
return nil
|
||||
}
|
||||
|
||||
logrus.Infof("successfully created %s", serverPath)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue