Skip to content

fix: revoke cross-referencing SG rules before deletion in cleanup #766

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

Merged
ArangoGutierrez merged 1 commit into from
Mar 31, 2026
Merged

fix: revoke cross-referencing SG rules before deletion in cleanup #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 29 additions & 0 deletions pkg/cleanup/cleanup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,35 @@ func (c *Cleaner) deleteSecurityGroups(ctx context.Context, vpcID string) error
}
}

// Revoke all ingress/egress rules to break cross-SG references.
// Without this, SGs that reference each other (e.g., CP allows traffic
// from Worker and vice versa) cannot be deleted due to DependencyViolation.
for _, sg := range nonDefaultSGs {
if err := ctx.Err(); err != nil {
return fmt.Errorf("context cancelled during SG rule revocation: %w", err)
}

if len(sg.IpPermissions) > 0 {
_, err := c.ec2.RevokeSecurityGroupIngress(ctx, &ec2.RevokeSecurityGroupIngressInput{
GroupId: sg.GroupId,
IpPermissions: sg.IpPermissions,
})
if err != nil {
c.log.Warning("Failed to revoke ingress rules for %s: %v", safeString(sg.GroupId), err)
}
}

if len(sg.IpPermissionsEgress) > 0 {
_, err := c.ec2.RevokeSecurityGroupEgress(ctx, &ec2.RevokeSecurityGroupEgressInput{
GroupId: sg.GroupId,
IpPermissions: sg.IpPermissionsEgress,
})
if err != nil {
c.log.Warning("Failed to revoke egress rules for %s: %v", safeString(sg.GroupId), err)
}
}
}

// Delete non-default security groups
for _, sg := range nonDefaultSGs {
deleteInput := &ec2.DeleteSecurityGroupInput{
Expand Down
84 changes: 84 additions & 0 deletions pkg/cleanup/cleanup_ginkgo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,90 @@ var _ = Describe("Cleanup Package", func() {
Expect(deletedSGs).To(ConsistOf("sg-custom"))
})

It("should revoke cross-referencing SG rules before deleting", func() {
revokedIngress := []string{}
revokedEgress := []string{}
deletedSGs := []string{}

mockEC.DescribeSecurityGroupsFunc = func(ctx context.Context,
params *ec2.DescribeSecurityGroupsInput,
optFns ...func(*ec2.Options)) (*ec2.DescribeSecurityGroupsOutput, error) {
return &ec2.DescribeSecurityGroupsOutput{
SecurityGroups: []types.SecurityGroup{
{
GroupId: aws.String("sg-default"),
GroupName: aws.String("default"),
},
{
GroupId: aws.String("sg-cp"),
GroupName: aws.String("holodeck-cp"),
IpPermissions: []types.IpPermission{
{
IpProtocol: aws.String("-1"),
UserIdGroupPairs: []types.UserIdGroupPair{{GroupId: aws.String("sg-worker")}},
},
},
IpPermissionsEgress: []types.IpPermission{
{
IpProtocol: aws.String("-1"),
IpRanges: []types.IpRange{{CidrIp: aws.String("0.0.0.0/0")}},
},
},
},
{
GroupId: aws.String("sg-worker"),
GroupName: aws.String("holodeck-worker"),
IpPermissions: []types.IpPermission{
{
IpProtocol: aws.String("-1"),
UserIdGroupPairs: []types.UserIdGroupPair{{GroupId: aws.String("sg-cp")}},
},
},
IpPermissionsEgress: []types.IpPermission{
{
IpProtocol: aws.String("-1"),
IpRanges: []types.IpRange{{CidrIp: aws.String("0.0.0.0/0")}},
},
},
},
},
}, nil
}
mockEC.DescribeNetworkInterfacesFunc = func(ctx context.Context,
params *ec2.DescribeNetworkInterfacesInput,
optFns ...func(*ec2.Options)) (*ec2.DescribeNetworkInterfacesOutput, error) {
return &ec2.DescribeNetworkInterfacesOutput{}, nil
}
mockEC.RevokeSecurityGroupIngressFunc = func(ctx context.Context,
params *ec2.RevokeSecurityGroupIngressInput,
optFns ...func(*ec2.Options)) (*ec2.RevokeSecurityGroupIngressOutput, error) {
revokedIngress = append(revokedIngress, *params.GroupId)
return &ec2.RevokeSecurityGroupIngressOutput{}, nil
}
mockEC.RevokeSecurityGroupEgressFunc = func(ctx context.Context,
params *ec2.RevokeSecurityGroupEgressInput,
optFns ...func(*ec2.Options)) (*ec2.RevokeSecurityGroupEgressOutput, error) {
revokedEgress = append(revokedEgress, *params.GroupId)
return &ec2.RevokeSecurityGroupEgressOutput{}, nil
}
mockEC.DeleteSecurityGroupFunc = func(ctx context.Context,
params *ec2.DeleteSecurityGroupInput,
optFns ...func(*ec2.Options)) (*ec2.DeleteSecurityGroupOutput, error) {
deletedSGs = append(deletedSGs, *params.GroupId)
return &ec2.DeleteSecurityGroupOutput{}, nil
}

cleaner, err := New(log, "us-west-2", WithEC2Client(mockEC))
Expect(err).NotTo(HaveOccurred())

err = cleaner.DeleteVPCResources(context.Background(), "vpc-12345")
Expect(err).NotTo(HaveOccurred())

Expect(revokedIngress).To(ConsistOf("sg-cp", "sg-worker"))
Expect(revokedEgress).To(ConsistOf("sg-cp", "sg-worker"))
Expect(deletedSGs).To(ConsistOf("sg-cp", "sg-worker"))
})

It("should handle VPC deletion failure with retries", func() {
deleteAttempts := 0
mockEC.DeleteVpcFunc = func(ctx context.Context,
Expand Down
10 changes: 10 additions & 0 deletions pkg/testutil/mocks/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ type MockEC2Client struct {
DescribeInternetGatewaysFunc func(ctx context.Context, params *ec2.DescribeInternetGatewaysInput, optFns ...func(*ec2.Options)) (*ec2.DescribeInternetGatewaysOutput, error)
DescribeInstanceTypesFunc func(ctx context.Context, params *ec2.DescribeInstanceTypesInput, optFns ...func(*ec2.Options)) (*ec2.DescribeInstanceTypesOutput, error)
ReplaceRouteTableAssociationFunc func(ctx context.Context, params *ec2.ReplaceRouteTableAssociationInput, optFns ...func(*ec2.Options)) (*ec2.ReplaceRouteTableAssociationOutput, error)

// Security Group Revoke operations
RevokeSecurityGroupIngressFunc func(ctx context.Context, params *ec2.RevokeSecurityGroupIngressInput, optFns ...func(*ec2.Options)) (*ec2.RevokeSecurityGroupIngressOutput, error)
RevokeSecurityGroupEgressFunc func(ctx context.Context, params *ec2.RevokeSecurityGroupEgressInput, optFns ...func(*ec2.Options)) (*ec2.RevokeSecurityGroupEgressOutput, error)
}

// VPC operations
Expand Down Expand Up @@ -487,9 +491,15 @@ func (m *MockEC2Client) ModifySubnetAttribute(ctx context.Context, params *ec2.M
// Security Group Revoke operations

func (m *MockEC2Client) RevokeSecurityGroupIngress(ctx context.Context, params *ec2.RevokeSecurityGroupIngressInput, optFns ...func(*ec2.Options)) (*ec2.RevokeSecurityGroupIngressOutput, error) {
if m.RevokeSecurityGroupIngressFunc != nil {
return m.RevokeSecurityGroupIngressFunc(ctx, params, optFns...)
}
return &ec2.RevokeSecurityGroupIngressOutput{}, nil
}

func (m *MockEC2Client) RevokeSecurityGroupEgress(ctx context.Context, params *ec2.RevokeSecurityGroupEgressInput, optFns ...func(*ec2.Options)) (*ec2.RevokeSecurityGroupEgressOutput, error) {
if m.RevokeSecurityGroupEgressFunc != nil {
return m.RevokeSecurityGroupEgressFunc(ctx, params, optFns...)
}
return &ec2.RevokeSecurityGroupEgressOutput{}, nil
}
Loading