fixed logic ignoring error (#274)

cloudquery · Nov 19, 2021 · bb357dd · bb357dd
1 parent fe1b01e
commit bb357dd
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/resources/s3_buckets.go b/resources/s3_buckets.go
@@ -653,15 +653,15 @@ func resolveBucketPolicy(ctx context.Context, meta schema.ClientMeta, resource *
 	})
 	// check if we got an error but its access denied we can continue
 	if err != nil {
-		if client.IgnoreAccessDeniedServiceDisabled(err) {
-			meta.Logger().Warn("received access denied on GetBucketPolicy", "bucket", bucketName, "err", err)
-			return nil
-		}
 		// if we got an error and its not a NoSuchBucketError, return err
 		var ae smithy.APIError
 		if errors.As(err, &ae) && ae.ErrorCode() == "NoSuchBucketPolicy" {
 			return nil
 		}
+		if client.IgnoreAccessDeniedServiceDisabled(err) {
+			meta.Logger().Warn("received access denied on GetBucketPolicy", "bucket", bucketName, "err", err)
+			return nil
+		}
 		return err
 	}
 	if policyOutput == nil {
@@ -696,16 +696,16 @@ func resolveBucketPublicAccessBlock(ctx context.Context, meta schema.ClientMeta,
 	publicAccessOutput, err := svc.GetPublicAccessBlock(ctx, &s3.GetPublicAccessBlockInput{Bucket: aws.String(bucketName)}, func(options *s3.Options) {
 		options.Region = bucketRegion
 	})
-	var ae smithy.APIError
 	if err != nil {
-		if client.IgnoreAccessDeniedServiceDisabled(err) {
-			meta.Logger().Warn("received access denied on GetPublicAccessBlock", "bucket", bucketName, "err", err)
-			return nil
-		}
 		// If we received any error other than NoSuchPublicAccessBlockConfiguration, we return and error
+		var ae smithy.APIError
 		if errors.As(err, &ae) && ae.ErrorCode() == "NoSuchPublicAccessBlockConfiguration" {
 			return nil
 		}
+		if client.IgnoreAccessDeniedServiceDisabled(err) {
+			meta.Logger().Warn("received access denied on GetPublicAccessBlock", "bucket", bucketName, "err", err)
+			return nil
+		}
 		return err
 	}
 	if err := resource.Set("block_public_acls", publicAccessOutput.PublicAccessBlockConfiguration.BlockPublicAcls); err != nil {
@@ -730,15 +730,15 @@ func resolveBucketReplication(ctx context.Context, meta schema.ClientMeta, resou
 	})
 
 	if err != nil {
-		if client.IgnoreAccessDeniedServiceDisabled(err) {
-			meta.Logger().Warn("received access denied on getBucketReplication", "bucket", bucketName, "err", err)
-			return nil
-		}
 		// If we received any error other than ReplicationConfigurationNotFoundError, we return and error
 		var ae smithy.APIError
 		if errors.As(err, &ae) && ae.ErrorCode() == "ReplicationConfigurationNotFoundError" {
 			return nil
 		}
+		if client.IgnoreAccessDeniedServiceDisabled(err) {
+			meta.Logger().Warn("received access denied on GetBucketReplication", "bucket", bucketName, "err", err)
+			return nil
+		}
 		return err
 	}
 	if replicationOutput.ReplicationConfiguration == nil {