Merge pull request #688 from Edson-Rios/issue687

Added new command `ibmcloud sl cdn origin-remove`

Author: allmightyspiff

plugin/commands/cdn/cdn.go

@@ -16,6 +16,7 @@ func SetupCobraCommands(sl *metadata.SoftlayerCommand) *cobra.Command {
 	}
 	cobraCmd.AddCommand(NewListCommand(sl).Command)
 	cobraCmd.AddCommand(NewDeleteCommand(sl).Command)
+	cobraCmd.AddCommand(NewOriginRemoveCommand(sl).Command)
 	cobraCmd.AddCommand(NewDetailCommand(sl).Command)
 	cobraCmd.AddCommand(NewEditCommand(sl).Command)
 	cobraCmd.AddCommand(NewOriginListCommand(sl).Command)

plugin/commands/cdn/cdn_test.go

@@ -19,6 +19,7 @@ func TestManagers(t *testing.T) {
 
 var availableCommands = []string{
 	"detail",
+	"origin-remove",
 	"delete",
 	"edit",
 	"list",

plugin/commands/cdn/origin_remove.go

@@ -0,0 +1,50 @@
+package cdn
+
+import (
+	"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 OriginRemoveCommand struct {
+	*metadata.SoftlayerCommand
+	CdnManager managers.CdnManager
+	Command    *cobra.Command
+}
+
+func NewOriginRemoveCommand(sl *metadata.SoftlayerCommand) *OriginRemoveCommand {
+	thisCmd := &OriginRemoveCommand{
+		SoftlayerCommand: sl,
+		CdnManager:       managers.NewCdnManager(sl.Session),
+	}
+	cobraCmd := &cobra.Command{
+		Use:   "origin-remove " + T("IDENTIFIER") + " " + T("PATH"),
+		Short: T("Removes an origin path for an existing CDN mapping."),
+		Long:  T(`${COMMAND_NAME} sl cdn origin-remove
+Example:
+${COMMAND_NAME} sl cdn origin-remove 123456789 "/path/*"`),
+		Args:  metadata.TwoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return thisCmd.Run(args)
+		},
+	}
+	thisCmd.Command = cobraCmd
+	return thisCmd
+}
+
+func (cmd *OriginRemoveCommand) Run(args []string) error {
+	cdnId := args[0]
+	path := args[1]
+
+	_, err := cmd.CdnManager.RemoveOrigin(cdnId, path)
+	if err != nil {
+		return errors.NewAPIError(T("Failed to delete origin."), err.Error(), 2)
+	}
+
+	cmd.UI.Ok()
+	cmd.UI.Print(T("The origin {{.Id}} with path {{.Path}} was deleted.", map[string]interface{}{"Path": path, "Id": cdnId}))
+	return nil
+}

plugin/commands/cdn/origin_remove_test.go

@@ -0,0 +1,47 @@
+package cdn_test
+
+import (
+	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/testhelpers/terminal"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/softlayer/softlayer-go/session"
+
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/commands/cdn"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/testhelpers"
+)
+
+var _ = Describe("Cdn origin-remove", func() {
+	var (
+		fakeUI      *terminal.FakeUI
+		cliCommand  *cdn.OriginRemoveCommand
+		fakeSession *session.Session
+		slCommand   *metadata.SoftlayerCommand
+	)
+	BeforeEach(func() {
+		fakeUI = terminal.NewFakeUI()
+		fakeSession = testhelpers.NewFakeSoftlayerSession([]string{})
+		slCommand = metadata.NewSoftlayerCommand(fakeUI, fakeSession)
+		cliCommand = cdn.NewOriginRemoveCommand(slCommand)
+		cliCommand.Command.PersistentFlags().Var(cliCommand.OutputFlag, "output", "--output=JSON for json output.")
+	})
+
+	Describe("Cdn origin-remove", func() {
+		Context("Cdn origin-remove, Invalid Usage", func() {
+			It("Set command without id and path", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command)
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("Incorrect Usage: This command requires two argument"))
+			})
+		})
+
+		Context("Cdn  origin-remove, correct use", func() {
+			It("return cdn  origin-remove", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "123456", "/path/*")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(fakeUI.Outputs()).To(ContainSubstring("The origin"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("was deleted."))
+			})
+		})
+	})
+})

plugin/managers/cdn.go

@@ -14,6 +14,7 @@ import (
 type CdnManager interface {
 	GetNetworkCdnMarketplaceConfigurationMapping() ([]datatypes.Container_Network_CdnMarketplace_Configuration_Mapping, error)
 	DeleteCDN(uniqueId string) ([]datatypes.Container_Network_CdnMarketplace_Configuration_Mapping, error)
+	RemoveOrigin(uniqueId string, path string) (string, error)
 	GetDetailCDN(uniqueId int, mask string) (datatypes.Container_Network_CdnMarketplace_Configuration_Mapping, error)
 	GetUsageMetrics(uniqueId int, history int, mask string) (datatypes.Container_Network_CdnMarketplace_Metrics, error)
 	GetOrigins(uniqueId string) ([]datatypes.Container_Network_CdnMarketplace_Configuration_Mapping_Path, error)
@@ -65,6 +66,14 @@ func (a cdnManager) DeleteCDN(uniqueId string) ([]datatypes.Container_Network_Cd
 	return a.CdnService.Mask(mask).DeleteDomainMapping(&uniqueId)
 }
 
+/*
+Removes an origin path for an existing CDN mapping.
+https://sldn.softlayer.com/reference/services/SoftLayer_Network_CdnMarketplace_Configuration_Mapping_Path/deleteOriginPath/
+*/
+func (a cdnManager) RemoveOrigin(uniqueId string, path string) (string, error) {
+	return a.CdnPathService.DeleteOriginPath(&uniqueId, &path)
+}
+
 /*
 Gets the total number of predetermined statistics for direct display for the given mapping.
 https://sldn.softlayer.com/reference/services/SoftLayer_Network_CdnMarketplace_Metrics/getMappingUsageMetrics/

plugin/testfixtures/SoftLayer_Network_CdnMarketplace_Configuration_Mapping_Path/deleteOriginPath.json

@@ -0,0 +1 @@
+"Status [200]: Path \/test\/* has been deleted."