fix: lay out generated secrets with warning/clarification
This commit is contained in:
parent
d0945aa09d
commit
8ccf856110
|
@ -11,6 +11,7 @@ import (
|
||||||
"coopcloud.tech/abra/pkg/secret"
|
"coopcloud.tech/abra/pkg/secret"
|
||||||
"coopcloud.tech/abra/pkg/ssh"
|
"coopcloud.tech/abra/pkg/ssh"
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/olekukonko/tablewriter"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
@ -112,25 +113,25 @@ func NewAction(c *cli.Context) error {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var secrets AppSecrets
|
||||||
|
var secretTable *tablewriter.Table
|
||||||
if Secrets {
|
if Secrets {
|
||||||
if err := ssh.EnsureHostKey(NewAppServer); err != nil {
|
if err := ssh.EnsureHostKey(NewAppServer); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
secrets, err := createSecrets(sanitisedAppName)
|
var err error
|
||||||
|
secrets, err = createSecrets(sanitisedAppName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
secretCols := []string{"Name", "Value"}
|
secretCols := []string{"Name", "Value"}
|
||||||
secretTable := formatter.CreateTable(secretCols)
|
secretTable = formatter.CreateTable(secretCols)
|
||||||
for secret := range secrets {
|
for secret := range secrets {
|
||||||
secretTable.Append([]string{secret, secrets[secret]})
|
secretTable.Append([]string{secret, secrets[secret]})
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(secrets) > 0 {
|
|
||||||
defer secretTable.Render()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if NewAppServer == "default" {
|
if NewAppServer == "default" {
|
||||||
|
@ -153,5 +154,13 @@ func NewAction(c *cli.Context) error {
|
||||||
fmt.Println(fmt.Sprintf("\n abra app deploy %s", Domain))
|
fmt.Println(fmt.Sprintf("\n abra app deploy %s", Domain))
|
||||||
fmt.Println("")
|
fmt.Println("")
|
||||||
|
|
||||||
|
if len(secrets) > 0 {
|
||||||
|
fmt.Println("Here are your generated secrets:")
|
||||||
|
fmt.Println("")
|
||||||
|
secretTable.Render()
|
||||||
|
fmt.Println("")
|
||||||
|
logrus.Warn("generated secrets are not shown again, please take note of them *now*")
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue