Merge pull request #709 from Brian-Flores/issue708

Add `upgrades` option in `ibmcloud sl account orders`

Author: allmightyspiff

plugin/commands/account/orders.go

@@ -21,6 +21,7 @@ type OrdersCommand struct {
 	AccountManager managers.AccountManager
 	Command        *cobra.Command
 	Limit          int
+	Upgrades       bool
 }
 
 func NewOrdersCommand(sl *metadata.SoftlayerCommand) *OrdersCommand {
@@ -37,6 +38,7 @@ func NewOrdersCommand(sl *metadata.SoftlayerCommand) *OrdersCommand {
 		},
 	}
 	cobraCmd.Flags().IntVar(&thisCmd.Limit, "limit", 100, T("How many results to get in one api call."))
+	cobraCmd.Flags().BoolVar(&thisCmd.Upgrades, "upgrades", false, T("Show upgrades orders."))
 	thisCmd.Command = cobraCmd
 	return thisCmd
 }
@@ -51,6 +53,15 @@ func (cmd *OrdersCommand) Run(args []string) error {
 	}
 	PrintOrders(orders, cmd.UI, outputFormat)
 
+	if cmd.Upgrades {
+		mask = "mask[id,maintenanceStartTimeUtc,statusId,createDate,ticketId]"
+		upgrades, err := cmd.AccountManager.GetUpgradeRequests(mask, cmd.Limit)
+		if err != nil {
+			return errors.NewAPIError(T("Failed to get Upgrade Requests."), err.Error(), 2)
+		}
+		PrintUpgrades(upgrades, cmd.UI, outputFormat)
+	}
+
 	return nil
 }
 
@@ -84,3 +95,26 @@ func PrintOrders(orders []datatypes.Billing_Order, ui terminal.UI, outputFormat
 
 	utils.PrintTableWithTitle(ui, table, bufEvent, "Orders", outputFormat)
 }
+
+func PrintUpgrades(upgrades []datatypes.Product_Upgrade_Request, ui terminal.UI, outputFormat string) {
+	bufEvent := new(bytes.Buffer)
+	table := terminal.NewTable(bufEvent, []string{
+		T("Id"),
+		T("Maintance Window"),
+		T("Status"),
+		T("Created Date"),
+		T("Case"),
+	})
+
+	for _, upgrade := range upgrades {
+		table.Add(
+			utils.FormatIntPointer(upgrade.Id),
+			utils.FormatSLTimePointer(upgrade.MaintenanceStartTimeUtc),
+			utils.FormatIntPointer(upgrade.StatusId),
+			utils.FormatSLTimePointer(upgrade.CreateDate),
+			utils.FormatIntPointer(upgrade.TicketId),
+		)
+	}
+
+	utils.PrintTableWithTitle(ui, table, bufEvent, "Upgrade orders", outputFormat)
+}

plugin/commands/account/orders_test.go

@@ -59,5 +59,26 @@ var _ = Describe("Account list Orders", func() {
 				Expect(fakeUI.Outputs()).To(ContainSubstring(`"Item": "1 x 2.0 GHz or higher Core,1 x 2.0 GHz or higher Core,1 GB,Reboot / Remote Conso...""`))
 			})
 		})
+
+		Context("Account orders, correct use with upgrades", func() {
+			It("return account orders and upgrades", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "--limit", "10", "--upgrades")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(fakeUI.Outputs()).To(ContainSubstring("123456789"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("APPROVED"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("test.test@ibm.com"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("2022-04-26T19:50:06Z"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("0.000000"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("1 x 2.0 GHz or higher Core,1 x 2.0 GHz or higher Core,1 GB,Reboot / Remote Conso..."))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("91954410"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("123456_test.test@ibm.com"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("2022-04-26T19:39:17Z"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("3237486"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("3"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("152510472"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("3229998"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("152452042"))
+			})
+		})
 	})
 })

plugin/managers/account.go

@@ -31,6 +31,7 @@ type AccountManager interface {
 	GetPostProvisioningHooks(mask string) ([]datatypes.Provisioning_Hook, error)
 	CreateProvisioningScript(template datatypes.Provisioning_Hook) (datatypes.Provisioning_Hook, error)
 	DeleteProvisioningScript(idProvisioningScript int) (resp bool, err error)
+	GetUpgradeRequests(mask string, limit int) ([]datatypes.Product_Upgrade_Request, error)
 }
 
 type accountManager struct {
@@ -379,3 +380,11 @@ func (a accountManager) DeleteProvisioningScript(idProvisioningScript int) (resp
 	provisioningHook := services.GetProvisioningHookService(a.Session)
 	return provisioningHook.Id(idProvisioningScript).DeleteObject()
 }
+
+/*
+Gets account's associated upgrade requests.
+https://sldn.softlayer.com/reference/services/SoftLayer_Account/getUpgradeRequests/
+*/
+func (a accountManager) GetUpgradeRequests(mask string, limit int) ([]datatypes.Product_Upgrade_Request, error) {
+	return a.AccountService.Limit(limit).Mask(mask).GetUpgradeRequests()
+}

plugin/testfixtures/SoftLayer_Account/getUpgradeRequests.json

@@ -0,0 +1,34 @@
+[
+	{
+		"accountId": 307608,
+		"createDate": "2023-03-01T19:39:51-06:00",
+		"employeeId": null,
+		"guestId": null,
+		"hardwareId": null,
+		"id": 3237486,
+		"maintenanceStartTimeUtc": "2023-03-01T19:39:51-06:00",
+		"modifyDate": "2023-03-01T19:39:53-06:00",
+		"orderId": 103127604,
+		"orderTotal": "0",
+		"proratedTotal": "0",
+		"statusId": 3,
+		"ticketId": 152510472,
+		"userId": 167758
+	},
+	{
+		"accountId": 307608,
+		"createDate": "2023-02-27T19:41:26-06:00",
+		"employeeId": null,
+		"guestId": null,
+		"hardwareId": null,
+		"id": 3229998,
+		"maintenanceStartTimeUtc": "2023-02-27T19:41:26-06:00",
+		"modifyDate": "2023-02-27T19:41:29-06:00",
+		"orderId": 103029352,
+		"orderTotal": "0",
+		"proratedTotal": "0",
+		"statusId": 3,
+		"ticketId": 152452042,
+		"userId": 167758
+	}
+]