fix s3 buckets (#773)

Author: svenwltr

resources/s3-buckets.go

@@ -2,6 +2,7 @@ package resources
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
@@ -20,9 +21,10 @@ func init() {
 }
 
 type S3Bucket struct {
-	svc  *s3.S3
-	name string
-	tags []*s3.Tag
+	svc          *s3.S3
+	name         string
+	creationDate time.Time
+	tags         []*s3.Tag
 }
 
 func ListS3Buckets(s *session.Session) ([]Resource, error) {
@@ -34,41 +36,43 @@ func ListS3Buckets(s *session.Session) ([]Resource, error) {
 	}
 
 	resources := make([]Resource, 0)
-	for _, name := range buckets {
+	for _, bucket := range buckets {
 		tags, err := svc.GetBucketTagging(&s3.GetBucketTaggingInput{
-			Bucket: aws.String(name),
+			Bucket: bucket.Name,
 		})
 
 		if err != nil {
 			if aerr, ok := err.(awserr.Error); ok {
 				if aerr.Code() == "NoSuchTagSet" {
 					resources = append(resources, &S3Bucket{
-						svc:  svc,
-						name: name,
-						tags: make([]*s3.Tag, 0),
+						svc:          svc,
+						name:         aws.StringValue(bucket.Name),
+						creationDate: aws.TimeValue(bucket.CreationDate),
+						tags:         make([]*s3.Tag, 0),
 					})
 				}
 			}
 			continue
 		}
 
 		resources = append(resources, &S3Bucket{
-			svc:  svc,
-			name: name,
-			tags: tags.TagSet,
+			svc:          svc,
+			name:         aws.StringValue(bucket.Name),
+			creationDate: aws.TimeValue(bucket.CreationDate),
+			tags:         tags.TagSet,
 		})
 	}
 
 	return resources, nil
 }
 
-func DescribeS3Buckets(svc *s3.S3) ([]string, error) {
+func DescribeS3Buckets(svc *s3.S3) ([]s3.Bucket, error) {
 	resp, err := svc.ListBuckets(nil)
 	if err != nil {
 		return nil, err
 	}
 
-	buckets := make([]string, 0)
+	buckets := make([]s3.Bucket, 0)
 	for _, out := range resp.Buckets {
 		bucketLocationResponse, err := svc.GetBucketLocation(&s3.GetBucketLocationInput{Bucket: out.Name})
 
@@ -78,10 +82,9 @@ func DescribeS3Buckets(svc *s3.S3) ([]string, error) {
 
 		location := UnPtrString(bucketLocationResponse.LocationConstraint, endpoints.UsEast1RegionID)
 		region := UnPtrString(svc.Config.Region, endpoints.UsEast1RegionID)
-		if location == region {
-			buckets = append(buckets, *out.Name)
+		if location == region && out != nil {
+			buckets = append(buckets, *out)
 		}
-
 	}
 
 	return buckets, nil
@@ -139,9 +142,9 @@ func (e *S3Bucket) RemoveAllObjects() error {
 }
 
 func (e *S3Bucket) Properties() types.Properties {
-	properties := types.NewProperties()
-	properties.Set("Name", e.name).
-	properties.Set("CreationDate", e.CreationDate)
+	properties := types.NewProperties().
+		Set("Name", e.name).
+		Set("CreationDate", e.creationDate)
 
 	for _, tag := range e.tags {
 		properties.SetTag(tag.Key, tag.Value)

resources/s3-multipart-uploads.go

@@ -3,6 +3,7 @@ package resources
 import (
 	"fmt"
 
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/rebuy-de/aws-nuke/pkg/types"
@@ -29,9 +30,9 @@ func ListS3MultipartUpload(sess *session.Session) ([]Resource, error) {
 		return nil, err
 	}
 
-	for _, name := range buckets {
+	for _, bucket := range buckets {
 		params := &s3.ListMultipartUploadsInput{
-			Bucket: &name,
+			Bucket: bucket.Name,
 		}
 
 		for {
@@ -47,7 +48,7 @@ func ListS3MultipartUpload(sess *session.Session) ([]Resource, error) {
 
 				resources = append(resources, &S3MultipartUpload{
 					svc:      svc,
-					bucket:   name,
+					bucket:   aws.StringValue(bucket.Name),
 					key:      *upload.Key,
 					uploadID: *upload.UploadId,
 				})

resources/s3-objects.go

@@ -2,18 +2,21 @@ package resources
 
 import (
 	"fmt"
+	"time"
 
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/rebuy-de/aws-nuke/pkg/types"
 )
 
 type S3Object struct {
-	svc       *s3.S3
-	bucket    string
-	key       string
-	versionID *string
-	latest    bool
+	svc          *s3.S3
+	bucket       string
+	creationDate time.Time
+	key          string
+	versionID    *string
+	latest       bool
 }
 
 func init() {
@@ -30,9 +33,9 @@ func ListS3Objects(sess *session.Session) ([]Resource, error) {
 		return nil, err
 	}
 
-	for _, name := range buckets {
+	for _, bucket := range buckets {
 		params := &s3.ListObjectVersionsInput{
-			Bucket: &name,
+			Bucket: bucket.Name,
 		}
 
 		for {
@@ -47,11 +50,12 @@ func ListS3Objects(sess *session.Session) ([]Resource, error) {
 				}
 
 				resources = append(resources, &S3Object{
-					svc:       svc,
-					bucket:    name,
-					key:       *out.Key,
-					versionID: out.VersionId,
-					latest:    UnPtrBool(out.IsLatest, false),
+					svc:          svc,
+					bucket:       aws.StringValue(bucket.Name),
+					creationDate: aws.TimeValue(bucket.CreationDate),
+					key:          *out.Key,
+					versionID:    out.VersionId,
+					latest:       UnPtrBool(out.IsLatest, false),
 				})
 			}
 
@@ -61,11 +65,12 @@ func ListS3Objects(sess *session.Session) ([]Resource, error) {
 				}
 
 				resources = append(resources, &S3Object{
-					svc:       svc,
-					bucket:    name,
-					key:       *out.Key,
-					versionID: out.VersionId,
-					latest:    UnPtrBool(out.IsLatest, false),
+					svc:          svc,
+					bucket:       aws.StringValue(bucket.Name),
+					creationDate: aws.TimeValue(bucket.CreationDate),
+					key:          *out.Key,
+					versionID:    out.VersionId,
+					latest:       UnPtrBool(out.IsLatest, false),
 				})
 			}
 
@@ -103,7 +108,7 @@ func (e *S3Object) Properties() types.Properties {
 		Set("Key", e.key).
 		Set("VersionID", e.versionID).
 		Set("IsLatest", e.latest).
-		Set("CreationDate", e.CreationDate)
+		Set("CreationDate", e.creationDate)
 }
 
 func (e *S3Object) String() string {