mirror of
https://github.com/anchore/syft.git
synced 2025-11-19 01:13:18 +01:00
fix: capture root command stdout (#2364)
Signed-off-by: Keith Zantow <kzantow@gmail.com>
This commit is contained in:
parent
ea4a6747eb
commit
a50a0f77d2
@ -91,5 +91,8 @@ func create(id clio.Identification, out io.Writer) (clio.Application, *cobra.Com
|
|||||||
cranecmd.NewCmdAuthLogin(id.Name), // syft login uses the same command as crane
|
cranecmd.NewCmdAuthLogin(id.Name), // syft login uses the same command as crane
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// explicitly set Cobra output to the real stdout to write things like errors and help
|
||||||
|
rootCmd.SetOut(out)
|
||||||
|
|
||||||
return app, rootCmd
|
return app, rootCmd
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import (
|
|||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"github.com/anchore/clio"
|
"github.com/anchore/clio"
|
||||||
|
"github.com/anchore/syft/cmd/syft/internal/ui"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Root(app clio.Application, packagesCmd *cobra.Command) *cobra.Command {
|
func Root(app clio.Application, packagesCmd *cobra.Command) *cobra.Command {
|
||||||
@ -21,6 +22,9 @@ func Root(app clio.Application, packagesCmd *cobra.Command) *cobra.Command {
|
|||||||
Example: packagesCmd.Example,
|
Example: packagesCmd.Example,
|
||||||
PreRunE: applicationUpdateCheck(id, &opts.UpdateCheck),
|
PreRunE: applicationUpdateCheck(id, &opts.UpdateCheck),
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
restoreStdout := ui.CaptureStdoutToTraceLog()
|
||||||
|
defer restoreStdout()
|
||||||
|
|
||||||
return runPackages(id, opts, args[0])
|
return runPackages(id, opts, args[0])
|
||||||
},
|
},
|
||||||
}, opts)
|
}, opts)
|
||||||
|
|||||||
@ -1,8 +1,9 @@
|
|||||||
package cli
|
package cli
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/stretchr/testify/assert"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Test_RequestedPathIncludesSymlink(t *testing.T) {
|
func Test_RequestedPathIncludesSymlink(t *testing.T) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user