fix: Correctly handle recoverable AWS scanning errors (#2726)

aquasecurity · Aug 16, 2022 · fefe7c4 · fefe7c4
1 parent 9c92e3d
commit fefe7c4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -162,7 +162,7 @@ require (
  github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
  github.com/apparentlymart/go-cidr v1.1.0 // indirect
  github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
- github.com/aquasecurity/defsec v0.71.7
+ github.com/aquasecurity/defsec v0.71.9
  github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
  github.com/aws/aws-sdk-go v1.44.77
  github.com/beorn7/perks v1.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -204,8 +204,8 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
 github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986 h1:2a30xLN2sUZcMXl50hg+PJCIDdJgIvIbVcKqLJ/ZrtM=
 github.com/aquasecurity/bolt-fixtures v0.0.0-20200903104109-d34e7f983986/go.mod h1:NT+jyeCzXk6vXR5MTkdn4z64TgGfE5HMLC8qfj5unl8=
-github.com/aquasecurity/defsec v0.71.7 h1:JiP7N27boWvwkuy6GN5HfZOHnra+MqAC7LX4kOK91Ig=
-github.com/aquasecurity/defsec v0.71.7/go.mod h1:2jYgkIi3UFbkrbtpnr3Cu49JZ3MGuLMJAhyh63jV1I4=
+github.com/aquasecurity/defsec v0.71.9 h1:eo244v1RQzziClY9xXyVftPibE0fddXbTtkvH52/slU=
+github.com/aquasecurity/defsec v0.71.9/go.mod h1:2jYgkIi3UFbkrbtpnr3Cu49JZ3MGuLMJAhyh63jV1I4=
 github.com/aquasecurity/go-dep-parser v0.0.0-20220815163410-fcf26eb92b86 h1:sc8hDjSxO3aiG0R7HvaAVnY6329NTtv9AqDGpVQxAPQ=
 github.com/aquasecurity/go-dep-parser v0.0.0-20220815163410-fcf26eb92b86/go.mod h1:wwxn1SyOEY8W5hy8aDQDoExX+ybVsi+xfIllXz93+Fk=
 github.com/aquasecurity/go-gem-version v0.0.0-20201115065557-8eed6fe000ce h1:QgBRgJvtEOBtUXilDb1MLi1p1MWoyFDXAu5DEUl5nwM=

diff --git a/pkg/cloud/aws/commands/run.go b/pkg/cloud/aws/commands/run.go
@@ -150,8 +150,9 @@ func Run(ctx context.Context, opt flag.Options) error {
  for _, e := range aerr.Errors() {
  log.Logger.Warnf("Adapter error: %s", e)
  }
+ } else {
+ return fmt.Errorf("aws scan error: %w", err)
  }
- return fmt.Errorf("aws scan error: %w", err)
  }
  r = report.New(cloud.ProviderAWS, opt.Account, opt.Region, results.GetFailed(), opt.Services)
  } else {