Skip to content

Commit

Permalink
Do not use effect.NewExecutor use CommandExecutor instead
Browse files Browse the repository at this point in the history
When running `syft`, do not use effect.NewExecutor which runs the command with a tty. This seems to cause an issue with syft (or possibly with our tty library pty), and in either case you end up with stray formatting characters even though we tell syft to be quiet. Using CommandExecutor is basically the same, but it doesn't run with a tty.

Signed-off-by: Daniel Mikusa <[email protected]>
  • Loading branch information
dmikusa committed Oct 4, 2024
1 parent bbe470b commit cf32039
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tomcat/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ func (b Build) Build(context libcnb.BuildContext) (libcnb.BuildResult, error) {
)

if b.SBOMScanner == nil {
b.SBOMScanner = sbom.NewSyftCLISBOMScanner(context.Layers, effect.NewExecutor(), b.Logger)
b.SBOMScanner = sbom.NewSyftCLISBOMScanner(context.Layers, effect.CommandExecutor{}, b.Logger)
}
if err := b.SBOMScanner.ScanLaunch(context.Application.Path, libcnb.SyftJSON, libcnb.CycloneDXJSON); err != nil {
return libcnb.BuildResult{}, fmt.Errorf("unable to create Launch SBoM \n%w", err)
Expand Down
1 change: 1 addition & 0 deletions tomcat/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
sbomScanner = mocks.SBOMScanner{}
sbomScanner.On("ScanLaunch", ctx.Application.Path, libcnb.SyftJSON, libcnb.CycloneDXJSON).Return(nil)

t.Setenv("BP_ARCH", "amd64")
})

it.After(func() {
Expand Down

0 comments on commit cf32039

Please sign in to comment.