Skip to content

General user experience improvements to share/unshare commands #1284

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
vitreuz merged 3 commits into from
Dec 12, 2017
Merged

General user experience improvements to share/unshare commands #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48b0c24
Ask user for confirmation before unsharing a service instance
jenspinney Dec 11, 2017
0effb64
Don't display warning if unshare with force flag
Dec 12, 2017
a1a7bae
Share and Unshare include each other in related commands
Dec 12, 2017
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
2 changes: 1 addition & 1 deletion command/v3/v3_delete_command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ var _ = Describe("v3-delete Command", func() {
fakeActor.DeleteApplicationByNameAndSpaceReturns(v3action.Warnings{"some-warning"}, nil)
})

It("deletes the space", func() {
It("deletes the app", func() {
Expect(executeErr).ToNot(HaveOccurred())

Expect(testUI.Err).To(Say("some-warning"))
Expand Down
2 changes: 1 addition & 1 deletion command/v3/v3_share_service_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type V3ShareServiceCommand struct {
OrgName string `short:"o" required:"false" description:"Org of the other space (Default: targeted org)"`
SpaceName string `short:"s" required:"true" description:"Space to share the service instance into"`
usage interface{} `usage:"cf v3-share-service SERVICE_INSTANCE -s OTHER_SPACE [-o OTHER_ORG]"`
relatedCommands interface{} `related_commands:"bind-service, service, services"`
relatedCommands interface{} `related_commands:"bind-service, service, services, v3-unshare-service"`

UI command.UI
Config command.Config
Expand Down
20 changes: 19 additions & 1 deletion command/v3/v3_unshare_service_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ type V3UnshareServiceCommand struct {
RequiredArgs flag.ServiceInstance `positional-args:"yes"`
OrgName string `short:"o" required:"false" description:"Org of the other space (Default: targeted org)"`
SpaceName string `short:"s" required:"true" description:"Space to unshare the service instance from"`
Force bool `short:"f" description:"Force unshare without confirmation"`
usage interface{} `usage:"cf v3-unshare-service SERVICE_INSTANCE -s OTHER_SPACE [-o OTHER_ORG]"`
relatedCommands interface{} `related_commands:"bind-service, service, services"`
relatedCommands interface{} `related_commands:"bind-service, service, services, v3-share-service"`

UI command.UI
Config command.Config
Expand Down Expand Up @@ -90,6 +91,23 @@ func (cmd V3UnshareServiceCommand) Execute(args []string) error {
orgName = cmd.OrgName
}

if !cmd.Force {
cmd.UI.DisplayWarning("WARNING: Unsharing this service instance will remove any service bindings that exist in any spaces that this instance is shared into. This could cause applications to stop working.\n")

response, promptErr := cmd.UI.DisplayBoolPrompt(false, "Really unshare the service instance?", map[string]interface{}{
"ServiceInstanceName": cmd.RequiredArgs.ServiceInstance,
})

if promptErr != nil {
return promptErr
}

if !response {
cmd.UI.DisplayText("Unshare cancelled")
return nil
}
}

cmd.UI.DisplayTextWithFlavor("Unsharing service instance {{.ServiceInstanceName}} from org {{.OrgName}} / space {{.SpaceName}} as {{.Username}}...", map[string]interface{}{
"ServiceInstanceName": cmd.RequiredArgs.ServiceInstance,
"OrgName": orgName,
Expand Down
Loading