Merge branch 'master' of github.ibm.com:SoftLayer/softlayer-cli into issue_719

testing

Author: Ramkishor Chaladi

plugin/commands/dedicatedhost/cancel_guest.go

@@ -2,7 +2,7 @@ package dedicatedhost
 
 import (
 	"github.com/spf13/cobra"
-	
+
 	slErr "github.ibm.com/SoftLayer/softlayer-cli/plugin/errors"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
 
@@ -61,6 +61,8 @@ func (cmd *CancelCommand) Run(args []string) error {
 	if len(listGuest) > 0 {
 		table := cmd.UI.Table([]string{T("Id"), T("Server Name"), T("Status")})
 		for _, guest := range listGuest {
+			//#nosec G601 -- utils.FormatXPointer returns the value of the memory address, so this is not a problem.
+			//Test Issues787 assures this condition.
 			table.Add(utils.FormatIntPointer(&guest.Id), utils.FormatStringPointer(&guest.Fqdn), utils.FormatStringPointer(&guest.Status))
 		}
 		table.Print()

plugin/commands/dedicatedhost/cancel_guest_test.go

@@ -91,5 +91,28 @@ var _ = Describe("Dedicated host create", func() {
 			})
 		})
 
+		Context("Dedicatedhost VS cancel vs successfully - multiple", func() {
+			BeforeEach(func() {
+				FakeDedicatedhostManager.CancelGuestsReturns([]managers.StatusInfo{
+					{
+						Id:     *sl.Int(1234567),
+						Fqdn:   *sl.String("test.softlayer"),
+						Status: *sl.String("Cancelled"),
+					},
+					{
+						Id:     *sl.Int(9999),
+						Fqdn:   *sl.String("qqq.aaa"),
+						Status: *sl.String("Cancelled"),
+					},
+				}, nil)
+			})
+			It("return no error", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "1234", "-f")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(fakeUI.Outputs()).To(ContainSubstring("1234567"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("9999"))
+			})
+		})
+
 	})
 })

plugin/commands/user/permissions.go

@@ -84,7 +84,17 @@ func (cmd *PermissionsCommand) Run(args []string) error {
 			}
 
 		}
-		tablePermission.Add(utils.FormatStringPointer(perm.Name), utils.FormatStringPointer(perm.KeyName), strconv.FormatBool(assigned))
+		flag := true
+		arr := []string{"ACCOUNT_SUMMARY_VIEW", "REQUEST_COMPLIANCE_REPORT", "COMPANY_EDIT", "ONE_TIME_PAYMENTS", "UPDATE_PAYMENT_DETAILS",
+			"EU_LIMITED_PROCESSING_MANAGE", "TICKET_ADD", "TICKET_EDIT", "TICKET_SEARCH", "TICKET_VIEW", "TICKET_VIEW_ALL"}
+		for i := 0; i < len(arr); i++ {
+			if *perm.KeyName == arr[i] {
+				flag = false
+			}
+		}
+		if flag == true {
+			tablePermission.Add(utils.FormatStringPointer(perm.Name), utils.FormatStringPointer(perm.KeyName), strconv.FormatBool(assigned))
+		}
 	}
 	tablePermission.Print()
 	return nil

plugin/commands/user/permissions_test.go

@@ -107,6 +107,24 @@ var _ = Describe("User Permissions", func() {
 			})
 		})
 
+		Context("hide user permissions", func() {
+			It("return not equal user permissions", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "123")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(fakeUI.Outputs()).NotTo(Equal("ACCOUNT_SUMMARY_VIEW"))
+				Expect(fakeUI.Outputs()).To(Not(Equal("REQUEST_COMPLIANCE_REPORT")))
+				Expect(fakeUI.Outputs()).To(Not(Equal("COMPANY_EDIT")))
+				Expect(fakeUI.Outputs()).To(Not(Equal("ONE_TIME_PAYMENTS")))
+				Expect(fakeUI.Outputs()).To(Not(Equal("UPDATE_PAYMENT_DETAILS")))
+				Expect(fakeUI.Outputs()).To(Not(Equal("EU_LIMITED_PROCESSING_MANAGE")))
+				Expect(fakeUI.Outputs()).To(Not(Equal("TICKET_ADD")))
+				Expect(fakeUI.Outputs()).To(Not(Equal("TICKET_EDIT")))
+				Expect(fakeUI.Outputs()).To(Not(Equal("TICKET_SEARCH")))
+				Expect(fakeUI.Outputs()).To(Not(Equal("TICKET_VIEW")))
+				Expect(fakeUI.Outputs()).To(Not(Equal("TICKET_VIEW_ALL")))
+			})
+		})
+
 		Context("user permissions - master account", func() {
 			It("return user permissions", func() {
 				fakeUserManager.GetUserReturns(datatypes.User_Customer{

plugin/commands/user/user.go

@@ -29,6 +29,7 @@ func SetupCobraCommands(sl *metadata.SoftlayerCommand) *cobra.Command {
 	cobraCmd.AddCommand(NewVpnSubnetCommand(sl).Command)
 	cobraCmd.AddCommand(NewVpnManualCommand(sl).Command)
 	cobraCmd.AddCommand(NewVpnPasswordCommand(sl).Command)
+	cobraCmd.AddCommand(NewVpnDisableCommand(sl).Command)
 	cobraCmd.AddCommand(NewVpnEnableCommand(sl).Command)
 	cobraCmd.AddCommand(NewApikeyCommand(sl).Command)
 	return cobraCmd

plugin/commands/user/user_suite_test.go

@@ -35,6 +35,7 @@ var availableCommands = []string{
 	"vpn-manual",
 	"vpn-password",
 	"vpn-subnet",
+	"vpn-disable",
 	"vpn-enable",
 }
 

plugin/commands/user/vpn_disable.go

@@ -0,0 +1,57 @@
+package user
+
+import (
+	"strconv"
+
+	"github.com/softlayer/softlayer-go/datatypes"
+	"github.com/softlayer/softlayer-go/sl"
+	"github.com/spf13/cobra"
+
+	slErrors "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 VpnDisableCommand struct {
+	*metadata.SoftlayerCommand
+	UserManager managers.UserManager
+	Command     *cobra.Command
+}
+
+func NewVpnDisableCommand(sl *metadata.SoftlayerCommand) (cmd *VpnDisableCommand) {
+	thisCmd := &VpnDisableCommand{
+		SoftlayerCommand: sl,
+		UserManager:      managers.NewUserManager(sl.Session),
+	}
+
+	cobraCmd := &cobra.Command{
+		Use:   "vpn-disable " + T("USER_ID"),
+		Short: T("Disable vpn for a user."),
+		Args:  metadata.OneArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return thisCmd.Run(args)
+		},
+	}
+
+	thisCmd.Command = cobraCmd
+	return thisCmd
+}
+
+func (cmd *VpnDisableCommand) Run(args []string) error {
+	userID, err := strconv.Atoi(args[0])
+	if err != nil {
+		return slErrors.NewInvalidSoftlayerIdInputError("User ID")
+	}
+	userTemplate := datatypes.User_Customer{
+		SslVpnAllowedFlag: sl.Bool(false),
+	}
+	success, err := cmd.UserManager.EditUser(userTemplate, userID)
+	if err != nil {
+		return slErrors.NewAPIError(T(""), err.Error(), 2)
+	}
+	if success {
+		cmd.UI.Ok()
+	}
+	return nil
+}

plugin/commands/user/vpn_disable_test.go

@@ -0,0 +1,76 @@
+package user_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/user"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/testhelpers"
+)
+
+var _ = Describe("user vpn-enable", func() {
+	var (
+		fakeUI          *terminal.FakeUI
+		cliCommand      *user.VpnDisableCommand
+		fakeSession     *session.Session
+		slCommand       *metadata.SoftlayerCommand
+		fakeUserManager *testhelpers.FakeUserManager
+	)
+	BeforeEach(func() {
+		fakeUI = terminal.NewFakeUI()
+		fakeSession = testhelpers.NewFakeSoftlayerSession([]string{})
+		fakeUserManager = new(testhelpers.FakeUserManager)
+		slCommand = metadata.NewSoftlayerCommand(fakeUI, fakeSession)
+		cliCommand = user.NewVpnDisableCommand(slCommand)
+		cliCommand.Command.PersistentFlags().Var(cliCommand.OutputFlag, "output", "--output=JSON for json output.")
+		cliCommand.UserManager = fakeUserManager
+
+		testUser = datatypes.User_Customer{
+			SslVpnAllowedFlag: sl.Bool(false),
+		}
+	})
+
+	Describe("user vpn-enable", func() {
+
+		Context("Return error", func() {
+			It("Set command without Argument", 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 user Id", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "abcde")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("Invalid input for 'User ID'. It must be a positive integer."))
+			})
+		})
+
+		Context("Account cancel-item, softlayer errors", func() {
+			It("Set command with unknow item ID", func() {
+				fakeUserManager.EditUserReturns(true, errors.New("SoftLayer_Exception_ObjectNotFound: Unable to find object with id of '123'. (HTTP 404)"))
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "123")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("SoftLayer_Exception_ObjectNotFound: Unable to find object with id of '123'. (HTTP 404)"))
+			})
+		})
+
+		Context("Return no error", func() {
+			BeforeEach(func() {
+				fakeUserManager.EditUserReturns(true, nil)
+			})
+			It("enable", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "111111")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(fakeUI.Outputs()).To(ContainSubstring("OK"))
+			})
+		})
+	})
+})

plugin/managers/network.go

@@ -220,6 +220,7 @@ func (n networkManager) AddSubnet(subnetType string, quantity int, vlanID int, v
 			quantity = 0
 			category = "global_ipv4"
 		} else if subnetType == "public" {
+			//#nosec G101 -- Not a credential
 			category = "sov_sec_ip_addresses_pub"
 		}
 	} else {