Merge pull request #2010 from shiftstack/cleanuptestsg

k8s-ci-robot · web-flow · commit c834e9c145ad · 2024-04-11T03:06:11.000-07:00
🌱 Cleanup security group created by e2e test
diff --git a/test/e2e/shared/openstack.go b/test/e2e/shared/openstack.go
@@ -494,10 +494,16 @@ func CreateOpenStackSecurityGroup(e2eCtx *E2EContext, securityGroupName, descrip
 		Description: description,
 	}
 
-	_, err = groups.Create(networkClient, createOpts).Extract()
+	group, err := groups.Create(networkClient, createOpts).Extract()
 	if err != nil {
 		return err
 	}
+	// Ensure the group is deleted after the test
+	DeferCleanup(func() error {
+		By(fmt.Sprintf("Deleting test security group %s(%s)", group.Name, group.ID))
+		return groups.Delete(networkClient, group.ID).ExtractErr()
+	})
+
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -494,10 +494,16 @@ func CreateOpenStackSecurityGroup(e2eCtx *E2EContext, securityGroupName, descrip`
`494`	`494`	`Description: description,`
`495`	`495`	`}`
`496`	`496`
`497`		`- _, err = groups.Create(networkClient, createOpts).Extract()`
	`497`	`+ group, err := groups.Create(networkClient, createOpts).Extract()`
`498`	`498`	`if err != nil {`
`499`	`499`	`return err`
`500`	`500`	`}`
	`501`	`+ // Ensure the group is deleted after the test`
	`502`	`+ DeferCleanup(func() error {`
	`503`	`+ By(fmt.Sprintf("Deleting test security group %s(%s)", group.Name, group.ID))`
	`504`	`+ return groups.Delete(networkClient, group.ID).ExtractErr()`
	`505`	`+ })`
	`506`	`+`
`501`	`507`	`return nil`
`502`	`508`	`}`
`503`	`509`