From 73e6852552fb7f19a894a84245f255e71082cf28 Mon Sep 17 00:00:00 2001
From: Ilia Babanov <ilia.babanov@databricks.com>
Date: Tue, 22 Oct 2024 12:58:01 +0200
Subject: [PATCH 1/2] Add "output" flag to the bundle sync command

We want to use 'bundle sync' in the vscode extension before running a file
as an ad-hoc job (or through the context api). Right now we use bundle deploy
in these cases, but deploying bundle resources is not always expected when you
just want to quickly run a file. Sync make more sense in these cases, but we
still want to have verbose output to see what's happening.
---
 cmd/bundle/sync.go | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/cmd/bundle/sync.go b/cmd/bundle/sync.go
index df3e087c2d..f7f32e77e9 100644
--- a/cmd/bundle/sync.go
+++ b/cmd/bundle/sync.go
@@ -1,7 +1,9 @@
 package bundle
 
 import (
+	"context"
 	"fmt"
+	"io"
 	"time"
 
 	"github.com/databricks/cli/bundle"
@@ -9,6 +11,7 @@ import (
 	"github.com/databricks/cli/bundle/phases"
 	"github.com/databricks/cli/cmd/bundle/utils"
 	"github.com/databricks/cli/cmd/root"
+	"github.com/databricks/cli/libs/flags"
 	"github.com/databricks/cli/libs/log"
 	"github.com/databricks/cli/libs/sync"
 	"github.com/spf13/cobra"
@@ -18,6 +21,7 @@ type syncFlags struct {
 	interval time.Duration
 	full     bool
 	watch    bool
+	output   flags.Output
 }
 
 func (f *syncFlags) syncOptionsFromBundle(cmd *cobra.Command, b *bundle.Bundle) (*sync.SyncOptions, error) {
@@ -26,6 +30,19 @@ func (f *syncFlags) syncOptionsFromBundle(cmd *cobra.Command, b *bundle.Bundle)
 		return nil, fmt.Errorf("cannot get sync options: %w", err)
 	}
 
+	if f.output != "" {
+		var outputFunc func(context.Context, <-chan sync.Event, io.Writer)
+		switch f.output {
+		case flags.OutputText:
+			outputFunc = sync.TextOutput
+		case flags.OutputJSON:
+			outputFunc = sync.JsonOutput
+		}
+		opts.OutputHandler = func(ctx context.Context, c <-chan sync.Event) {
+			outputFunc(ctx, c, cmd.OutOrStdout())
+		}
+	}
+
 	opts.Full = f.full
 	opts.PollInterval = f.interval
 	return opts, nil
@@ -42,6 +59,7 @@ func newSyncCommand() *cobra.Command {
 	cmd.Flags().DurationVar(&f.interval, "interval", 1*time.Second, "file system polling interval (for --watch)")
 	cmd.Flags().BoolVar(&f.full, "full", false, "perform full synchronization (default is incremental)")
 	cmd.Flags().BoolVar(&f.watch, "watch", false, "watch local file system for changes")
+	cmd.Flags().Var(&f.output, "output", "type of the output format")
 
 	cmd.RunE = func(cmd *cobra.Command, args []string) error {
 		ctx := cmd.Context()
@@ -65,6 +83,7 @@ func newSyncCommand() *cobra.Command {
 		if err != nil {
 			return err
 		}
+		defer s.Close()
 
 		log.Infof(ctx, "Remote file sync location: %v", opts.RemotePath)
 

From 5f63f7488bc70bff56019065972546e86ac40104 Mon Sep 17 00:00:00 2001
From: Ilia Babanov <ilia.babanov@databricks.com>
Date: Wed, 23 Oct 2024 12:40:48 +0200
Subject: [PATCH 2/2] Guard against nil

---
 cmd/bundle/sync.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmd/bundle/sync.go b/cmd/bundle/sync.go
index f7f32e77e9..274bba0e02 100644
--- a/cmd/bundle/sync.go
+++ b/cmd/bundle/sync.go
@@ -38,8 +38,10 @@ func (f *syncFlags) syncOptionsFromBundle(cmd *cobra.Command, b *bundle.Bundle)
 		case flags.OutputJSON:
 			outputFunc = sync.JsonOutput
 		}
-		opts.OutputHandler = func(ctx context.Context, c <-chan sync.Event) {
-			outputFunc(ctx, c, cmd.OutOrStdout())
+		if outputFunc != nil {
+			opts.OutputHandler = func(ctx context.Context, c <-chan sync.Event) {
+				outputFunc(ctx, c, cmd.OutOrStdout())
+			}
 		}
 	}