Merge pull request #296 from MSchouwPablo/cognito-pipes-tags

feat(resource): enable support for tags in cognito userpools & pipes

resources/cognito-identity-providers.go

@@ -51,7 +51,7 @@ func (l *CognitoIdentityProviderLister) List(ctx context.Context, o interface{})
 		}
 
 		listParams := &cognitoidentityprovider.ListIdentityProvidersInput{
-			UserPoolId: userPool.id,
+			UserPoolId: userPool.ID,
 			MaxResults: aws.Int64(50),
 		}
 
@@ -66,8 +66,8 @@ func (l *CognitoIdentityProviderLister) List(ctx context.Context, o interface{})
 					svc:          svc,
 					name:         provider.ProviderName,
 					providerType: provider.ProviderType,
-					userPoolName: userPool.name,
-					userPoolID:   userPool.id,
+					userPoolName: userPool.Name,
+					userPoolID:   userPool.ID,
 				})
 			}
 

resources/cognito-userpool-clients.go

@@ -49,7 +49,7 @@ func (l *CognitoUserPoolClientLister) List(ctx context.Context, o interface{}) (
 		}
 
 		listParams := &cognitoidentityprovider.ListUserPoolClientsInput{
-			UserPoolId: userPool.id,
+			UserPoolId: userPool.ID,
 			MaxResults: aws.Int64(50),
 		}
 
@@ -64,8 +64,8 @@ func (l *CognitoUserPoolClientLister) List(ctx context.Context, o interface{}) (
 					svc:          svc,
 					id:           client.ClientId,
 					name:         client.ClientName,
-					userPoolName: userPool.name,
-					userPoolID:   userPool.id,
+					userPoolName: userPool.Name,
+					userPoolID:   userPool.ID,
 				})
 			}
 

resources/cognito-userpool-domains.go

@@ -46,7 +46,7 @@ func (l *CognitoUserPoolDomainLister) List(ctx context.Context, o interface{}) (
 		}
 
 		describeParams := &cognitoidentityprovider.DescribeUserPoolInput{
-			UserPoolId: userPool.id,
+			UserPoolId: userPool.ID,
 		}
 		userPoolDetails, err := svc.DescribeUserPool(describeParams)
 		if err != nil {
@@ -60,8 +60,8 @@ func (l *CognitoUserPoolDomainLister) List(ctx context.Context, o interface{}) (
 		resources = append(resources, &CognitoUserPoolDomain{
 			svc:          svc,
 			name:         userPoolDetails.UserPool.Domain,
-			userPoolName: userPool.name,
-			userPoolID:   userPool.id,
+			userPoolName: userPool.Name,
+			userPoolID:   userPool.ID,
 		})
 	}
 

resources/cognito-userpools.go

@@ -2,12 +2,19 @@ package resources
 
 import (
 	"context"
+	"fmt"
+
+	"github.com/gotidy/ptr"
+	"github.com/sirupsen/logrus"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cognitoidentityprovider"
+	"github.com/aws/aws-sdk-go/service/sts"
+	"github.com/aws/aws-sdk-go/service/sts/stsiface"
 
 	"github.com/ekristen/libnuke/pkg/registry"
 	"github.com/ekristen/libnuke/pkg/resource"
+	"github.com/ekristen/libnuke/pkg/types"
 
 	"github.com/ekristen/aws-nuke/v3/pkg/nuke"
 )
@@ -27,14 +34,29 @@ func init() {
 	})
 }
 
-type CognitoUserPoolLister struct{}
+type CognitoUserPoolLister struct {
+	stsService stsiface.STSAPI
+}
 
 func (l *CognitoUserPoolLister) List(_ context.Context, o interface{}) ([]resource.Resource, error) {
 	opts := o.(*nuke.ListerOpts)
 
+	var stsSvc stsiface.STSAPI
+	if l.stsService != nil {
+		stsSvc = l.stsService
+	} else {
+		stsSvc = sts.New(opts.Session)
+	}
+
 	svc := cognitoidentityprovider.New(opts.Session)
 	resources := make([]resource.Resource, 0)
 
+	identityOutput, err := stsSvc.GetCallerIdentity(nil)
+	if err != nil {
+		return nil, err
+	}
+	accountID := identityOutput.Account
+
 	params := &cognitoidentityprovider.ListUserPoolsInput{
 		MaxResults: aws.Int64(50),
 	}
@@ -46,10 +68,19 @@ func (l *CognitoUserPoolLister) List(_ context.Context, o interface{}) ([]resour
 		}
 
 		for _, pool := range output.UserPools {
+			tagResp, tagsErr := svc.ListTagsForResource(&cognitoidentityprovider.ListTagsForResourceInput{
+				ResourceArn: ptr.String(fmt.Sprintf("arn:aws:cognito-idp:%s:%s:userpool/%s", opts.Region.Name, *accountID, *pool.Id)),
+			})
+
+			if tagsErr != nil {
+				logrus.WithError(tagsErr).Error("unable to get tags for userpool")
+			}
+
 			resources = append(resources, &CognitoUserPool{
 				svc:  svc,
-				name: pool.Name,
-				id:   pool.Id,
+				Name: pool.Name,
+				ID:   pool.Id,
+				Tags: tagResp.Tags,
 			})
 		}
 
@@ -65,18 +96,23 @@ func (l *CognitoUserPoolLister) List(_ context.Context, o interface{}) ([]resour
 
 type CognitoUserPool struct {
 	svc  *cognitoidentityprovider.CognitoIdentityProvider
-	name *string
-	id   *string
+	Name *string
+	ID   *string
+	Tags map[string]*string
 }
 
 func (f *CognitoUserPool) Remove(_ context.Context) error {
 	_, err := f.svc.DeleteUserPool(&cognitoidentityprovider.DeleteUserPoolInput{
-		UserPoolId: f.id,
+		UserPoolId: f.ID,
 	})
 
 	return err
 }
 
+func (f *CognitoUserPool) Properties() types.Properties {
+	return types.NewPropertiesFromStruct(f)
+}
+
 func (f *CognitoUserPool) String() string {
-	return *f.name
+	return *f.Name
 }

resources/pipes-pipe.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"time"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/aws/aws-sdk-go/service/pipes"
 
 	"github.com/ekristen/libnuke/pkg/registry"
@@ -36,6 +38,14 @@ func (l *PipesPipeLister) List(_ context.Context, o interface{}) ([]resource.Res
 	}
 
 	for _, p := range res.Pipes {
+		tagResp, tagsErr := svc.ListTagsForResource(&pipes.ListTagsForResourceInput{
+			ResourceArn: p.Arn,
+		})
+
+		if tagsErr != nil {
+			logrus.WithError(tagsErr).Error("unable to get tags for pipe")
+		}
+
 		resources = append(resources, &PipesPipes{
 			svc:          svc,
 			Name:         p.Name,
@@ -44,6 +54,7 @@ func (l *PipesPipeLister) List(_ context.Context, o interface{}) ([]resource.Res
 			Target:       p.Target,
 			CreationDate: p.CreationTime,
 			ModifiedDate: p.LastModifiedTime,
+			Tags:         tagResp.Tags,
 		})
 	}
 
@@ -58,6 +69,7 @@ type PipesPipes struct {
 	Target       *string
 	CreationDate *time.Time
 	ModifiedDate *time.Time
+	Tags         map[string]*string
 }
 
 func (r *PipesPipes) Remove(_ context.Context) error {