Modify DeleteSecurityGroup function to use securityGroup Id (#1942)

kanisterio · Mar 7, 2023 · 85755d6 · 85755d6
1 parent a4a8534
commit 85755d6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/app/rds_aurora_mysql.go b/pkg/app/rds_aurora_mysql.go
@@ -398,7 +398,7 @@ func (a *RDSAuroraMySQLDB) Uninstall(ctx context.Context) error {
 
 	// delete security group
 	log.Info().Print("Deleting security group.", field.M{"app": a.name})
-	_, err = ec2Cli.DeleteSecurityGroup(ctx, a.securityGroupName)
+	_, err = ec2Cli.DeleteSecurityGroup(ctx, a.securityGroupID)
 	if err != nil {
 		if err, ok := err.(awserr.Error); ok {
 			switch err.Code() {

diff --git a/pkg/app/rds_postgres.go b/pkg/app/rds_postgres.go
@@ -379,7 +379,7 @@ func (pdb RDSPostgresDB) Uninstall(ctx context.Context) error {
 
 	// Delete security group
 	log.Info().Print("Deleting security group.", field.M{"app": pdb.name})
-	_, err = ec2Cli.DeleteSecurityGroup(ctx, pdb.securityGroupName)
+	_, err = ec2Cli.DeleteSecurityGroup(ctx, pdb.securityGroupID)
 	if err != nil {
 		if err, ok := err.(awserr.Error); ok {
 			switch err.Code() {

diff --git a/pkg/aws/ec2/ec2.go b/pkg/aws/ec2/ec2.go
@@ -71,10 +71,10 @@ func (e EC2) AuthorizeSecurityGroupIngress(ctx context.Context, groupName, cidr,
 	return e.AuthorizeSecurityGroupIngressWithContext(ctx, sgi)
 }
 
-func (e EC2) DeleteSecurityGroup(ctx context.Context, groupName string) (*ec2.DeleteSecurityGroupOutput, error) {
+func (e EC2) DeleteSecurityGroup(ctx context.Context, groupId string) (*ec2.DeleteSecurityGroupOutput, error) {
 	sgi := &ec2.DeleteSecurityGroupInput{
-		DryRun:    &e.DryRun,
-		GroupName: &groupName,
+		DryRun:  &e.DryRun,
+		GroupId: aws.String(groupId),
 	}
 	return e.DeleteSecurityGroupWithContext(ctx, sgi)
 }