codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: handle inputs for server new correctly

Browse Source
This commit is contained in:
decentral1se 2021-10-25 08:23:29 +02:00
parent 9a0e12258a
commit 147687d7ce
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cli/internal/server.go
View File

@ -2,6 +2,8 @@ package internal
import ( import (
"fmt" "fmt"
"os"
"strings"
"github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
@ -27,7 +29,7 @@ func EnsureServerProvider() error {
return nil return nil
} }
// EnsureCapsulNewFlags ensure all flags are present. // EnsureNewCapsulVPSFlags ensure all flags are present.
func EnsureNewCapsulVPSFlags(c *cli.Context) error { func EnsureNewCapsulVPSFlags(c *cli.Context) error {
if CapsulName == "" && !NoInput { if CapsulName == "" && !NoInput {
prompt := &survey.Input{ prompt := &survey.Input{
@ -69,6 +71,7 @@ func EnsureNewCapsulVPSFlags(c *cli.Context) error {
} }
if len(CapsulSSHKeys.Value()) == 0 && !NoInput { if len(CapsulSSHKeys.Value()) == 0 && !NoInput {
var sshKeys string
prompt := &survey.Input{ prompt := &survey.Input{
Message: "specify capsul SSH keys", Message: "specify capsul SSH keys",
Default: "me@foo.com,you@bar.com", Default: "me@foo.com,you@bar.com",
@ -76,15 +79,21 @@ func EnsureNewCapsulVPSFlags(c *cli.Context) error {
if err := survey.AskOne(prompt, &CapsulSSHKeys); err != nil { if err := survey.AskOne(prompt, &CapsulSSHKeys); err != nil {
return err return err
} }
CapsulSSHKeys = *cli.NewStringSlice(strings.Split(sshKeys, ",")...)
} }
if CapsulAPIToken == "" && !NoInput { if CapsulAPIToken == "" && !NoInput {
token, ok := os.LookupEnv("CAPSUL_TOKEN")
if !ok {
prompt := &survey.Input{ prompt := &survey.Input{
Message: "specify capsul API token", Message: "specify capsul API token",
} }
if err := survey.AskOne(prompt, &CapsulAPIToken); err != nil { if err := survey.AskOne(prompt, &CapsulAPIToken); err != nil {
return err return err
} }
} else {
CapsulAPIToken = token
}
} }
if CapsulName == "" { if CapsulName == "" {
@ -141,13 +150,15 @@ func EnsureNewHetznerCloudVPSFlags(c *cli.Context) error {
} }
if len(HetznerCloudSSHKeys.Value()) == 0 && !NoInput { if len(HetznerCloudSSHKeys.Value()) == 0 && !NoInput {
var sshKeys string
prompt := &survey.Input{ prompt := &survey.Input{
Message: "specify hetzner cloud SSH keys", Message: "specify hetzner cloud SSH keys",
Default: "me@foo.com,you@bar.com", Default: "me@foo.com,you@bar.com",
} }
if err := survey.AskOne(prompt, &HetznerCloudSSHKeys); err != nil { if err := survey.AskOne(prompt, &sshKeys); err != nil {
return err return err
} }
HetznerCloudSSHKeys = *cli.NewStringSlice(strings.Split(sshKeys, ",")...)
} }
if HetznerCloudLocation == "" && !NoInput { if HetznerCloudLocation == "" && !NoInput {
@ -160,12 +171,17 @@ func EnsureNewHetznerCloudVPSFlags(c *cli.Context) error {
} }
if HetznerCloudAPIToken == "" && !NoInput { if HetznerCloudAPIToken == "" && !NoInput {
token, ok := os.LookupEnv("HCLOUD_TOKEN")
if !ok {
prompt := &survey.Input{ prompt := &survey.Input{
Message: "specify hetzner cloud API token", Message: "specify hetzner cloud API token",
} }
if err := survey.AskOne(prompt, &HetznerCloudAPIToken); err != nil { if err := survey.AskOne(prompt, &HetznerCloudAPIToken); err != nil {
return err return err
} }
} else {
HetznerCloudAPIToken = token
}
} }
if HetznerCloudName == "" { if HetznerCloudName == "" {

10
cli/server/new.go
View File

@ -22,7 +22,7 @@ func newHetznerCloudVPS(c *cli.Context) error {
var sshKeysRaw []string var sshKeysRaw []string
var sshKeys []*hcloud.SSHKey var sshKeys []*hcloud.SSHKey
for _, sshKey := range c.StringSlice("ssh-keys") { for _, sshKey := range c.StringSlice("hetzner-ssh-keys") {
sshKey, _, err := client.SSHKey.GetByName(c.Context, sshKey) sshKey, _, err := client.SSHKey.GetByName(c.Context, sshKey)
if err != nil { if err != nil {
return err return err
@ -52,7 +52,7 @@ func newHetznerCloudVPS(c *cli.Context) error {
response := false response := false
prompt := &survey.Confirm{ prompt := &survey.Confirm{
Message: "continue with capsul creation?", Message: "continue with hetzner cloud VPS creation?",
} }
if err := survey.AskOne(prompt, &response); err != nil { if err := survey.AskOne(prompt, &response); err != nil {
@ -160,6 +160,12 @@ The following providers are supported:
You may invoke this command in "wizard" mode and be prompted for input: You may invoke this command in "wizard" mode and be prompted for input:
abra record new abra record new
API tokens are read from the environment if specified, e.g.
export HCLOUD_TOKEN=...
Where "$provider_TOKEN" is the expected env var format.
`, `,
ArgsUsage: "<provider>", ArgsUsage: "<provider>",
Flags: []cli.Flag{ Flags: []cli.Flag{