fix(completion): Fix dump/restore completions creating a job

clevyr · Oct 7, 2023 · 06c1540 · 06c1540
1 parent 8ac8652
commit 06c1540
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cmd/dump/dump.go b/cmd/dump/dump.go
@@ -52,11 +52,14 @@ the generated filename might look like "` + dump.HelpFilename() + `"`,
 	return cmd
 }
 
+var setupOptions = util.SetupOptions{Name: "dump"}
+
 func validArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	if len(args) != 0 {
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	}
 
+	setupOptions.DisableJob = true
 	err := preRun(cmd, args)
 	if err != nil {
 		return []string{"sql", "sql.gz", "dmp", "archive", "archive.gz"}, cobra.ShellCompDirectiveFilterFileExt
@@ -87,7 +90,7 @@ func preRun(cmd *cobra.Command, args []string) (err error) {
 		cmd.SilenceUsage = false
 	}
 
-	if err := util.DefaultSetup(cmd, &action.Global, util.SetupOptions{Name: "dump"}); err != nil {
+	if err := util.DefaultSetup(cmd, &action.Global, setupOptions); err != nil {
 		return err
 	}
 

diff --git a/cmd/restore/restore.go b/cmd/restore/restore.go
@@ -49,11 +49,15 @@ Supported Input Filetypes:
 	return cmd
 }
 
+var setupOptions = util.SetupOptions{Name: "restore"}
+
 func validArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	if len(args) != 0 {
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	}
 
+	setupOptions.DisableJob = true
+
 	err := preRun(cmd, args)
 	if err != nil {
 		return []string{"sql", "sql.gz", "dmp", "archive", "archive.gz"}, cobra.ShellCompDirectiveFilterFileExt
@@ -76,7 +80,7 @@ func preRun(cmd *cobra.Command, args []string) (err error) {
 		action.Filename = args[0]
 	}
 
-	if err := util.DefaultSetup(cmd, &action.Global, util.SetupOptions{Name: "restore"}); err != nil {
+	if err := util.DefaultSetup(cmd, &action.Global, setupOptions); err != nil {
 		return err
 	}