From ab02c5f0ddcbba2a2efb99a48e7e96b2a53a89ad Mon Sep 17 00:00:00 2001
From: decentral1se <lukewm@riseup.net>
Date: Tue, 2 Nov 2021 14:44:16 +0100
Subject: [PATCH] feat: support better domain defaults

Closes https://git.coopcloud.tech/coop-cloud/organising/issues/221.
---
 cli/app/new.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cli/app/new.go b/cli/app/new.go
index 8ee1b49e3..0461df7cb 100644
--- a/cli/app/new.go
+++ b/cli/app/new.go
@@ -8,6 +8,7 @@ import (
 	"coopcloud.tech/abra/cli/internal"
 	"coopcloud.tech/abra/pkg/catalogue"
 	"coopcloud.tech/abra/pkg/config"
+	"coopcloud.tech/abra/pkg/recipe"
 	"coopcloud.tech/abra/pkg/secret"
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/sirupsen/logrus"
@@ -92,10 +93,11 @@ var appNewCommand = &cli.Command{
 }
 
 // ensureDomainFlag checks if the domain flag was used. if not, asks the user for it/
-func ensureDomainFlag() error {
+func ensureDomainFlag(recipe recipe.Recipe, server string) error {
 	if domain == "" {
 		prompt := &survey.Input{
 			Message: "Specify app domain",
+			Default: fmt.Sprintf("%s.%s", recipe.Name, server),
 		}
 		if err := survey.AskOne(prompt, &domain); err != nil {
 			return err
@@ -175,7 +177,7 @@ func action(c *cli.Context) error {
 		logrus.Fatal(err)
 	}
 
-	if err := ensureDomainFlag(); err != nil {
+	if err := ensureDomainFlag(recipe, newAppServer); err != nil {
 		logrus.Fatal(err)
 	}