2022-07-07 18:56:59 +00:00
|
|
|
package sync
|
|
|
|
|
|
|
|
import (
|
2023-03-16 16:48:17 +00:00
|
|
|
"context"
|
2023-02-20 10:33:30 +00:00
|
|
|
"flag"
|
2022-07-07 18:56:59 +00:00
|
|
|
"fmt"
|
2023-03-16 16:48:17 +00:00
|
|
|
"io"
|
2023-02-20 10:33:30 +00:00
|
|
|
"path/filepath"
|
2023-03-16 16:48:17 +00:00
|
|
|
stdsync "sync"
|
2022-07-07 18:56:59 +00:00
|
|
|
"time"
|
|
|
|
|
2023-05-16 16:35:39 +00:00
|
|
|
"github.com/databricks/cli/bundle"
|
|
|
|
"github.com/databricks/cli/cmd/root"
|
|
|
|
"github.com/databricks/cli/libs/flags"
|
|
|
|
"github.com/databricks/cli/libs/sync"
|
2023-02-20 10:33:30 +00:00
|
|
|
"github.com/databricks/databricks-sdk-go"
|
2022-07-07 18:56:59 +00:00
|
|
|
"github.com/spf13/cobra"
|
|
|
|
)
|
|
|
|
|
2023-07-27 10:03:08 +00:00
|
|
|
type syncFlags struct {
|
|
|
|
// project files polling interval
|
|
|
|
interval time.Duration
|
|
|
|
full bool
|
|
|
|
watch bool
|
|
|
|
output flags.Output
|
|
|
|
}
|
|
|
|
|
|
|
|
func (f *syncFlags) syncOptionsFromBundle(cmd *cobra.Command, args []string, b *bundle.Bundle) (*sync.SyncOptions, error) {
|
2023-02-20 10:33:30 +00:00
|
|
|
if len(args) > 0 {
|
|
|
|
return nil, fmt.Errorf("SRC and DST are not configurable in the context of a bundle")
|
|
|
|
}
|
|
|
|
|
|
|
|
cacheDir, err := b.CacheDir()
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("cannot get bundle cache directory: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
opts := sync.SyncOptions{
|
|
|
|
LocalPath: b.Config.Path,
|
2023-04-12 14:54:36 +00:00
|
|
|
RemotePath: b.Config.Workspace.FilesPath,
|
2023-07-27 10:03:08 +00:00
|
|
|
Full: f.full,
|
|
|
|
PollInterval: f.interval,
|
2023-02-20 10:33:30 +00:00
|
|
|
|
|
|
|
SnapshotBasePath: cacheDir,
|
|
|
|
WorkspaceClient: b.WorkspaceClient(),
|
|
|
|
}
|
|
|
|
return &opts, nil
|
|
|
|
}
|
|
|
|
|
2023-07-27 10:03:08 +00:00
|
|
|
func (f *syncFlags) syncOptionsFromArgs(cmd *cobra.Command, args []string) (*sync.SyncOptions, error) {
|
2023-02-20 10:33:30 +00:00
|
|
|
if len(args) != 2 {
|
|
|
|
return nil, flag.ErrHelp
|
|
|
|
}
|
|
|
|
|
|
|
|
opts := sync.SyncOptions{
|
|
|
|
LocalPath: args[0],
|
|
|
|
RemotePath: args[1],
|
2023-07-27 10:03:08 +00:00
|
|
|
Full: f.full,
|
|
|
|
PollInterval: f.interval,
|
2023-02-20 10:33:30 +00:00
|
|
|
|
|
|
|
// We keep existing behavior for VS Code extension where if there is
|
|
|
|
// no bundle defined, we store the snapshots in `.databricks`.
|
|
|
|
// The sync code will automatically create this directory if it doesn't
|
|
|
|
// exist and add it to the `.gitignore` file in the root.
|
|
|
|
SnapshotBasePath: filepath.Join(args[0], ".databricks"),
|
|
|
|
WorkspaceClient: databricks.Must(databricks.NewWorkspaceClient()),
|
|
|
|
}
|
|
|
|
return &opts, nil
|
|
|
|
}
|
|
|
|
|
2023-07-27 10:03:08 +00:00
|
|
|
func New() *cobra.Command {
|
|
|
|
cmd := &cobra.Command{
|
|
|
|
Use: "sync [flags] SRC DST",
|
|
|
|
Short: "Synchronize a local directory to a workspace directory",
|
|
|
|
Args: cobra.MaximumNArgs(2),
|
|
|
|
}
|
|
|
|
|
|
|
|
f := syncFlags{
|
|
|
|
output: flags.OutputText,
|
|
|
|
}
|
|
|
|
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 output format")
|
2022-09-16 09:06:58 +00:00
|
|
|
|
2023-07-27 10:03:08 +00:00
|
|
|
cmd.RunE = func(cmd *cobra.Command, args []string) error {
|
2023-02-20 10:33:30 +00:00
|
|
|
var opts *sync.SyncOptions
|
|
|
|
var err error
|
|
|
|
|
|
|
|
//
|
|
|
|
// To be uncommented and used once our VS Code extension is bundle aware.
|
2023-07-18 10:16:34 +00:00
|
|
|
// Until then, this could interfere with extension usage where a `databricks.yml` file is present.
|
2023-05-16 16:35:39 +00:00
|
|
|
// See https://github.com/databricks/cli/pull/207.
|
2023-02-20 10:33:30 +00:00
|
|
|
//
|
|
|
|
// b := bundle.GetOrNil(cmd.Context())
|
|
|
|
// if b != nil {
|
|
|
|
// // Run initialize phase to make sure paths are set.
|
2023-05-24 12:45:19 +00:00
|
|
|
// err = bundle.Apply(cmd.Context(), b, phases.Initialize())
|
2023-02-20 10:33:30 +00:00
|
|
|
// if err != nil {
|
|
|
|
// return err
|
|
|
|
// }
|
|
|
|
// opts, err = syncOptionsFromBundle(cmd, args, b)
|
|
|
|
// } else {
|
2023-07-27 10:03:08 +00:00
|
|
|
opts, err = f.syncOptionsFromArgs(cmd, args)
|
2023-02-20 10:33:30 +00:00
|
|
|
// }
|
2023-01-19 14:57:41 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2023-02-20 10:33:30 +00:00
|
|
|
ctx := cmd.Context()
|
|
|
|
s, err := sync.New(ctx, *opts)
|
2023-01-24 07:30:10 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2023-03-16 16:48:17 +00:00
|
|
|
var outputFunc func(context.Context, <-chan sync.Event, io.Writer)
|
2023-07-27 10:03:08 +00:00
|
|
|
switch f.output {
|
Add optional JSON output for sync command (#230)
JSON output makes it easy to process synchronization progress
information in downstream tools (e.g. the vscode extension).
This changes introduces a `sync.Event` interface type for progress events as
well as an `sync.EventNotifier` that lets the sync code pass along
progress events to calling code.
Example output in text mode (default, this uses the existing logger calls):
```text
2023/03/03 14:07:17 [INFO] Remote file sync location: /Repos/pieter.noordhuis@databricks.com/...
2023/03/03 14:07:18 [INFO] Initial Sync Complete
2023/03/03 14:07:22 [INFO] Action: PUT: foo
2023/03/03 14:07:23 [INFO] Uploaded foo
2023/03/03 14:07:23 [INFO] Complete
2023/03/03 14:07:25 [INFO] Action: DELETE: foo
2023/03/03 14:07:25 [INFO] Deleted foo
2023/03/03 14:07:25 [INFO] Complete
```
Example output in JSON mode:
```json
{"timestamp":"2023-03-03T14:08:15.459439+01:00","seq":0,"type":"start"}
{"timestamp":"2023-03-03T14:08:15.459461+01:00","seq":0,"type":"complete"}
{"timestamp":"2023-03-03T14:08:18.459821+01:00","seq":1,"type":"start","put":["foo"]}
{"timestamp":"2023-03-03T14:08:18.459867+01:00","seq":1,"type":"progress","action":"put","path":"foo","progress":0}
{"timestamp":"2023-03-03T14:08:19.418696+01:00","seq":1,"type":"progress","action":"put","path":"foo","progress":1}
{"timestamp":"2023-03-03T14:08:19.421397+01:00","seq":1,"type":"complete","put":["foo"]}
{"timestamp":"2023-03-03T14:08:22.459238+01:00","seq":2,"type":"start","delete":["foo"]}
{"timestamp":"2023-03-03T14:08:22.459268+01:00","seq":2,"type":"progress","action":"delete","path":"foo","progress":0}
{"timestamp":"2023-03-03T14:08:22.686413+01:00","seq":2,"type":"progress","action":"delete","path":"foo","progress":1}
{"timestamp":"2023-03-03T14:08:22.688989+01:00","seq":2,"type":"complete","delete":["foo"]}
```
---------
Co-authored-by: shreyas-goenka <88374338+shreyas-goenka@users.noreply.github.com>
2023-03-08 09:27:19 +00:00
|
|
|
case flags.OutputText:
|
2023-03-16 16:48:17 +00:00
|
|
|
outputFunc = textOutput
|
Add optional JSON output for sync command (#230)
JSON output makes it easy to process synchronization progress
information in downstream tools (e.g. the vscode extension).
This changes introduces a `sync.Event` interface type for progress events as
well as an `sync.EventNotifier` that lets the sync code pass along
progress events to calling code.
Example output in text mode (default, this uses the existing logger calls):
```text
2023/03/03 14:07:17 [INFO] Remote file sync location: /Repos/pieter.noordhuis@databricks.com/...
2023/03/03 14:07:18 [INFO] Initial Sync Complete
2023/03/03 14:07:22 [INFO] Action: PUT: foo
2023/03/03 14:07:23 [INFO] Uploaded foo
2023/03/03 14:07:23 [INFO] Complete
2023/03/03 14:07:25 [INFO] Action: DELETE: foo
2023/03/03 14:07:25 [INFO] Deleted foo
2023/03/03 14:07:25 [INFO] Complete
```
Example output in JSON mode:
```json
{"timestamp":"2023-03-03T14:08:15.459439+01:00","seq":0,"type":"start"}
{"timestamp":"2023-03-03T14:08:15.459461+01:00","seq":0,"type":"complete"}
{"timestamp":"2023-03-03T14:08:18.459821+01:00","seq":1,"type":"start","put":["foo"]}
{"timestamp":"2023-03-03T14:08:18.459867+01:00","seq":1,"type":"progress","action":"put","path":"foo","progress":0}
{"timestamp":"2023-03-03T14:08:19.418696+01:00","seq":1,"type":"progress","action":"put","path":"foo","progress":1}
{"timestamp":"2023-03-03T14:08:19.421397+01:00","seq":1,"type":"complete","put":["foo"]}
{"timestamp":"2023-03-03T14:08:22.459238+01:00","seq":2,"type":"start","delete":["foo"]}
{"timestamp":"2023-03-03T14:08:22.459268+01:00","seq":2,"type":"progress","action":"delete","path":"foo","progress":0}
{"timestamp":"2023-03-03T14:08:22.686413+01:00","seq":2,"type":"progress","action":"delete","path":"foo","progress":1}
{"timestamp":"2023-03-03T14:08:22.688989+01:00","seq":2,"type":"complete","delete":["foo"]}
```
---------
Co-authored-by: shreyas-goenka <88374338+shreyas-goenka@users.noreply.github.com>
2023-03-08 09:27:19 +00:00
|
|
|
case flags.OutputJSON:
|
2023-03-16 16:48:17 +00:00
|
|
|
outputFunc = jsonOutput
|
|
|
|
}
|
|
|
|
|
|
|
|
var wg stdsync.WaitGroup
|
|
|
|
if outputFunc != nil {
|
|
|
|
wg.Add(1)
|
|
|
|
go func() {
|
|
|
|
defer wg.Done()
|
|
|
|
outputFunc(ctx, s.Events(), cmd.OutOrStdout())
|
|
|
|
}()
|
Add optional JSON output for sync command (#230)
JSON output makes it easy to process synchronization progress
information in downstream tools (e.g. the vscode extension).
This changes introduces a `sync.Event` interface type for progress events as
well as an `sync.EventNotifier` that lets the sync code pass along
progress events to calling code.
Example output in text mode (default, this uses the existing logger calls):
```text
2023/03/03 14:07:17 [INFO] Remote file sync location: /Repos/pieter.noordhuis@databricks.com/...
2023/03/03 14:07:18 [INFO] Initial Sync Complete
2023/03/03 14:07:22 [INFO] Action: PUT: foo
2023/03/03 14:07:23 [INFO] Uploaded foo
2023/03/03 14:07:23 [INFO] Complete
2023/03/03 14:07:25 [INFO] Action: DELETE: foo
2023/03/03 14:07:25 [INFO] Deleted foo
2023/03/03 14:07:25 [INFO] Complete
```
Example output in JSON mode:
```json
{"timestamp":"2023-03-03T14:08:15.459439+01:00","seq":0,"type":"start"}
{"timestamp":"2023-03-03T14:08:15.459461+01:00","seq":0,"type":"complete"}
{"timestamp":"2023-03-03T14:08:18.459821+01:00","seq":1,"type":"start","put":["foo"]}
{"timestamp":"2023-03-03T14:08:18.459867+01:00","seq":1,"type":"progress","action":"put","path":"foo","progress":0}
{"timestamp":"2023-03-03T14:08:19.418696+01:00","seq":1,"type":"progress","action":"put","path":"foo","progress":1}
{"timestamp":"2023-03-03T14:08:19.421397+01:00","seq":1,"type":"complete","put":["foo"]}
{"timestamp":"2023-03-03T14:08:22.459238+01:00","seq":2,"type":"start","delete":["foo"]}
{"timestamp":"2023-03-03T14:08:22.459268+01:00","seq":2,"type":"progress","action":"delete","path":"foo","progress":0}
{"timestamp":"2023-03-03T14:08:22.686413+01:00","seq":2,"type":"progress","action":"delete","path":"foo","progress":1}
{"timestamp":"2023-03-03T14:08:22.688989+01:00","seq":2,"type":"complete","delete":["foo"]}
```
---------
Co-authored-by: shreyas-goenka <88374338+shreyas-goenka@users.noreply.github.com>
2023-03-08 09:27:19 +00:00
|
|
|
}
|
2023-01-23 12:52:39 +00:00
|
|
|
|
2023-07-27 10:03:08 +00:00
|
|
|
if f.watch {
|
2023-03-16 16:48:17 +00:00
|
|
|
err = s.RunContinuous(ctx)
|
|
|
|
} else {
|
|
|
|
err = s.RunOnce(ctx)
|
2023-01-24 14:06:59 +00:00
|
|
|
}
|
|
|
|
|
2023-03-16 16:48:17 +00:00
|
|
|
s.Close()
|
|
|
|
wg.Wait()
|
|
|
|
return err
|
2023-07-27 10:03:08 +00:00
|
|
|
}
|
2023-02-20 13:31:59 +00:00
|
|
|
|
2023-07-27 10:03:08 +00:00
|
|
|
cmd.ValidArgsFunction = func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
|
2023-02-20 13:31:59 +00:00
|
|
|
err := root.TryConfigureBundle(cmd, args)
|
|
|
|
if err != nil {
|
|
|
|
return nil, cobra.ShellCompDirectiveError
|
|
|
|
}
|
|
|
|
|
|
|
|
// No completion in the context of a bundle.
|
|
|
|
// Source and destination paths are taken from bundle configuration.
|
|
|
|
b := bundle.GetOrNil(cmd.Context())
|
|
|
|
if b != nil {
|
|
|
|
return nil, cobra.ShellCompDirectiveNoFileComp
|
|
|
|
}
|
|
|
|
|
|
|
|
switch len(args) {
|
|
|
|
case 0:
|
|
|
|
return nil, cobra.ShellCompDirectiveFilterDirs
|
|
|
|
case 1:
|
|
|
|
wsc, err := databricks.NewWorkspaceClient()
|
|
|
|
if err != nil {
|
|
|
|
return nil, cobra.ShellCompDirectiveError
|
|
|
|
}
|
|
|
|
return completeRemotePath(cmd.Context(), wsc, toComplete)
|
|
|
|
default:
|
|
|
|
return nil, cobra.ShellCompDirectiveNoFileComp
|
|
|
|
}
|
2023-07-27 10:03:08 +00:00
|
|
|
}
|
2022-07-07 18:56:59 +00:00
|
|
|
|
2023-07-27 10:03:08 +00:00
|
|
|
return cmd
|
2022-07-07 18:56:59 +00:00
|
|
|
}
|