fixup! cmd/archive: add --archive-stdout

grafana · Jun 18, 2024 · b77ab02 · b77ab02
1 parent 358b28d
commit b77ab02
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cmd/archive.go b/cmd/archive.go
@@ -12,7 +12,6 @@ type cmdArchive struct {
 	gs *state.GlobalState
 
 	archiveOut     string
-	archiveStdout  bool
 	excludeEnvVars bool
 }
 
@@ -41,7 +40,7 @@ func (c *cmdArchive) run(cmd *cobra.Command, args []string) error {
 		arc.Env = nil
 	}
 
-	if c.archiveStdout {
+	if c.archiveOut == "-" {
 		return arc.Write(c.gs.Stdout)
 	}
 
@@ -62,8 +61,10 @@ func (c *cmdArchive) flagSet() *pflag.FlagSet {
 	flags.SortFlags = false
 	flags.AddFlagSet(optionFlagSet())
 	flags.AddFlagSet(runtimeOptionFlagSet(false))
-	flags.StringVarP(&c.archiveOut, "archive-out", "O", c.archiveOut, "archive output filename")
-	flags.BoolVar(&c.archiveStdout, "archive-stdout", false, "output archive to stdout")
+	flags.StringVarP(
+		&c.archiveOut, "archive-out", "O", c.archiveOut,
+		"archive output filename. The special value - will cause the archive to be output to stdout.",
+	)
 	flags.BoolVarP(
 		&c.excludeEnvVars,
 		"exclude-env-vars",

diff --git a/cmd/archive_test.go b/cmd/archive_test.go
@@ -264,7 +264,7 @@ func TestArchiveStdout(t *testing.T) {
 	ts := tests.NewGlobalTestState(t)
 	require.NoError(t, fsext.WriteFile(ts.FS, filepath.Join(ts.Cwd, fileName), testScript, 0o644))
 
-	ts.CmdArgs = []string{"k6", "archive", "--archive-stdout", fileName}
+	ts.CmdArgs = []string{"k6", "archive", "-O", "-", fileName}
 
 	newRootCommand(ts.GlobalState).execute()