Skip to content
This repository has been archived by the owner on Jan 23, 2025. It is now read-only.

fix: switch to casting aws errors #839

Merged
merged 2 commits into from
Aug 11, 2022
Merged

fix: switch to casting aws errors #839

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d21e6f
fix: switch to casting aws errors
owenrumney Aug 11, 2022
86b32bd
fix: remove the unused import
owenrumney Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions internal/adapters/cloud/aws/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package s3

import (
"errors"
"strings"

"github.com/aquasecurity/defsec/pkg/concurrency"
Expand Down Expand Up @@ -66,8 +65,8 @@ func (a *adapter) getPublicAccessBlock(bucketName *string, metadata defsecTypes.
Bucket: bucketName,
})
if err != nil {
var awsError awserr.Error
if errors.As(err, &awsError) {
// nolint
if awsError, ok := err.(awserr.Error); ok {
if awsError.Code() == "NoSuchPublicAccessBlockConfiguration" {
return nil
}
Expand Down Expand Up @@ -134,8 +133,8 @@ func (a *adapter) getBucketPolicies(bucketName *string, metadata defsecTypes.Met

bucketPolicy, err := a.api.GetBucketPolicy(a.Context(), &s3api.GetBucketPolicyInput{Bucket: bucketName})
if err != nil {
var awsError awserr.Error
if errors.As(err, &awsError) {
// nolint
if awsError, ok := err.(awserr.Error); ok {
if awsError.Code() == "NoSuchBucketPolicy" {
return nil
}
Expand Down Expand Up @@ -177,8 +176,8 @@ func (a *adapter) getBucketEncryption(bucketName *string, metadata defsecTypes.M

encryption, err := a.api.GetBucketEncryption(a.Context(), &s3api.GetBucketEncryptionInput{Bucket: bucketName})
if err != nil {
var awsError awserr.Error
if errors.As(err, &awsError) {
// nolint
if awsError, ok := err.(awserr.Error); ok {
if awsError.Code() == "ServerSideEncryptionConfigurationNotFoundError" {
return bucketEncryption
}
Expand Down Expand Up @@ -209,8 +208,8 @@ func (a *adapter) getBucketVersioning(bucketName *string, metadata defsecTypes.M

versioning, err := a.api.GetBucketVersioning(a.Context(), &s3api.GetBucketVersioningInput{Bucket: bucketName})
if err != nil {
var awsError awserr.Error
if errors.As(err, &awsError) {
// nolint
if awsError, ok := err.(awserr.Error); ok {
if awsError.Code() == "NotImplemented" {
return bucketVersioning
}
Expand Down