Add support for json response in restore watch commands (#2097)

mongodb · Jul 19, 2023 · a4aeb2a · a4aeb2a
1 parent 23128eb
commit a4aeb2a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/internal/cli/atlas/backup/restores/watch.go b/internal/cli/atlas/backup/restores/watch.go
@@ -25,6 +25,7 @@ import (
  "github.com/mongodb/mongodb-atlas-cli/internal/store"
  "github.com/mongodb/mongodb-atlas-cli/internal/usage"
  "github.com/spf13/cobra"
+ atlasv2 "go.mongodb.org/atlas-sdk/v20230201002/admin"
 )
 
 type WatchOpts struct {
@@ -36,6 +37,7 @@ type WatchOpts struct {
 }
 
 var watchTemplate = "\nRestore completed.\n"
+var result *atlasv2.DiskBackupSnapshotRestoreJob
 
 func (opts *WatchOpts) initStore(ctx context.Context) func() error {
  return func() error {
@@ -46,7 +48,8 @@ func (opts *WatchOpts) initStore(ctx context.Context) func() error {
 }
 
 func (opts *WatchOpts) watcher() (bool, error) {
- result, err := opts.store.RestoreJob(opts.ConfigProjectID(), opts.clusterName, opts.id)
+ var err error
+ result, err = opts.store.RestoreJob(opts.ConfigProjectID(), opts.clusterName, opts.id)
  if err != nil {
  return false, err
  }
@@ -59,7 +62,7 @@ func (opts *WatchOpts) Run() error {
  return err
  }
 
- return opts.Print(nil)
+ return opts.Print(result)
 }
 
 // WatchBuilder atlas backup(s) restore(s) job(s) watch <restoreJobId>.

diff --git a/internal/cli/atlas/serverless/backup/restores/watch.go b/internal/cli/atlas/serverless/backup/restores/watch.go
@@ -25,6 +25,7 @@ import (
  "github.com/mongodb/mongodb-atlas-cli/internal/store"
  "github.com/mongodb/mongodb-atlas-cli/internal/usage"
  "github.com/spf13/cobra"
+ atlasv2 "go.mongodb.org/atlas-sdk/v20230201002/admin"
 )
 
 type WatchOpts struct {
@@ -36,6 +37,7 @@ type WatchOpts struct {
 }
 
 var watchTemplate = "\nRestore completed.\n"
+var result *atlasv2.ServerlessBackupRestoreJob
 
 func (opts *WatchOpts) initStore(ctx context.Context) func() error {
  return func() error {
@@ -46,7 +48,8 @@ func (opts *WatchOpts) initStore(ctx context.Context) func() error {
 }
 
 func (opts *WatchOpts) watcher() (bool, error) {
- result, err := opts.store.ServerlessRestoreJob(opts.ConfigProjectID(), opts.clusterName, opts.id)
+ var err error
+ result, err = opts.store.ServerlessRestoreJob(opts.ConfigProjectID(), opts.clusterName, opts.id)
  if err != nil {
  return false, err
  }
@@ -58,7 +61,7 @@ func (opts *WatchOpts) Run() error {
  return err
  }
 
- return opts.Print(nil)
+ return opts.Print(result)
 }
 
 // WatchBuilder atlas serverless backup(s) restore(s) watch.

diff --git a/internal/cli/mongocli/serverless/backup/restores/watch.go b/internal/cli/mongocli/serverless/backup/restores/watch.go
@@ -25,6 +25,7 @@ import (
  "github.com/mongodb/mongodb-atlas-cli/internal/store"
  "github.com/mongodb/mongodb-atlas-cli/internal/usage"
  "github.com/spf13/cobra"
+ atlasv2 "go.mongodb.org/atlas-sdk/v20230201002/admin"
 )
 
 type WatchOpts struct {
@@ -35,6 +36,8 @@ type WatchOpts struct {
  store store.ServerlessRestoreJobsDescriber
 }
 
+var result *atlasv2.ServerlessBackupRestoreJob
+
 func (opts *WatchOpts) initStore(ctx context.Context) func() error {
  return func() error {
  var err error
@@ -44,7 +47,8 @@ func (opts *WatchOpts) initStore(ctx context.Context) func() error {
 }
 
 func (opts *WatchOpts) watcher() (bool, error) {
- result, err := opts.store.ServerlessRestoreJob(opts.ConfigProjectID(), opts.clusterName, opts.id)
+ var err error
+ result, err = opts.store.ServerlessRestoreJob(opts.ConfigProjectID(), opts.clusterName, opts.id)
  if err != nil {
  return false, err
  }
@@ -56,7 +60,7 @@ func (opts *WatchOpts) Run() error {
  return err
  }
 
- return opts.Print(nil)
+ return opts.Print(result)
 }
 
 // WatchBuilder atlas serverless backup(s) restore(s) watch.