From 1cfd159451e7c4a00d9b3695675a4e73ca2d811b Mon Sep 17 00:00:00 2001 From: Daniel Rieske Date: Wed, 28 Jun 2023 11:45:44 +0200 Subject: [PATCH] Removed deprecated redshift resource (#1722) * feat: removed deprecated redshift resource and added redshift resources to documentation * chore: removed unnecessary spacing --- docs/aws.md | 7 +++++++ go.mod | 2 -- go.sum | 2 -- providers/aws/redshift.go | 24 ------------------------ 4 files changed, 7 insertions(+), 28 deletions(-) diff --git a/docs/aws.md b/docs/aws.md index 2cd07bda9..f55ca271b 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -247,6 +247,13 @@ terraformer import aws --resources=sg --regions=us-east-1 * `aws_db_option_group` * `aws_db_event_subscription` * `aws_rds_global_cluster` +* `redshift` + * `aws_redshift_cluster` + * `aws_redshift_event_subscription` + * `aws_redshift_parameter_group` + * `aws_redshift_snapshot_schedule` + * `aws_redshift_snapshot_schedule_association` + * `aws_redshift_subnet_group` * `resourcegroups` * `aws_resourcegroups_group` * `route53` diff --git a/go.mod b/go.mod index 259ab0a6c..c46749d7d 100644 --- a/go.mod +++ b/go.mod @@ -378,9 +378,7 @@ require ( require ( github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.5 github.com/aws/aws-sdk-go-v2/service/medialive v1.24.2 - github.com/aws/aws-sdk-go-v2/service/ssoadmin v1.16.5 - github.com/opalsecurity/opal-go v1.0.9 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/as v1.0.392 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.392 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.392 diff --git a/go.sum b/go.sum index 8835b2a23..d72808556 100644 --- a/go.sum +++ b/go.sum @@ -385,8 +385,6 @@ github.com/aws/aws-sdk-go-v2/service/iam v1.3.0 h1:V95YLxbxLGlTcFR0KMMSZEaudIxYC github.com/aws/aws-sdk-go-v2/service/iam v1.3.0/go.mod h1:gPUYT7MBEb30j9eAsJ17LN9KbXtD1uqKOOKesCC4tjc= github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.5 h1:Mbz3LjbbVE6fFwYEYf2cJFcmFmIOZhSOyuTGYY0CzgQ= github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.5/go.mod h1:ZMSJuu9//YKamgC3vArYkljfp2wjbtwdqYAwclNfhXY= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.6 h1:tzB5Y88Xb4//jybVjrk6ECAcUhCk1ZwV2NuBnpil+w0= -github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.6/go.mod h1:qdai9l1KfhYZ4J0HWFtN9KJ8pG+TwG9UxCHcdf0EdTE= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.3 h1:iLFz4nrWkXMTFeVn0n99wRyc4Xib4SlDbtAM3h2z8P8= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.3/go.mod h1:g3Xw4tO/W+ae4EMzkxB6nGnJ48cLM4i1Z61WmD+IKtY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.5/go.mod h1:MW0O/RpmVpS6MWKn6W03XEJmqXlG7+d3iaYLzkd2fAc= diff --git a/providers/aws/redshift.go b/providers/aws/redshift.go index 29be5d67b..b88d69ffc 100644 --- a/providers/aws/redshift.go +++ b/providers/aws/redshift.go @@ -97,27 +97,6 @@ func (g *RedshiftGenerator) loadSubnetGroups(svc *redshift.Client) error { return nil } -func (g *RedshiftGenerator) loadSecurityGroups(svc *redshift.Client) error { - p := redshift.NewDescribeClusterSecurityGroupsPaginator(svc, &redshift.DescribeClusterSecurityGroupsInput{}) - for p.HasMorePages() { - page, err := p.NextPage(context.TODO()) - if err != nil { - return err - } - for _, sg := range page.ClusterSecurityGroups { - resourceName := StringValue(sg.ClusterSecurityGroupName) - g.Resources = append(g.Resources, terraformutils.NewSimpleResource( - resourceName, - resourceName, - "aws_redshift_security_group", - "aws", - RedshiftAllowEmptyValues, - )) - } - } - return nil -} - func (g *RedshiftGenerator) loadEventSubscription(svc *redshift.Client) error { p := redshift.NewDescribeEventSubscriptionsPaginator(svc, &redshift.DescribeEventSubscriptionsInput{}) for p.HasMorePages() { @@ -191,9 +170,6 @@ func (g *RedshiftGenerator) InitResources() error { if err := g.loadSubnetGroups(svc); err != nil { return err } - if err := g.loadSecurityGroups(svc); err != nil { - return err - } if err := g.loadEventSubscription(svc); err != nil { return err }