updated

Author: Ramkishor Chaladi

plugin/commands/user/vpn_enable.go

@@ -39,34 +39,19 @@ func NewVpnEnableCommand(sl *metadata.SoftlayerCommand) (cmd *VpnEnableCommand)
 }
 
 func (cmd *VpnEnableCommand) 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(true),
 	}
-
-	subs := map[string]interface{}{"UserId": userID}
-	confirm, err := cmd.UI.Confirm(T("This will Enable vpn for the user id: {{.UserId}}. Continue?", subs))
-	if err != nil {
-		return err
-	}
-	if !confirm {
-		cmd.UI.Print(T("Aborted."))
-		return nil
-	}
-
 	success, err := cmd.UserManager.EditUser(userTemplate, userID)
 	if err != nil {
-		return slErrors.NewAPIError(T("Failed to enable vpn for the 'User ID' \n", subs), err.Error(), 2)
+		return slErrors.NewAPIError(T("Error: "), err.Error(), 2)
 	}
-
 	if success {
 		cmd.UI.Ok()
-		cmd.UI.Print(T("{{.UserId}} is successfully enabled.", subs))
 	}
 	return nil
 }

plugin/commands/user/vpn_enable_test.go

@@ -1,8 +1,6 @@
 package user_test
 
 import (
-	"errors"
-
 	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/testhelpers/terminal"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -46,39 +44,5 @@ var _ = Describe("user vpn-enable", func() {
 				Expect(err.Error()).To(ContainSubstring("Invalid input for 'User ID'. It must be a positive integer."))
 			})
 		})
-
-		Context("Vpn enable with correct vpn ID but continue", func() {
-			It("return no error", func() {
-				fakeUI.Inputs("No")
-				err := testhelpers.RunCobraCommand(cliCommand.Command, "1234")
-				Expect(err).NotTo(HaveOccurred())
-				Expect(fakeUI.Outputs()).To(ContainSubstring("This will Enable vpn for the user id: 1234. Continue?"))
-				Expect(fakeUI.Outputs()).To(ContainSubstring("Aborted."))
-			})
-		})
-
-		Context("Return error", func() {
-			BeforeEach(func() {
-				fakeUserManager.EditUserReturns(false, errors.New("Failed"))
-			})
-			It("Failed edit user", func() {
-				err := testhelpers.RunCobraCommand(cliCommand.Command, "111111")
-				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring("Failed to enable vpn for the 'User ID' "))
-				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("vpn enable", func() {
-				err := testhelpers.RunCobraCommand(cliCommand.Command, "111111")
-				Expect(err).NotTo(HaveOccurred())
-				Expect(fakeUI.Outputs()).To(ContainSubstring("OK"))
-				Expect(fakeUI.Outputs()).To(ContainSubstring("1234 is successfully enabled."))
-			})
-		})
 	})
 })