Merge pull request #695 from Brian-Flores/issue691

New command: `ibmcloud sl order quote-delete`

Author: allmightyspiff

plugin/commands/order/order.go

@@ -26,6 +26,7 @@ func SetupCobraCommands(sl *metadata.SoftlayerCommand) *cobra.Command {
 	cobraCmd.AddCommand(NewQuoteDetailCommand(sl).Command)
 	cobraCmd.AddCommand(NewQuoteSaveCommand(sl).Command)
 	cobraCmd.AddCommand(NewQuoteCommand(sl).Command)
+	cobraCmd.AddCommand(NewQuoteDeleteCommand(sl).Command)
 	cobraCmd.AddCommand(NewLookupCommand(sl).Command)
 	return cobraCmd
 }

plugin/commands/order/order_suite_test.go

@@ -27,6 +27,7 @@ var availableCommands = []string{
 	"place-quote",
 	"preset-list",
 	"quote",
+	"quote-delete",
 	"quote-detail",
 	"quote-list",
 	"quote-save",

plugin/commands/order/quote_delete.go

@@ -0,0 +1,54 @@
+package order
+
+import (
+	"strconv"
+
+	"github.com/spf13/cobra"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/errors"
+	. "github.ibm.com/SoftLayer/softlayer-cli/plugin/i18n"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/managers"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
+)
+
+type QuoteDeleteCommand struct {
+	*metadata.SoftlayerCommand
+	OrderManager managers.OrderManager
+	Command      *cobra.Command
+}
+
+func NewQuoteDeleteCommand(sl *metadata.SoftlayerCommand) (cmd *QuoteDeleteCommand) {
+	thisCmd := &QuoteDeleteCommand{
+		SoftlayerCommand: sl,
+		OrderManager:     managers.NewOrderManager(sl.Session),
+	}
+
+	cobraCmd := &cobra.Command{
+		Use:   "quote-delete " + T("IDENTIFIER"),
+		Short: T("Delete the quote of an order."),
+		Args:  metadata.OneArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return thisCmd.Run(args)
+		},
+	}
+
+	thisCmd.Command = cobraCmd
+	return thisCmd
+}
+
+func (cmd *QuoteDeleteCommand) Run(args []string) error {
+
+	quoteId, err := strconv.Atoi(args[0])
+	if err != nil {
+		return errors.NewInvalidSoftlayerIdInputError("Quote ID")
+	}
+
+	deletedQuote, err := cmd.OrderManager.DeleteQuote(quoteId)
+	if err != nil {
+		return errors.NewAPIError(T("Failed to delete Quote"), err.Error(), 2)
+	}
+
+	i18nSub := map[string]interface{}{"quoteID": deletedQuote.Id}
+	cmd.UI.Ok()
+	cmd.UI.Print(T("Quote: {{.quoteID}} was deleted.", i18nSub))
+	return nil
+}

plugin/commands/order/quote_delete_test.go

@@ -0,0 +1,85 @@
+package order_test
+
+import (
+	"errors"
+
+	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/testhelpers/terminal"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/softlayer/softlayer-go/datatypes"
+
+	"github.com/softlayer/softlayer-go/session"
+	"github.com/softlayer/softlayer-go/sl"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/commands/order"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/testhelpers"
+)
+
+var _ = Describe("order quote-delete", func() {
+	var (
+		fakeUI           *terminal.FakeUI
+		cliCommand       *order.QuoteDeleteCommand
+		fakeSession      *session.Session
+		slCommand        *metadata.SoftlayerCommand
+		fakeOrderManager *testhelpers.FakeOrderManager
+	)
+	BeforeEach(func() {
+		fakeUI = terminal.NewFakeUI()
+		fakeOrderManager = new(testhelpers.FakeOrderManager)
+		fakeSession = testhelpers.NewFakeSoftlayerSession([]string{})
+		slCommand = metadata.NewSoftlayerCommand(fakeUI, fakeSession)
+		cliCommand = order.NewQuoteDeleteCommand(slCommand)
+		cliCommand.Command.PersistentFlags().Var(cliCommand.OutputFlag, "output", "--output=JSON for json output.")
+		cliCommand.OrderManager = fakeOrderManager
+	})
+
+	Describe("order quote-delete", func() {
+
+		Context("Return error", func() {
+			It("Set command without Id", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command)
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("Incorrect Usage: This command requires one argument"))
+			})
+
+			It("Set command with an invalid Id", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "abcde")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("Invalid input for 'Quote ID'. It must be a positive integer."))
+			})
+
+			It("Set invalid output", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "123456", "--output=xml")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("Incorrect Usage: Invalid output format, only JSON is supported now."))
+			})
+		})
+
+		Context("Return error", func() {
+			BeforeEach(func() {
+				fakeOrderManager.DeleteQuoteReturns(datatypes.Billing_Order_Quote{}, errors.New("Failed to delete Quote"))
+			})
+			It("Failed delete Quote", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "123456")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("Failed to delete Quote"))
+			})
+		})
+
+		Context("Return no error", func() {
+			BeforeEach(func() {
+				fakerQuote := datatypes.Billing_Order_Quote{
+					Id: sl.Int(123456),
+				}
+				fakeOrderManager.DeleteQuoteReturns(fakerQuote, nil)
+			})
+			It("Delete quote", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "123456")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(fakeUI.Outputs()).To(ContainSubstring("OK"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("was deleted"))
+			})
+		})
+
+	})
+})

plugin/managers/order.go

@@ -44,6 +44,7 @@ type OrderManager interface {
 	OrderQuote(quoteId int, extra datatypes.Container_Product_Order) (datatypes.Container_Product_Order_Receipt, error)
 	GetRecalculatedOrderContainer(quoteId int) (datatypes.Container_Product_Order, error)
 	GetOrderDetail(orderId int, mask string) (datatypes.Billing_Order, error)
+	DeleteQuote(quoteId int) (datatypes.Billing_Order_Quote, error)
 }
 
 type orderManager struct {
@@ -459,3 +460,8 @@ func (i orderManager) GetOrderDetail(orderId int, mask string) (datatypes.Billin
 	billingOrderService := services.GetBillingOrderService(i.Session)
 	return billingOrderService.Id(orderId).Mask(mask).GetObject()
 }
+
+// Delete the quote of an order.
+func (i orderManager) DeleteQuote(quoteId int) (datatypes.Billing_Order_Quote, error) {
+	return i.BillingOrderQuoteService.Id(quoteId).DeleteQuote()
+}