Skip to content

Commit 87a9aa6

Browse files
authored
feat(aws): quiet flag support (#6331)
1 parent 712dcd3 commit 87a9aa6

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

pkg/cloud/aws/commands/run.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ func Run(ctx context.Context, opt flag.Options) error {
132132
ctx, cancel := context.WithTimeout(ctx, opt.GlobalOptions.Timeout)
133133
defer cancel()
134134

135-
if err := log.InitLogger(opt.Debug, false); err != nil {
136-
return xerrors.Errorf("logger error: %w", err)
137-
}
138-
139135
var err error
140136
defer func() {
141137
if errors.Is(err, context.DeadlineExceeded) {

pkg/cloud/aws/scanner/progress.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package scanner
22

33
import (
44
"fmt"
5+
"io"
56
"os"
67

78
"github.com/aquasecurity/loading/pkg/bar"
@@ -12,15 +13,17 @@ type progressTracker struct {
1213
serviceTotal int
1314
serviceCurrent int
1415
isTTY bool
16+
debugWriter io.Writer
1517
}
1618

17-
func newProgressTracker() *progressTracker {
19+
func newProgressTracker(w io.Writer) *progressTracker {
1820
var isTTY bool
1921
if stat, err := os.Stdout.Stat(); err == nil {
2022
isTTY = stat.Mode()&os.ModeCharDevice == os.ModeCharDevice
2123
}
2224
return &progressTracker{
23-
isTTY: isTTY,
25+
isTTY: isTTY,
26+
debugWriter: w,
2427
}
2528
}
2629

@@ -69,7 +72,8 @@ func (m *progressTracker) StartService(name string) {
6972
if !m.isTTY {
7073
return
7174
}
72-
fmt.Printf("[%d/%d] Scanning %s...\n", m.serviceCurrent+1, m.serviceTotal, name)
75+
76+
fmt.Fprintf(m.debugWriter, "[%d/%d] Scanning %s...\n", m.serviceCurrent+1, m.serviceTotal, name)
7377
m.serviceBar = bar.New(
7478
bar.OptionHideOnFinish(true),
7579
bar.OptionWithAutoComplete(false),

pkg/cloud/aws/scanner/scanner.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ func (s *AWSScanner) Scan(ctx context.Context, option flag.Options) (scan.Result
3131
awsCache := cache.New(option.CacheDir, option.MaxCacheAge, option.Account, option.Region)
3232
included, missing := awsCache.ListServices(option.Services)
3333

34+
prefixedLogger := &log.PrefixedLogger{Name: "aws"}
35+
3436
var scannerOpts []options.ScannerOption
3537
if !option.NoProgress {
36-
tracker := newProgressTracker()
38+
tracker := newProgressTracker(prefixedLogger)
3739
defer tracker.Finish()
3840
scannerOpts = append(scannerOpts, aws.ScannerWithProgressTracker(tracker))
3941
}
@@ -43,11 +45,11 @@ func (s *AWSScanner) Scan(ctx context.Context, option flag.Options) (scan.Result
4345
}
4446

4547
if option.Debug {
46-
scannerOpts = append(scannerOpts, options.ScannerWithDebug(&log.PrefixedLogger{Name: "aws"}))
48+
scannerOpts = append(scannerOpts, options.ScannerWithDebug(prefixedLogger))
4749
}
4850

4951
if option.Trace {
50-
scannerOpts = append(scannerOpts, options.ScannerWithTrace(&log.PrefixedLogger{Name: "aws"}))
52+
scannerOpts = append(scannerOpts, options.ScannerWithTrace(prefixedLogger))
5153
}
5254

5355
if option.Region != "" {

0 commit comments

Comments
 (0)