From 5d5a8b477f1eeb6f922586782c99016e73a21c7f Mon Sep 17 00:00:00 2001
From: SrinivasChilveri <srinivasch.ch@huawei.com>
Date: Wed, 3 Dec 2014 01:49:06 -0500
Subject: [PATCH] Fix in clearing space fields of config data on cf
space-delete
Before Fix: If cf user deleting the targeted space but with space name as
case insenstive then space fields are not deleted from the config
htipl@cf5:~/go/src/github.com/cloudfoundry/cli$ cf spaces
Getting spaces in org SriniOrg as admin...
name
No spaces found
htipl@cf5:~/go/src/github.com/cloudfoundry/cli$ cf target
API endpoint: https://api.10.244.0.34.xip.io (API version: 2.13.0)
User: admin
Org: SriniOrg
Space: SriniSpace
After Fix:If cf user does same steps
space fields are deleted from the config
htipl@cf5:~/go/src/github.com/cloudfoundry/cli$ ./out/cf spaces
Getting spaces in org SriniOrg as admin...
name
No spaces found
htipl@cf5:~/go/src/github.com/cloudfoundry/cli$ ./out/cf target
API endpoint: https://api.10.244.0.34.xip.io (API version: 2.13.0)
User: admin
Org: SriniOrg
Space: No space targeted, use 'cf target -s SPACE'
http://rnd-github.huawei.com/paas/cli/issues/28
---
cf/commands/space/delete_space.go | 2 +-
cf/commands/space/delete_space_test.go | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/cf/commands/space/delete_space.go b/cf/commands/space/delete_space.go
index 77633846e79..e0123ccee0a 100644
--- a/cf/commands/space/delete_space.go
+++ b/cf/commands/space/delete_space.go
@@ -78,7 +78,7 @@ func (cmd *DeleteSpace) Run(c *cli.Context) {
cmd.ui.Ok()
- if cmd.config.SpaceFields().Name == spaceName {
+ if cmd.config.SpaceFields().Guid == space.Guid {
cmd.config.SetSpaceFields(models.SpaceFields{})
cmd.ui.Say(T("TIP: No space targeted, use '{{.CfTargetCommand}}' to target a space",
map[string]interface{}{"CfTargetCommand": cf.Name() + " target -s"}))
diff --git a/cf/commands/space/delete_space_test.go b/cf/commands/space/delete_space_test.go
index 6049fb3a1b0..f898138c7a9 100644
--- a/cf/commands/space/delete_space_test.go
+++ b/cf/commands/space/delete_space_test.go
@@ -94,4 +94,11 @@ var _ = Describe("delete-space command", func() {
Expect(config.HasSpace()).To(Equal(false))
})
+
+ It("clears the space from the config, when deleting the space currently targeted even if space name is case insensitive", func() {
+ config.SetSpaceFields(space.SpaceFields)
+ runCommand("-f", "Space-To-Delete")
+
+ Expect(config.HasSpace()).To(Equal(false))
+ })
})