fix: secrets from config, --offline/chaos handling, typos

See coop-cloud/organising#464

cli/app/new.go

@@ -2,10 +2,8 @@ package app
 
 import (
 	"fmt"
-	"path"
 
 	"coopcloud.tech/abra/cli/internal"
-	"coopcloud.tech/abra/pkg/app"
 	"coopcloud.tech/abra/pkg/autocomplete"
 	"coopcloud.tech/abra/pkg/client"
 	"coopcloud.tech/abra/pkg/config"
@@ -53,6 +51,7 @@ var appNewCommand = cli.Command{
 		internal.PassFlag,
 		internal.SecretsFlag,
 		internal.OfflineFlag,
+		internal.ChaosFlag,
 	},
 	Before:       internal.SubCommandBefore,
 	ArgsUsage:    "[<recipe>]",
@@ -60,14 +59,18 @@ var appNewCommand = cli.Command{
 	Action: func(c *cli.Context) error {
 		recipe := internal.ValidateRecipe(c)
 
-		if !internal.Offline {
-			if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
+		if !internal.Chaos {
+			if err := recipePkg.EnsureIsClean(recipe.Name); err != nil {
+				logrus.Fatal(err)
+			}
+			if !internal.Offline {
+				if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil {
+					logrus.Fatal(err)
+				}
+			}
+			if err := recipePkg.EnsureLatest(recipe.Name); err != nil {
 				logrus.Fatal(err)
 			}
-		}
-
-		if err := recipePkg.EnsureLatest(recipe.Name); err != nil {
-			logrus.Fatal(err)
 		}
 
 		if err := ensureServerFlag(); err != nil {
@@ -90,29 +93,43 @@ var appNewCommand = cli.Command{
 			logrus.Fatal(err)
 		}
 
-		if err := promptForSecrets(internal.Domain); err != nil {
-			logrus.Fatal(err)
-		}
-
 		var secrets AppSecrets
 		var secretTable *jsontable.JSONTable
 		if internal.Secrets {
+			sampleEnv, err := recipe.SampleEnv()
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			composeFiles, err := config.GetComposeFiles(recipe.Name, sampleEnv)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+
+			secretsConfig, err := secret.ReadSecretsConfig(sampleEnv, composeFiles, recipe.Name)
+			if err != nil {
+				return err
+			}
+
+			if err := promptForSecrets(recipe.Name, secretsConfig); err != nil {
+				logrus.Fatal(err)
+			}
+
 			cl, err := client.New(internal.NewAppServer)
 			if err != nil {
 				logrus.Fatal(err)
 			}
 
-			secrets, err := createSecrets(cl, sanitisedAppName)
+			secrets, err = createSecrets(cl, secretsConfig, sanitisedAppName)
 			if err != nil {
 				logrus.Fatal(err)
 			}
 
 			secretCols := []string{"Name", "Value"}
 			secretTable = formatter.CreateTable(secretCols)
-			for secret := range secrets {
-				secretTable.Append([]string{secret, secrets[secret]})
+			for name, val := range secrets {
+				secretTable.Append([]string{name, val})
 			}
-
 		}
 
 		if internal.NewAppServer == "default" {
@@ -123,7 +140,6 @@ var appNewCommand = cli.Command{
 		table := formatter.CreateTable(tableCol)
 		table.Append([]string{internal.NewAppServer, recipe.Name, internal.Domain})
 
-		fmt.Println("")
 		fmt.Println(fmt.Sprintf("A new %s app has been created! Here is an overview:", recipe.Name))
 		fmt.Println("")
 		table.Render()
@@ -133,14 +149,13 @@ var appNewCommand = cli.Command{
 		fmt.Println("")
 		fmt.Println("You can deploy this app by running the following:")
 		fmt.Println(fmt.Sprintf("\n    abra app deploy %s", internal.Domain))
-		fmt.Println("")
 
 		if len(secrets) > 0 {
+			fmt.Println("")
 			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*")
+			logrus.Warn("generated secrets are not shown again, please take note of them NOW")
 		}
 
 		return nil
@@ -151,21 +166,14 @@ var appNewCommand = cli.Command{
 type AppSecrets map[string]string
 
 // createSecrets creates all secrets for a new app.
-func createSecrets(cl *dockerClient.Client, sanitisedAppName string) (AppSecrets, error) {
-	appEnvPath := path.Join(
-		config.ABRA_DIR,
-		"servers",
-		internal.NewAppServer,
-		fmt.Sprintf("%s.env", internal.Domain),
-	)
-
-	appEnv, err := config.ReadEnv(appEnvPath)
-	if err != nil {
-		return nil, err
+func createSecrets(cl *dockerClient.Client, secretsConfig map[string]string, sanitisedAppName string) (AppSecrets, error) {
+	// NOTE(d1): trim to match app.StackName() implementation
+	if len(sanitisedAppName) > 45 {
+		logrus.Debugf("trimming %s to %s to avoid runtime limits", sanitisedAppName, sanitisedAppName[:45])
+		sanitisedAppName = sanitisedAppName[:45]
 	}
 
-	secretEnvVars := secret.ReadSecretEnvVars(appEnv)
-	secrets, err := secret.GenerateSecrets(cl, secretEnvVars, sanitisedAppName, internal.NewAppServer)
+	secrets, err := secret.GenerateSecrets(cl, secretsConfig, sanitisedAppName, internal.NewAppServer)
 	if err != nil {
 		return nil, err
 	}
@@ -183,6 +191,7 @@ func createSecrets(cl *dockerClient.Client, sanitisedAppName string) (AppSecrets
 			}
 		}
 	}
+
 	return secrets, nil
 }
 
@@ -206,15 +215,9 @@ func ensureDomainFlag(recipe recipe.Recipe, server string) error {
 }
 
 // promptForSecrets asks if we should generate secrets for a new app.
-func promptForSecrets(appName string) error {
-	app, err := app.Get(appName)
-	if err != nil {
-		return err
-	}
-
-	secretEnvVars := secret.ReadSecretEnvVars(app.Env)
-	if len(secretEnvVars) == 0 {
-		logrus.Debugf("%s has no secrets to generate, skipping...", app.Recipe)
+func promptForSecrets(recipeName string, secretsConfig map[string]string) error {
+	if len(secretsConfig) == 0 {
+		logrus.Debugf("%s has no secrets to generate, skipping...", recipeName)
 		return nil
 	}