Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

register missing resource - TGW Peering Attachment #802

Merged
merged 2 commits into from
Dec 6, 2024
Merged

register missing resource - TGW Peering Attachment #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
818ed81
register missing resource - TGW Peering Attachment
wakeful Dec 4, 2024
15374b7
change port transit-gateway-peering-attachment to awsSDKv2 #770
wakeful Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions aws/resource_registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func getRegisteredRegionalResources() []AwsResource {
&resources.TransitGateways{},
&resources.TransitGatewaysRouteTables{},
// Note: nuking transitgateway vpc attachement before nuking the vpc since vpc could be associated with it.
&resources.TransitGatewayPeeringAttachment{},
&resources.TransitGatewaysVpcAttachment{},
&resources.EC2Endpoints{},
&resources.EC2VPCs{},
Expand Down
23 changes: 12 additions & 11 deletions aws/resources/tgw_peering_attachment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package resources
import (
"context"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/gruntwork-io/cloud-nuke/config"
"github.com/gruntwork-io/cloud-nuke/logging"
"github.com/gruntwork-io/cloud-nuke/report"
Expand All @@ -13,32 +13,33 @@ import (

func (tgpa *TransitGatewayPeeringAttachment) getAll(c context.Context, configObj config.Config) ([]*string, error) {
var ids []*string
err := tgpa.Client.DescribeTransitGatewayPeeringAttachmentsPagesWithContext(tgpa.Context, &ec2.DescribeTransitGatewayPeeringAttachmentsInput{}, func(result *ec2.DescribeTransitGatewayPeeringAttachmentsOutput, lastPage bool) bool {
for _, attachment := range result.TransitGatewayPeeringAttachments {
paginator := ec2.NewDescribeTransitGatewayPeeringAttachmentsPaginator(tgpa.Client, &ec2.DescribeTransitGatewayPeeringAttachmentsInput{})
for paginator.HasMorePages() {
page, err := paginator.NextPage(c)
if err != nil {
return nil, errors.WithStackTrace(err)
}

for _, attachment := range page.TransitGatewayPeeringAttachments {
if configObj.TransitGatewayPeeringAttachment.ShouldInclude(config.ResourceValue{
Time: attachment.CreationTime,
}) {
ids = append(ids, attachment.TransitGatewayAttachmentId)
}
}

return !lastPage
})
if err != nil {
return nil, errors.WithStackTrace(err)
}

return ids, nil
}

func (tgpa *TransitGatewayPeeringAttachment) nukeAll(ids []*string) error {
for _, id := range ids {
_, err := tgpa.Client.DeleteTransitGatewayPeeringAttachmentWithContext(tgpa.Context, &ec2.DeleteTransitGatewayPeeringAttachmentInput{
_, err := tgpa.Client.DeleteTransitGatewayPeeringAttachment(tgpa.Context, &ec2.DeleteTransitGatewayPeeringAttachmentInput{
TransitGatewayAttachmentId: id,
})
// Record status of this resource
report.Record(report.Entry{
Identifier: aws.StringValue(id),
Identifier: aws.ToString(id),
ResourceType: tgpa.ResourceName(),
Error: err,
})
Expand Down
22 changes: 9 additions & 13 deletions aws/resources/tgw_peering_attachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,28 @@ import (
"testing"
"time"

"github.com/aws/aws-sdk-go/aws"
awsgo "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/gruntwork-io/cloud-nuke/config"
"github.com/stretchr/testify/require"
)

type mockedTransitGatewayPeeringAttachment struct {
ec2iface.EC2API
TransitGatewayPeeringAttachmentAPI
DescribeTransitGatewayPeeringAttachmentsOutput ec2.DescribeTransitGatewayPeeringAttachmentsOutput
DeleteTransitGatewayPeeringAttachmentOutput ec2.DeleteTransitGatewayPeeringAttachmentOutput
}

func (m mockedTransitGatewayPeeringAttachment) DescribeTransitGatewayPeeringAttachmentsPagesWithContext(_ awsgo.Context, _ *ec2.DescribeTransitGatewayPeeringAttachmentsInput, fn func(*ec2.DescribeTransitGatewayPeeringAttachmentsOutput, bool) bool, _ ...request.Option) error {
fn(&m.DescribeTransitGatewayPeeringAttachmentsOutput, true)
return nil
func (m mockedTransitGatewayPeeringAttachment) DescribeTransitGatewayPeeringAttachments(_ context.Context, _ *ec2.DescribeTransitGatewayPeeringAttachmentsInput, _ ...func(*ec2.Options)) (*ec2.DescribeTransitGatewayPeeringAttachmentsOutput, error) {
return &m.DescribeTransitGatewayPeeringAttachmentsOutput, nil
}

func (m mockedTransitGatewayPeeringAttachment) DeleteTransitGatewayPeeringAttachmentWithContext(_ awsgo.Context, _ *ec2.DeleteTransitGatewayPeeringAttachmentInput, _ ...request.Option) (*ec2.DeleteTransitGatewayPeeringAttachmentOutput, error) {
func (m mockedTransitGatewayPeeringAttachment) DeleteTransitGatewayPeeringAttachment(_ context.Context, _ *ec2.DeleteTransitGatewayPeeringAttachmentInput, _ ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayPeeringAttachmentOutput, error) {
return &m.DeleteTransitGatewayPeeringAttachmentOutput, nil
}

func TestTransitGatewayPeeringAttachment_getAll(t *testing.T) {

t.Parallel()

now := time.Now()
Expand All @@ -39,7 +35,7 @@ func TestTransitGatewayPeeringAttachment_getAll(t *testing.T) {
tgpa := TransitGatewayPeeringAttachment{
Client: mockedTransitGatewayPeeringAttachment{
DescribeTransitGatewayPeeringAttachmentsOutput: ec2.DescribeTransitGatewayPeeringAttachmentsOutput{
TransitGatewayPeeringAttachments: []*ec2.TransitGatewayPeeringAttachment{
TransitGatewayPeeringAttachments: []types.TransitGatewayPeeringAttachment{
{
TransitGatewayAttachmentId: aws.String(attachment1),
CreationTime: aws.Time(now),
Expand Down Expand Up @@ -75,7 +71,7 @@ func TestTransitGatewayPeeringAttachment_getAll(t *testing.T) {
TransitGatewayPeeringAttachment: tc.configObj,
})
require.NoError(t, err)
require.Equal(t, tc.expected, aws.StringValueSlice(names))
require.Equal(t, tc.expected, aws.ToStringSlice(names))
})
}
}
Expand Down
25 changes: 15 additions & 10 deletions aws/resources/tgw_peering_attachment_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,31 @@ package resources
import (
"context"

awsgo "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ec2"
"github.com/gruntwork-io/cloud-nuke/config"
"github.com/gruntwork-io/go-commons/errors"
)

type TransitGatewayPeeringAttachmentAPI interface {
DescribeTransitGatewayPeeringAttachments(ctx context.Context, params *ec2.DescribeTransitGatewayPeeringAttachmentsInput, optFns ...func(*ec2.Options)) (*ec2.DescribeTransitGatewayPeeringAttachmentsOutput, error)
DeleteTransitGatewayPeeringAttachment(ctx context.Context, params *ec2.DeleteTransitGatewayPeeringAttachmentInput, optFns ...func(*ec2.Options)) (*ec2.DeleteTransitGatewayPeeringAttachmentOutput, error)
}

// TransitGatewayPeeringAttachment - represents all transit gateways peering attachment
type TransitGatewayPeeringAttachment struct {
BaseAwsResource
Client ec2iface.EC2API
Client TransitGatewayPeeringAttachmentAPI
Region string
Ids []string
}

func (tgpa *TransitGatewayPeeringAttachment) Init(session *session.Session) {
tgpa.Client = ec2.New(session)
func (tgpa *TransitGatewayPeeringAttachment) InitV2(cfg aws.Config) {
tgpa.Client = ec2.NewFromConfig(cfg)
}

func (tgpa *TransitGatewayPeeringAttachment) IsUsingV2() bool { return true }

func (tgpa *TransitGatewayPeeringAttachment) ResourceName() string {
return "transit-gateway-peering-attachment"
}
Expand All @@ -36,7 +41,7 @@ func (tgpa *TransitGatewayPeeringAttachment) ResourceIdentifiers() []string {
}

func (tgpa *TransitGatewayPeeringAttachment) GetAndSetResourceConfig(configObj config.Config) config.ResourceType {
return configObj.TransitGateway
return configObj.TransitGatewayPeeringAttachment
}

func (tgpa *TransitGatewayPeeringAttachment) GetAndSetIdentifiers(c context.Context, configObj config.Config) ([]string, error) {
Expand All @@ -45,12 +50,12 @@ func (tgpa *TransitGatewayPeeringAttachment) GetAndSetIdentifiers(c context.Cont
return nil, err
}

tgpa.Ids = awsgo.StringValueSlice(identifiers)
tgpa.Ids = aws.ToStringSlice(identifiers)
return tgpa.Ids, nil
}

func (tgpa *TransitGatewayPeeringAttachment) Nuke(identifiers []string) error {
if err := tgpa.nukeAll(awsgo.StringSlice(identifiers)); err != nil {
if err := tgpa.nukeAll(aws.StringSlice(identifiers)); err != nil {
return errors.WithStackTrace(err)
}

Expand Down
Loading