Added properties for several AWS resources

resources/cloudwatchevents-rules.go

@@ -6,6 +6,7 @@ import (
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/cloudwatchevents"
+ "github.com/rebuy-de/aws-nuke/v2/pkg/types"
 )
 
 func init() {
@@ -30,10 +31,20 @@ func ListCloudWatchEventsRules(sess *session.Session) ([]Resource, error) {
  }
 
  for _, rule := range resp.Rules {
+
+ ruleTagsOutput, err := svc.ListTagsForResource(&cloudwatchevents.ListTagsForResourceInput{
+ ResourceARN: rule.Arn,
+ })
+
+ if err != nil {
+ return nil, err
+ }
+
  resources = append(resources, &CloudWatchEventsRule{
  svc: svc,
  name: rule.Name,
  busName: bus.Name,
+ tags: ruleTagsOutput.Tags,
  })
  }
  }
@@ -44,6 +55,7 @@ type CloudWatchEventsRule struct {
  svc *cloudwatchevents.CloudWatchEvents
  name *string
  busName *string
+ tags []*cloudwatchevents.Tag
 }
 
 func (rule *CloudWatchEventsRule) Remove() error {
@@ -55,6 +67,18 @@ func (rule *CloudWatchEventsRule) Remove() error {
  return err
 }
 
+func (rule *CloudWatchEventsRule) Properties() types.Properties {
+ properties := types.NewProperties()
+
+ properties.Set("Name", rule.name)
+
+ for _, tagValue := range rule.tags {
+ properties.SetTag(tagValue.Key, tagValue.Value)
+ }
+
+ return properties
+}
+
 func (rule *CloudWatchEventsRule) String() string {
  return fmt.Sprintf("Rule: %s", *rule.name)
 }

resources/cloudwatchevents-targets.go

@@ -6,6 +6,7 @@ import (
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/cloudwatchevents"
+ "github.com/rebuy-de/aws-nuke/v2/pkg/types"
 )
 
 func init() {
@@ -37,6 +38,10 @@ func ListCloudWatchEventsTargets(sess *session.Session) ([]Resource, error) {
  return nil, err
  }
  for _, target := range targetResp.Targets {
+ if err != nil {
+ return nil, err
+ }
+
  resources = append(resources, &CloudWatchEventsTarget{
  svc: svc,
  ruleName: rule.Name,
@@ -68,6 +73,16 @@ func (target *CloudWatchEventsTarget) Remove() error {
  return err
 }
 
+func (target *CloudWatchEventsTarget) Properties() types.Properties {
+ properties := types.NewProperties()
+
+ properties.Set("TargetId", target.targetId)
+ properties.Set("RuleName", target.ruleName)
+ properties.Set("BusName", target.busName)
+
+ return properties
+}
+
 func (target *CloudWatchEventsTarget) String() string {
  return fmt.Sprintf("Rule: %s Target ID: %s", *target.ruleName, *target.targetId)
 }

resources/cognito-userpool-domains.go

@@ -3,6 +3,7 @@ package resources
 import (
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/cognitoidentityprovider"
+ "github.com/rebuy-de/aws-nuke/v2/pkg/types"
  "github.com/sirupsen/logrus"
 )
 
@@ -66,6 +67,15 @@ func (f *CognitoUserPoolDomain) Remove() error {
  return err
 }
 
+func (f *CognitoUserPoolDomain) Properties() types.Properties {
+ properties := types.NewProperties()
+
+ properties.Set("Domain", f.name)
+ properties.Set("UserPoolName", f.userPoolName)
+ properties.Set("UserPoolId", f.userPoolId)
+ return properties
+}
+
 func (f *CognitoUserPoolDomain) String() string {
  return *f.userPoolName + " -> " + *f.name
 }

resources/cognito-userpools.go

@@ -4,12 +4,14 @@ import (
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/cognitoidentityprovider"
+ "github.com/rebuy-de/aws-nuke/v2/pkg/types"
 )
 
 type CognitoUserPool struct {
  svc *cognitoidentityprovider.CognitoIdentityProvider
  name *string
  id *string
+ tags map[string]*string
 }
 
 func init() {
@@ -31,10 +33,19 @@ func ListCognitoUserPools(sess *session.Session) ([]Resource, error) {
  }
 
  for _, pool := range output.UserPools {
+ poolOutput, err := svc.DescribeUserPool(&cognitoidentityprovider.DescribeUserPoolInput{
+ UserPoolId: pool.Id,
+ })
+
+ if err != nil {
+ return nil, err
+ }
+
  resources = append(resources, &CognitoUserPool{
  svc: svc,
  name: pool.Name,
  id: pool.Id,
+ tags: poolOutput.UserPool.UserPoolTags,
  })
  }
 
@@ -57,6 +68,17 @@ func (f *CognitoUserPool) Remove() error {
  return err
 }
 
+func (f *CognitoUserPool) Properties() types.Properties {
+ properties := types.NewProperties()
+
+ properties.Set("Name", f.name)
+
+ for tagKey, tagValue := range f.tags {
+ properties.SetTag(&tagKey, tagValue)
+ }
+ return properties
+}
+
 func (f *CognitoUserPool) String() string {
  return *f.name
 }

resources/iam-saml-provider.go

@@ -3,6 +3,7 @@ package resources
 import (
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/iam"
+ "github.com/rebuy-de/aws-nuke/v2/pkg/types"
 )
 
 type IAMSAMLProvider struct {
@@ -45,6 +46,11 @@ func (e *IAMSAMLProvider) Remove() error {
  return nil
 }
 
+func (e *IAMSAMLProvider) Properties() types.Properties {
+ properties := types.NewProperties()
+ return properties
+}
+
 func (e *IAMSAMLProvider) String() string {
  return e.arn
 }

resources/iam-user-policy.go

@@ -5,6 +5,7 @@ import (
 
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/iam"
+ "github.com/rebuy-de/aws-nuke/v2/pkg/types"
 )
 
 type IAMUserPolicy struct {
@@ -59,6 +60,15 @@ func (e *IAMUserPolicy) Remove() error {
  return nil
 }
 
+func (e *IAMUserPolicy) Properties() types.Properties {
+ properties := types.NewProperties()
+
+ properties.Set("UserName", e.userName)
+ properties.Set("PolicyName", e.policyName)
+
+ return properties
+}
+
 func (e *IAMUserPolicy) String() string {
  return fmt.Sprintf("%s -> %s", e.userName, e.policyName)
 }

resources/sfn-statemachines.go

@@ -4,11 +4,14 @@ import (
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/sfn"
+ "github.com/rebuy-de/aws-nuke/v2/pkg/types"
 )
 
 type SFNStateMachine struct {
- svc *sfn.SFN
- ARN *string
+ svc *sfn.SFN
+ ARN *string
+ name *string
+ tags []*sfn.Tag
 }
 
 func init() {
@@ -30,9 +33,19 @@ func ListSFNStateMachines(sess *session.Session) ([]Resource, error) {
  }
 
  for _, stateMachine := range output.StateMachines {
+ tagsOutput, err := svc.ListTagsForResource(&sfn.ListTagsForResourceInput{
+ ResourceArn: stateMachine.StateMachineArn,
+ })
+
+ if err != nil {
+ return nil, err
+ }
+
  resources = append(resources, &SFNStateMachine{
- svc: svc,
- ARN: stateMachine.StateMachineArn,
+ svc: svc,
+ ARN: stateMachine.StateMachineArn,
+ name: stateMachine.Name,
+ tags: tagsOutput.Tags,
  })
  }
 
@@ -76,6 +89,17 @@ func (f *SFNStateMachine) Remove() error {
  return err
 }
 
+func (s *SFNStateMachine) Properties() types.Properties {
+ properties := types.NewProperties()
+
+ properties.Set("Name", s.name)
+
+ for _, tagValue := range s.tags {
+ properties.SetTag(tagValue.Key, tagValue.Value)
+ }
+ return properties
+}
+
 func (f *SFNStateMachine) String() string {
  return *f.ARN
 }

resources/sns-subscriptions.go

@@ -5,6 +5,7 @@ import (
 
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/sns"
+ "github.com/rebuy-de/aws-nuke/v2/pkg/types"
 )
 
 func init() {
@@ -24,6 +25,7 @@ func ListSNSSubscriptions(sess *session.Session) ([]Resource, error) {
  }
  for _, subscription := range resp.Subscriptions {
  if *subscription.SubscriptionArn != "PendingConfirmation" {
+
  resources = append(resources, &SNSSubscription{
  svc: svc,
  id: subscription.SubscriptionArn,
@@ -56,6 +58,15 @@ func (subs *SNSSubscription) Remove() error {
  return err
 }
 
+func (subs *SNSSubscription) Properties() types.Properties {
+ properties := types.NewProperties()
+
+ properties.Set("Id", subs.id)
+ properties.Set("Name", subs.name)
+
+ return properties
+}
+
 func (subs *SNSSubscription) String() string {
  return fmt.Sprintf("Owner: %s ARN: %s", *subs.name, *subs.id)
 }

resources/ssm-documents.go

@@ -4,11 +4,13 @@ import (
  "github.com/aws/aws-sdk-go/aws"
  "github.com/aws/aws-sdk-go/aws/session"
  "github.com/aws/aws-sdk-go/service/ssm"
+ "github.com/rebuy-de/aws-nuke/v2/pkg/types"
 )
 
 type SSMDocument struct {
  svc *ssm.SSM
  name *string
+ tags []*ssm.Tag
 }
 
 func init() {
@@ -41,6 +43,7 @@ func ListSSMDocuments(sess *session.Session) ([]Resource, error) {
  resources = append(resources, &SSMDocument{
  svc: svc,
  name: documentIdentifier.Name,
+ tags: documentIdentifier.Tags,
  })
  }
 
@@ -63,6 +66,18 @@ func (f *SSMDocument) Remove() error {
  return err
 }
 
+func (f *SSMDocument) Properties() types.Properties {
+ properties := types.NewProperties()
+
+ properties.Set("Name", f.name)
+
+ for _, tagValue := range f.tags {
+ properties.SetTag(tagValue.Key, tagValue.Value)
+ }
+
+ return properties
+}
+
 func (f *SSMDocument) String() string {
  return *f.name
 }