Skip to content

Commit ef8db05

Browse files
sweinstein22MerricdeLauney
andcommittedApr 30, 2020
Fix v7 🐞: Deleting non-existent private domain prints too much flavor text
[finishes #172547684] Co-authored-by: Sarah Weinstein <sweinstein@pivotal.io> Co-authored-by: Merric de Launey <mdelauney@pivotal.io>
1 parent deac271 commit ef8db05

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed
 

‎command/v7/delete_private_domain_command.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,16 @@ func (cmd DeletePrivateDomainCommand) Execute(args []string) error {
2828
return err
2929
}
3030

31-
domain, warnings, err := cmd.Actor.GetDomainByName(domainName)
32-
cmd.UI.DisplayWarnings(warnings)
33-
3431
cmd.UI.DisplayTextWithFlavor("Deleting private domain {{.DomainName}} as {{.Username}}...", map[string]interface{}{
3532
"DomainName": domainName,
3633
"Username": currentUser.Name,
3734
})
3835

36+
domain, warnings, err := cmd.Actor.GetDomainByName(domainName)
37+
cmd.UI.DisplayWarnings(warnings)
38+
3939
if err != nil {
4040
if _, ok := err.(actionerror.DomainNotFoundError); ok {
41-
cmd.UI.DisplayTextWithFlavor("Deleting private domain {{.DomainName}} as {{.Username}}...", map[string]interface{}{
42-
"DomainName": domainName,
43-
"Username": currentUser.Name,
44-
})
4541
cmd.UI.DisplayWarning("Domain '{{.DomainName}}' does not exist.", map[string]interface{}{
4642
"DomainName": cmd.RequiredArgs.Domain,
4743
})

0 commit comments

Comments
 (0)