Delete created orgs during tests

Signed-off-by: João Pereira <[email protected]>

Author: joaopapereira

integration/helpers/org_and_space.go

@@ -112,7 +112,7 @@ func GetSpaceGUID(spaceName string) string {
 }
 
 // QuickDeleteOrg deletes the org with the given name, if provided, using
-// 'cf curl /v2/organizations... -X DELETE'.
+// 'cf curl /v3/organizations... -X DELETE'.
 func QuickDeleteOrg(orgName string) {
 	// If orgName is empty, the BeforeSuite has failed and attempting to delete
 	// will produce a meaningless error.
@@ -122,30 +122,30 @@ func QuickDeleteOrg(orgName string) {
 	}
 
 	guid := GetOrgGUID(orgName)
-	url := fmt.Sprintf("/v2/organizations/%s?recursive=true&async=true", guid)
+	url := fmt.Sprintf("/v3/organizations/%s", guid)
 	session := CF("curl", "-X", "DELETE", url)
 	Eventually(session).Should(Exit(0))
 }
 
 // QuickDeleteOrgIfExists deletes the org with the given name, if it exists, using
-// 'cf curl /v2/organizations... -X DELETE'.
+// 'cf curl /v3/organizations... -X DELETE'.
 func QuickDeleteOrgIfExists(orgName string) {
 	session := CF("org", "--guid", orgName)
 	Eventually(session).Should(Exit())
 	if session.ExitCode() != 0 {
 		return
 	}
 	guid := strings.TrimSpace(string(session.Out.Contents()))
-	url := fmt.Sprintf("/v2/organizations/%s?recursive=true&async=true", guid)
+	url := fmt.Sprintf("/v3/organizations/%s", guid)
 	session = CF("curl", "-X", "DELETE", url)
 	Eventually(session).Should(Exit())
 }
 
 // QuickDeleteSpace deletes the space with the given name, if it exists, using
-// 'cf curl /v2/spaces... -X DELETE'.
+// 'cf curl /v3/spaces... -X DELETE'.
 func QuickDeleteSpace(spaceName string) {
 	guid := GetSpaceGUID(spaceName)
-	url := fmt.Sprintf("/v2/spaces/%s?recursive=true&async=true", guid)
+	url := fmt.Sprintf("/v3/spaces/%s", guid)
 	session := CF("curl", "-X", "DELETE", url)
 	Eventually(session).Should(Exit(0))
 }

integration/shared/isolated/spaces_command_test.go

@@ -30,6 +30,10 @@ var _ = Describe("spaces command", func() {
 			helpers.TargetOrg(orgName)
 		})
 
+		AfterEach(func() {
+			helpers.QuickDeleteOrg(orgName)
+		})
+
 		When("there are no spaces", func() {
 			It("displays no spaces found", func() {
 				session := helpers.CF("spaces")

integration/shared/plugin/api_test.go

@@ -13,11 +13,15 @@ import (
 )
 
 var _ = Describe("plugin API", func() {
+	var orgName string
 	BeforeEach(func() {
 		installTestPlugin()
 	})
 
 	AfterEach(func() {
+		if orgName != "" {
+			helpers.QuickDeleteOrg(orgName)
+		}
 		uninstallTestPlugin()
 	})
 
@@ -63,7 +67,7 @@ var _ = Describe("plugin API", func() {
 	Describe("GetApp", func() {
 		var appName string
 		BeforeEach(func() {
-			createTargetedOrgAndSpace()
+			orgName, _ = createTargetedOrgAndSpace()
 			appName = helpers.PrefixedRandomName("APP")
 			helpers.WithHelloWorldApp(func(appDir string) {
 				Eventually(helpers.CF("push", appName, "--no-start", "-p", appDir, "-b", "staticfile_buildpack", "--no-route")).Should(Exit(0))
@@ -78,7 +82,7 @@ var _ = Describe("plugin API", func() {
 	Describe("GetApps", func() {
 		var appName1, appName2 string
 		BeforeEach(func() {
-			createTargetedOrgAndSpace()
+			orgName, _ = createTargetedOrgAndSpace()
 			appName1 = helpers.PrefixedRandomName("APP")
 			helpers.WithHelloWorldApp(func(appDir string) {
 				Eventually(helpers.CF("push", appName1, "--no-start", "-p", appDir, "-b", "staticfile_buildpack", "--no-route")).Should(Exit(0))
@@ -97,47 +101,53 @@ var _ = Describe("plugin API", func() {
 
 	Describe("GetCurrentOrg", func() {
 		It("gets the current targeted org", func() {
-			org, _ := createTargetedOrgAndSpace()
-			confirmTestPluginOutput("GetCurrentOrg", org)
+			orgName, _ = createTargetedOrgAndSpace()
+			confirmTestPluginOutput("GetCurrentOrg", orgName)
 		})
 	})
 
 	Describe("GetCurrentSpace", func() {
 		It("gets the current targeted Space", func() {
-			_, space := createTargetedOrgAndSpace()
+			var space string
+			orgName, space = createTargetedOrgAndSpace()
 			confirmTestPluginOutput("GetCurrentSpace", space)
 		})
 	})
 
 	Describe("GetOrg", func() {
 		It("gets the given org", func() {
-			org, _ := createTargetedOrgAndSpace()
-			confirmTestPluginOutputWithArg("GetOrg", org, org)
+			orgName, _ = createTargetedOrgAndSpace()
+			confirmTestPluginOutputWithArg("GetOrg", orgName, orgName)
 		})
 	})
 
 	Describe("GetOrgs", func() {
+		var org1, org2 string
+		AfterEach(func() {
+			helpers.QuickDeleteOrg(org1)
+			helpers.QuickDeleteOrg(org2)
+		})
 		It("gets information for multiple orgs", func() {
-			org1, _ := createTargetedOrgAndSpace()
-			org2, _ := createTargetedOrgAndSpace()
+			org1, _ = createTargetedOrgAndSpace()
+			org2, _ = createTargetedOrgAndSpace()
 			orgNameRegexp := fmt.Sprintf("(?:%s|%s)", org1, org2)
 			confirmTestPluginOutput("GetOrgs", orgNameRegexp, orgNameRegexp)
 		})
 	})
 
 	Describe("GetOrgUsers", func() {
 		It("returns the org users", func() {
-			org, _ := createTargetedOrgAndSpace()
+			orgName, _ = createTargetedOrgAndSpace()
 			username, _ := helpers.GetCredentials()
-			confirmTestPluginOutputWithArg("GetOrgUsers", org, username)
+			confirmTestPluginOutputWithArg("GetOrgUsers", orgName, username)
 		})
 	})
 
 	Describe("GetOrgUsers", func() {
 		It("returns the org users", func() {
-			org, _ := createTargetedOrgAndSpace()
+			orgName, _ = createTargetedOrgAndSpace()
 			username, _ := helpers.GetCredentials()
-			confirmTestPluginOutputWithArg("GetOrgUsers", org, username)
+			confirmTestPluginOutputWithArg("GetOrgUsers", orgName, username)
 		})
 	})
 
@@ -148,7 +158,7 @@ var _ = Describe("plugin API", func() {
 			broker           *servicebrokerstub.ServiceBrokerStub
 		)
 		BeforeEach(func() {
-			createTargetedOrgAndSpace()
+			orgName, _ = createTargetedOrgAndSpace()
 			serviceInstance1 = helpers.PrefixedRandomName("SI1")
 			serviceInstance2 = helpers.PrefixedRandomName("SI2")
 
@@ -159,6 +169,7 @@ var _ = Describe("plugin API", func() {
 		})
 
 		AfterEach(func() {
+			helpers.QuickDeleteOrg(orgName)
 			broker.Forget()
 		})
 
@@ -172,7 +183,8 @@ var _ = Describe("plugin API", func() {
 
 	Describe("GetSpace", func() {
 		It("gets the given space", func() {
-			_, space := createTargetedOrgAndSpace()
+			var space string
+			orgName, space = createTargetedOrgAndSpace()
 			confirmTestPluginOutputWithArg("GetSpace", space, space)
 		})
 	})
@@ -181,7 +193,7 @@ var _ = Describe("plugin API", func() {
 		var space1, space2 string
 
 		BeforeEach(func() {
-			_, space1 = createTargetedOrgAndSpace()
+			orgName, space1 = createTargetedOrgAndSpace()
 			space2 = helpers.NewSpaceName()
 			helpers.CreateSpace(space2)
 		})
@@ -195,8 +207,9 @@ var _ = Describe("plugin API", func() {
 	Describe("GetSpaceUsers", func() {
 		It("returns the space users", func() {
 			username, _ := helpers.GetCredentials()
-			org, space := createTargetedOrgAndSpace()
-			session := helpers.CF("GetSpaceUsers", org, space)
+			var space string
+			orgName, space = createTargetedOrgAndSpace()
+			session := helpers.CF("GetSpaceUsers", orgName, space)
 			Eventually(session).Should(Say(username))
 			Eventually(session).Should(Exit(0))
 		})
@@ -210,14 +223,14 @@ var _ = Describe("plugin API", func() {
 
 	Describe("HasOrganization", func() {
 		It("returns true", func() {
-			createTargetedOrgAndSpace()
+			orgName, _ = createTargetedOrgAndSpace()
 			confirmTestPluginOutput("HasOrganization", "true")
 		})
 	})
 
 	Describe("HasSpace", func() {
 		It("returns true", func() {
-			createTargetedOrgAndSpace()
+			orgName, _ = createTargetedOrgAndSpace()
 			confirmTestPluginOutput("HasSpace", "true")
 		})
 	})

integration/v7/global/running_security_groups_command_test.go

@@ -70,6 +70,7 @@ var _ = Describe("running-security-groups command", func() {
 
 			AfterEach(func() {
 				helpers.DeleteSecurityGroup(securityGroup)
+				helpers.QuickDeleteOrg(orgName)
 			})
 
 			It("displays the globally enabled running security groups exits 0", func() {

integration/v7/global/set_space_role_command_test.go

@@ -26,6 +26,7 @@ var _ = Describe("set-space-role command", func() {
 
 		AfterEach(func() {
 			helpers.EnableFeatureFlag("set_roles_by_username")
+			helpers.QuickDeleteOrg(orgName)
 		})
 
 		When("the user does not exist", func() {

integration/v7/global/staging_security_groups_command_test.go

@@ -70,6 +70,7 @@ var _ = Describe("staging-security-groups command", func() {
 
 			AfterEach(func() {
 				helpers.DeleteSecurityGroup(securityGroup)
+				helpers.QuickDeleteOrg(orgName)
 			})
 
 			It("displays the globally enabled staging security groups exits 0", func() {

integration/v7/isolated/create_space_quota_command_test.go

@@ -60,6 +60,10 @@ var _ = Describe("create-space-quota command", func() {
 			spaceQuotaName = helpers.QuotaName()
 		})
 
+		AfterEach(func() {
+			helpers.QuickDeleteOrg(orgName)
+		})
+
 		When("the quota name is not provided", func() {
 			It("tells the user that the quota name is required, prints help text, and exits 1", func() {
 				session := helpers.CF("create-space-quota")

integration/v7/isolated/move_route_command_test.go

@@ -147,6 +147,8 @@ var _ = Describe("move route command", func() {
 
 					AfterEach(func() {
 						domain.DeleteShared()
+						helpers.QuickDeleteOrg(targetOrgName)
+						helpers.QuickDeleteOrg(orgName)
 					})
 
 					It("Transfers ownership of the route to the destination space", func() {

integration/v7/isolated/org_users_command_test.go

@@ -40,6 +40,10 @@ var _ = Describe("org-users command", func() {
 			helpers.CreateOrg(orgName)
 		})
 
+		AfterEach(func() {
+			helpers.QuickDeleteOrg(orgName)
+		})
+
 		When("the target org has multiple users with different roles", func() {
 			var (
 				orgManagerUser     string

integration/v7/isolated/rename_org_command_test.go

@@ -107,6 +107,10 @@ var _ = Describe("rename-org command", func() {
 					helpers.CreateOrg(orgNameNew)
 				})
 
+				AfterEach(func() {
+					helpers.QuickDeleteOrg(orgNameNew)
+				})
+
 				It("fails to rename the org", func() {
 					session := helpers.CF("rename-org", orgName, orgNameNew)
 					userName, _ := helpers.GetCredentials()

integration/v7/isolated/security_groups_command_test.go

@@ -118,6 +118,7 @@ var _ = Describe("security-groups command", func() {
 				helpers.DeleteSecurityGroup(securityGroup3)
 				helpers.DeleteSecurityGroup(securityGroup4)
 				helpers.DeleteSecurityGroup(securityGroup5)
+				helpers.QuickDeleteOrg(orgName)
 			})
 
 			It("displays the security groups exits 0", func() {

integration/v7/isolated/services_command_test.go

@@ -163,11 +163,11 @@ var _ = Describe("services command", func() {
 
 	Context("has shared service instances", func() {
 		var (
-			managedService, appNameOnSpaceA, appNameOnSpaceB string
+			managedService, appNameOnSpaceA, appNameOnSpaceB, orgName string
 		)
 
 		BeforeEach(func() {
-			orgName := helpers.NewOrgName()
+			orgName = helpers.NewOrgName()
 			spaceA := helpers.NewSpaceName()
 			spaceB := helpers.NewSpaceName()
 			managedService = helpers.PrefixedRandomName("MANAGED1")
@@ -193,6 +193,10 @@ var _ = Describe("services command", func() {
 			helpers.TargetOrgAndSpace(orgName, spaceA)
 		})
 
+		AfterEach(func() {
+			helpers.QuickDeleteOrg(orgName)
+		})
+
 		It("should not output bound apps in the shared spaces", func() {
 			session := helpers.CF(command)
 			Eventually(session).Should(Exit(0))

integration/v7/isolated/share_private_domain_test.go

@@ -58,6 +58,11 @@ var _ = Describe("share-private-domain command", func() {
 			domain.CreatePrivate()
 		})
 
+		AfterEach(func() {
+			helpers.QuickDeleteOrg(sharedWithOrgName)
+			helpers.QuickDeleteOrg(orgName)
+		})
+
 		It("should create the shared domain", func() {
 			session := helpers.CF("share-private-domain", sharedWithOrgName, domainName)
 

integration/v7/isolated/share_route_command_test.go

@@ -147,6 +147,7 @@ var _ = Describe("share route command", func() {
 
 					AfterEach(func() {
 						domain.Delete()
+						helpers.QuickDeleteOrg(targetOrgName)
 					})
 
 					It("shared the route to the destination space", func() {

integration/v7/isolated/space_quota_command_test.go

@@ -49,6 +49,10 @@ var _ = Describe("space-quota command", func() {
 			helpers.TargetOrg(orgName)
 		})
 
+		AfterEach(func() {
+			helpers.QuickDeleteOrg(orgName)
+		})
+
 		When("the quota does not exist", func() {
 			It("displays quota not found and exits 1", func() {
 				session := helpers.CF("space-quota", quotaName)

integration/v7/isolated/space_users_command_test.go

@@ -42,6 +42,10 @@ var _ = Describe("space-users command", func() {
 			helpers.CreateOrgAndSpace(orgName, spaceName)
 		})
 
+		AfterEach(func() {
+			helpers.QuickDeleteOrg(orgName)
+		})
+
 		When("the target space has multiple users with different roles", func() {
 			var (
 				spaceManagerUser   string

integration/v7/isolated/spaces_command_test.go

@@ -60,6 +60,10 @@ var _ = Describe("spaces command", func() {
 			helpers.CreateSpace(spaceName6)
 		})
 
+		AfterEach(func() {
+			helpers.QuickDeleteOrg(orgName)
+		})
+
 		When("the --labels flag is given", func() {
 
 			BeforeEach(func() {

integration/v7/isolated/unshare_private_domain_test.go

@@ -70,6 +70,10 @@ var _ = Describe("unshare-private-domain command", func() {
 				domain.V7Share(sharedToOrgName)
 			})
 
+			AfterEach(func() {
+				helpers.QuickDeleteOrg(sharedToOrgName)
+			})
+
 			It("unshares the domain from the org", func() {
 				buffer := NewBuffer()
 				_, err := buffer.Write([]byte("y\n"))
@@ -98,6 +102,10 @@ var _ = Describe("unshare-private-domain command", func() {
 				domain.V7Share(sharedToOrgName)
 			})
 
+			AfterEach(func() {
+				helpers.QuickDeleteOrg(sharedToOrgName)
+			})
+
 			It("does not unshare the domain from the org", func() {
 				buffer := NewBuffer()
 				_, err := buffer.Write([]byte("n\n"))