Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions internal/cmd/branch/query_patterns.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,18 @@ func DownloadQueryPatternsCmd(ch *cmdutil.Helper) *cobra.Command {
RunE: func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
database, branch := args[0], args[1]
toStdout := flags.output == "-"

client, err := ch.Client()
if err != nil {
return err
}

end := ch.Printer.PrintProgress(fmt.Sprintf("Generating query patterns report for %s in %s...",
printer.BoldBlue(branch), printer.BoldBlue(database)))
end := func() {}
if !toStdout {
end = ch.Printer.PrintProgress(fmt.Sprintf("Generating query patterns report for %s in %s...",
printer.BoldBlue(branch), printer.BoldBlue(database)))
}
defer end()

report, err := client.QueryPatterns.CreateReport(ctx, &ps.CreateQueryPatternsReportRequest{
Expand Down Expand Up @@ -111,6 +115,13 @@ func DownloadQueryPatternsCmd(ch *cmdutil.Helper) *cobra.Command {
}
defer body.Close()

if toStdout {
if _, err := io.Copy(cmd.OutOrStdout(), body); err != nil {
return fmt.Errorf("writing query patterns report to stdout: %w", err)
}
return nil
}

f, err := os.Create(path)
if err != nil {
return fmt.Errorf("creating file %s: %w", path, err)
Expand Down Expand Up @@ -140,7 +151,7 @@ func DownloadQueryPatternsCmd(ch *cmdutil.Helper) *cobra.Command {
}

cmd.Flags().StringVar(&flags.output, "output", "",
"Output file for the query patterns report. Defaults to the current directory as query-patterns-<organization>-<database>-<branch>-<timestamp>.csv.")
"Output file name, or - to write to stdout. Defaults to query-patterns-<organization>-<database>-<branch>-<timestamp>.csv.")

return cmd
}
Expand Down
27 changes: 27 additions & 0 deletions internal/cmd/branch/query_patterns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,33 @@ func TestBranch_QueryPatternsDownloadCmd(t *testing.T) {
})
}

func TestBranch_QueryPatternsDownloadCmd_Stdout(t *testing.T) {
c := qt.New(t)

prevInterval := queryPatternsPollInterval
queryPatternsPollInterval = 10 * time.Millisecond
t.Cleanup(func() { queryPatternsPollInterval = prevInterval })

server := queryPatternsServer(t, c, []string{"pending", "completed"})

var buf bytes.Buffer
ch := queryPatternsTestHelper("my-org", server.URL, printer.Human, &buf)

var humanOut bytes.Buffer
ch.Printer.SetHumanOutput(&humanOut)

var stdout bytes.Buffer
cmd := QueryPatternsCmd(ch)
cmd.SetOut(&stdout)
cmd.SetArgs([]string{"download", "my-db", "my-branch", "--output", "-"})
err := cmd.Execute()

c.Assert(err, qt.IsNil)
c.Assert(stdout.String(), qt.Equals, queryPatternsCSV)
c.Assert(humanOut.String(), qt.Equals, "")
c.Assert(buf.String(), qt.Equals, "")
}

func TestBranch_QueryPatternsDownloadCmd_Failed(t *testing.T) {
c := qt.New(t)

Expand Down