Merge branch 'main' into fixBrokenRecipeCheckout

pkg/app/app.go

@@ -633,6 +633,11 @@ func (a App) WipeRecipeVersion() error {
 
 // WriteRecipeVersion writes the recipe version to the app .env file.
 func (a App) WriteRecipeVersion(version string, dryRun bool) error {
+	if version == config.UNKNOWN_DEFAULT {
+		log.Debug(i18n.G("version is unknown, skipping env write"))
+		return nil
+	}
+
 	file, err := os.Open(a.Path)
 	if err != nil {
 		return err

pkg/app/app_test.go

@@ -224,3 +224,16 @@ func TestWriteRecipeVersionOverwrite(t *testing.T) {
 
 	assert.Equal(t, "foo", app.Recipe.EnvVersion)
 }
+
+func TestWriteRecipeVersionUnknown(t *testing.T) {
+	app, err := appPkg.GetApp(testPkg.ExpectedAppFiles, testPkg.AppName)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if err := app.WriteRecipeVersion(config.UNKNOWN_DEFAULT, false); err != nil {
+		t.Fatal(err)
+	}
+
+	assert.NotEqual(t, config.UNKNOWN_DEFAULT, app.Recipe.EnvVersion)
+}

pkg/client/client.go

@@ -37,18 +37,27 @@ func WithTimeout(timeout int) Opt {
 // New initiates a new Docker client. New client connections are validated so
 // that we ensure connections via SSH to the daemon can succeed. It takes into
 // account that you may only want the local client and not communicate via SSH.
-// For this use-case, please pass "default" as the contextName.
+// For this use-case, please pass "default" as the serverName.
 func New(serverName string, opts ...Opt) (*client.Client, error) {
 	var clientOpts []client.Opt
 
 	ctx, err := GetContext(serverName)
 	if err != nil {
 		serverDir := path.Join(config.SERVERS_DIR, serverName)
-		if _, err := os.Stat(serverDir); err == nil {
-			return nil, errors.New(i18n.G("server missing context, run \"abra server add %s\"?", serverName))
+		if _, err := os.Stat(serverDir); err != nil {
+			return nil, errors.New(i18n.G("server missing, run \"abra server add %s\"?", serverName))
 		}
 
-		return nil, errors.New(i18n.G("unknown server, run \"abra server add %s\"?", serverName))
+		// NOTE(p4u1): when the docker context does not exist but the server folder
+		//             is there, let's create a new docker context.
+		if err = CreateContext(serverName); err != nil {
+			return nil, errors.New(i18n.G("server missing context, context creation failed: %s", err))
+		}
+
+		ctx, err = GetContext(serverName)
+		if err != nil {
+			return nil, errors.New(i18n.G("server missing context, run \"abra server add %s\"?", serverName))
+		}
 	}
 
 	ctxEndpoint, err := contextPkg.GetContextEndpoint(ctx)

pkg/upstream/stack/stack.go

@@ -201,6 +201,7 @@ func RunDeploy(
 	appName string,
 	serverName string,
 	dontWait bool,
+	noInput bool,
 	filters filters.Args,
 ) error {
 	log.Info(i18n.G("initialising deployment"))
@@ -226,6 +227,7 @@ func RunDeploy(
 		appName,
 		serverName,
 		dontWait,
+		noInput,
 		filters,
 	)
 }
@@ -248,6 +250,7 @@ func deployCompose(
 	appName string,
 	serverName string,
 	dontWait bool,
+	noInput bool,
 	filters filters.Args,
 ) error {
 	namespace := convert.NewNamespace(opts.Namespace)
@@ -311,6 +314,7 @@ func deployCompose(
 		Services:   serviceIDs,
 		AppName:    appName,
 		ServerName: serverName,
+		NoInput:    noInput,
 		Filters:    filters,
 	}
 
@@ -561,6 +565,7 @@ func timestamp() string {
 type WaitOpts struct {
 	AppName    string
 	Filters    filters.Args
+	NoInput    bool
 	NoLog      bool
 	Quiet      bool
 	ServerName string
@@ -570,7 +575,13 @@ type WaitOpts struct {
 func WaitOnServices(ctx context.Context, cl *dockerClient.Client, opts WaitOpts) error {
 	timeout := time.Duration(WaitTimeout) * time.Second
 	model := ui.DeployInitialModel(ctx, cl, opts.Services, opts.AppName, timeout, opts.Filters)
-	tui := tea.NewProgram(model)
+
+	var tui *tea.Program
+	if opts.NoInput {
+		tui = tea.NewProgram(model, tea.WithoutRenderer(), tea.WithInput(nil))
+	} else {
+		tui = tea.NewProgram(model)
+	}
 
 	if !opts.Quiet {
 		log.Info(i18n.G("polling deployment status"))