ran gofmt -w find . -name '*.go' | grep -v vendor | grep -v testhelpers

Author: allmightyspiff

plugin/commands/ipsec/detail.go

@@ -113,13 +113,13 @@ func (cmd *DetailCommand) Run(args []string) error {
 	return nil
 }
 
-//Yields a mask for a tunnel context
-//All exposed properties on the tunnel context service are included inthe constructed mask. Additional joins may be requested.
-//addressTranslations: Whether to join the context's address translation entries.
-//internalSubnets: Whether to join the context's internal subnet associations.
-//remoteSubnets: Whether to join the context's remote subnet associations.
-//staticSubnets: Whether to join the context's statically routed subnet associations.
-//serviceSubnets: Whether to join the SoftLayer service network subnets.
+// Yields a mask for a tunnel context
+// All exposed properties on the tunnel context service are included inthe constructed mask. Additional joins may be requested.
+// addressTranslations: Whether to join the context's address translation entries.
+// internalSubnets: Whether to join the context's internal subnet associations.
+// remoteSubnets: Whether to join the context's remote subnet associations.
+// staticSubnets: Whether to join the context's statically routed subnet associations.
+// serviceSubnets: Whether to join the SoftLayer service network subnets.
 func GetTunnelContextMask(addressTranslation, internalSubnets, remoteSubnets, statusSubnets, serviceSubnets bool) string {
 	mask := "id,accountId,advancedConfigurationFlag,createDate,customerPeerIpAddress,modifyDate,name,friendlyName,internalPeerIpAddress" +
 		",phaseOneAuthentication,phaseOneDiffieHellmanGroup,phaseOneEncryption,phaseOneKeylife" +

plugin/commands/order/item_list.go

@@ -63,7 +63,7 @@ func (cmd *ItemListCommand) Run(args []string) error {
 	return nil
 }
 
-//"""sorts the items into a dictionary of categories, with a list of items"""
+// """sorts the items into a dictionary of categories, with a list of items"""
 func sortItems(items []datatypes.Product_Item) map[string][]datatypes.Product_Item {
 
 	sortedItems := make(map[string][]datatypes.Product_Item)

plugin/commands/search/search.go

@@ -2,23 +2,23 @@ package search
 
 import (
 	"fmt"
-	"strings"
 	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/plugin"
 	"github.com/spf13/cobra"
+	"strings"
 
 	"github.com/softlayer/softlayer-go/datatypes"
 	. "github.ibm.com/SoftLayer/softlayer-cli/plugin/i18n"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/managers"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
-	
+
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/utils"
 )
 
 type SearchCommand struct {
 	*metadata.SoftlayerCommand
 	SearchManager managers.SearchManager
 	Command       *cobra.Command
-	Query		  string
+	Query         string
 }
 
 func SetupCobraCommands(sl *metadata.SoftlayerCommand) *cobra.Command {
@@ -35,8 +35,8 @@ Examples::
     sl search --query 'test.com'
     sl search --query '_objectType:SoftLayer_Virtual_Guest test.com'
 `),
-		Args:  metadata.NoArgs,
-		RunE:  func(cmd *cobra.Command, args []string) error {
+		Args: metadata.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
 			return thisCmd.Run(args)
 		},
 	}
@@ -56,7 +56,9 @@ func SearchNamespace() plugin.Namespace {
 func (cmd *SearchCommand) Run(args []string) error {
 
 	results, err := cmd.SearchManager.AdvancedSearch("", cmd.Query)
-	if err != nil { return err}
+	if err != nil {
+		return err
+	}
 	if cmd.GetOutputFlag() == "JSON" {
 		return utils.PrintPrettyJSON(cmd.UI, results)
 	}
@@ -102,29 +104,29 @@ func parseMatchedTerms(searchResult datatypes.Container_Search_Result) string {
 	return strings.Join(searchResult.MatchedTerms, "\n")
 }
 func parseVirtual_Guest(resource datatypes.Virtual_Guest) string {
-	return fmt.Sprintf(T("ID") + ": %d\n" + T("FQDN") + ": %s\n", *resource.Id, *resource.FullyQualifiedDomainName)
+	return fmt.Sprintf(T("ID")+": %d\n"+T("FQDN")+": %s\n", *resource.Id, *resource.FullyQualifiedDomainName)
 }
 func parseEvent_Log(resource datatypes.Event_Log) string {
-	return fmt.Sprintf(T("ID") + ": %s\n" + T("Event")  + ": %s\n", *resource.TraceId, *resource.EventName)
+	return fmt.Sprintf(T("ID")+": %s\n"+T("Event")+": %s\n", *resource.TraceId, *resource.EventName)
 }
 func parseVirtual_DedicatedHost(resource datatypes.Virtual_DedicatedHost) string {
-	return fmt.Sprintf(T("ID") + ": %d\n" + T("Name") + ": %s\n", *resource.Id, *resource.Name)
+	return fmt.Sprintf(T("ID")+": %d\n"+T("Name")+": %s\n", *resource.Id, *resource.Name)
 }
 func parseHardware(resource datatypes.Hardware) string {
-	return fmt.Sprintf(T("ID") + ": %d\n" + T("FQDN")  + ": %s\n", *resource.Id, *resource.FullyQualifiedDomainName)
+	return fmt.Sprintf(T("ID")+": %d\n"+T("FQDN")+": %s\n", *resource.Id, *resource.FullyQualifiedDomainName)
 }
 func parseNetwork_Application_Delivery_Controller(resource datatypes.Network_Application_Delivery_Controller) string {
-	return fmt.Sprintf(T("ID") + ": %d\n" + T("Name") +  ": %s\n", *resource.Id, *resource.Name)
+	return fmt.Sprintf(T("ID")+": %d\n"+T("Name")+": %s\n", *resource.Id, *resource.Name)
 }
 func parseNetwork_Subnet_IpAddress(resource datatypes.Network_Subnet_IpAddress) string {
-	return fmt.Sprintf(T("ID") + ": %d\n" + T("Ip Address") +  ": %s\n", *resource.Id, *resource.IpAddress)
+	return fmt.Sprintf(T("ID")+": %d\n"+T("Ip Address")+": %s\n", *resource.Id, *resource.IpAddress)
 }
 func parseNetwork_Vlan(resource datatypes.Network_Vlan) string {
-	return fmt.Sprintf(T("ID") + ": %d\n" + T("VLAN")  + ": %d\n", *resource.Id, *resource.VlanNumber)
+	return fmt.Sprintf(T("ID")+": %d\n"+T("VLAN")+": %d\n", *resource.Id, *resource.VlanNumber)
 }
 func parseNetwork_Vlan_Firewall(resource datatypes.Network_Vlan_Firewall) string {
-	return fmt.Sprintf(T("ID") + ": %d\n" + T("Ip Address")  + ": %s\n", *resource.Id, *resource.PrimaryIpAddress)
+	return fmt.Sprintf(T("ID")+": %d\n"+T("Ip Address")+": %s\n", *resource.Id, *resource.PrimaryIpAddress)
 }
 func parseTicket(resource datatypes.Ticket) string {
-	return fmt.Sprintf(T("ID") + ": %d\n" + T("Subject")  + ": %s\n", *resource.Id, *resource.Title)
-}
+	return fmt.Sprintf(T("ID")+": %d\n"+T("Subject")+": %s\n", *resource.Id, *resource.Title)
+}

plugin/commands/search/search_test.go

@@ -53,7 +53,7 @@ var _ = Describe("Test search commands", func() {
 				if utils.StringInSlice(commandName, arrayCommands) != -1 {
 					available = true
 				}
-				Expect(available).To(BeTrue(), commandName + " not found in ibmcloud sl " + commands.Name())
+				Expect(available).To(BeTrue(), commandName+" not found in ibmcloud sl "+commands.Name())
 			})
 		}
 	})
@@ -83,7 +83,7 @@ var _ = Describe("Test search commands", func() {
 			Expect(err.Error()).To(ContainSubstring("Search Error: Search Error (HTTP 500)"))
 		})
 		It("Basic Search Command with query", func() {
-			err := testhelpers.RunCobraCommand(cliCommand , "-q", `"_objectTpye:SoftLayer_Virtual_Guest test.com`)
+			err := testhelpers.RunCobraCommand(cliCommand, "-q", `"_objectTpye:SoftLayer_Virtual_Guest test.com`)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(fakeUI.Outputs()).To(ContainSubstring("SoftLayer_Network_Vlan"))
 			Expect(fakeUI.Outputs()).To(ContainSubstring("VLAN |match|       ID: 675037"))

plugin/commands/search/types.go

@@ -1,18 +1,16 @@
 package search
 
 import (
-
 	"bytes"
-	"strconv"
 	"github.com/spf13/cobra"
+	"strconv"
 
 	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/bluemix/terminal"
 
 	. "github.ibm.com/SoftLayer/softlayer-cli/plugin/i18n"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/managers"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/utils"
-
 )
 
 type SearchTypesCommand struct {

plugin/commands/search/types_test.go

@@ -1,7 +1,6 @@
 package search_test
 
 import (
-
 	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/testhelpers/terminal"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -15,11 +14,11 @@ import (
 
 var _ = Describe("search types", func() {
 	var (
-		fakeUI            *terminal.FakeUI
-		cliCommand        *search.SearchTypesCommand
-		fakeSession       *session.Session
-		slCommand         *metadata.SoftlayerCommand
-		fakeHandler 	  *testhelpers.FakeTransportHandler
+		fakeUI      *terminal.FakeUI
+		cliCommand  *search.SearchTypesCommand
+		fakeSession *session.Session
+		slCommand   *metadata.SoftlayerCommand
+		fakeHandler *testhelpers.FakeTransportHandler
 		// fakeSearchManager *testhelpers.FakeSearchManager
 	)
 	BeforeEach(func() {

plugin/managers/dedicatedhost.go

@@ -32,7 +32,7 @@ const (
 
 var existDatacenter = false
 
-//Manages SoftLayer Dedicated host.
+// Manages SoftLayer Dedicated host.
 type DedicatedHostManager interface {
 	ListGuests(identifier int, cpu int, domain string, hostname string, memory int, tags []string, mask string) ([]datatypes.Virtual_Guest, error)
 	GenerateOrderTemplate(size, hostname, domain, datacenter string, billing string, routerId int) (datatypes.Container_Product_Order_Virtual_DedicatedHost, error)
@@ -64,8 +64,8 @@ func NewDedicatedhostManager(session *session.Session) *dedicatedhostManager {
 	}
 }
 
-//Cancel an instance immediately, deleting all its data.
-//id: the instance ID to cancel
+// Cancel an instance immediately, deleting all its data.
+// id: the instance ID to cancel
 func (d dedicatedhostManager) CancelGuests(id int) ([]StatusInfo, error) {
 	guests, err := d.VirtualDedicatedHost.Id(id).GetGuests()
 	var listCaneledGuests []StatusInfo
@@ -88,7 +88,7 @@ func (d dedicatedhostManager) CancelGuests(id int) ([]StatusInfo, error) {
 	return listCaneledGuests, nil
 }
 
-//Deletes a guest and returns 'Cancelled' or and Exception message
+// Deletes a guest and returns 'Cancelled' or and Exception message
 func (d dedicatedhostManager) DeleteGuest(Id int) (string, error) {
 	status := "Cancelled"
 	_, err := d.VirtualGuestService.Id(Id).DeleteObject()
@@ -98,13 +98,13 @@ func (d dedicatedhostManager) DeleteGuest(Id int) (string, error) {
 	return status, nil
 }
 
-//Retrieve a list of all virtual servers on the dedicated host.
-//integer identifier: The identifier of a dedicated host.
-//integer cpus: filter based on number of CPUS.
-//string domain: filter based on domain.
-//string hostname: filter based on hostname.
-//integer memory: filter based on amount of memory.
-//list tags: filter based on list of tags.
+// Retrieve a list of all virtual servers on the dedicated host.
+// integer identifier: The identifier of a dedicated host.
+// integer cpus: filter based on number of CPUS.
+// string domain: filter based on domain.
+// string hostname: filter based on hostname.
+// integer memory: filter based on amount of memory.
+// list tags: filter based on list of tags.
 func (d dedicatedhostManager) ListGuests(identifier int, cpu int, domain string, hostname string, memory int, tags []string, mask string) ([]datatypes.Virtual_Guest, error) {
 	filters := filter.New()
 	if cpu != 0 {
@@ -134,17 +134,17 @@ func (d dedicatedhostManager) ListGuests(identifier int, cpu int, domain string,
 	return guestList, nil
 }
 
-//Get details about a dedicatedhost instance.
-//id: the instance ID
-//mask: mask of properties
+// Get details about a dedicatedhost instance.
+// id: the instance ID
+// mask: mask of properties
 func (d dedicatedhostManager) GetInstance(id int, mask string) (datatypes.Virtual_DedicatedHost, error) {
 	if mask == "" {
 		mask = DEDICATEDHOST_DETAIL_MASK
 	}
 	return d.VirtualDedicatedHost.Id(id).Mask(mask).GetObject()
 }
 
-//Generate dedicated host payload.
+// Generate dedicated host payload.
 func (d dedicatedhostManager) GenerateOrderTemplate(size, hostname, domain, datacenter string, billing string, routerId int) (datatypes.Container_Product_Order_Virtual_DedicatedHost, error) {
 	mask := "items[keyName,capacity,description,attributes[id,attributeTypeKeyName],itemCategory[id,categoryCode],softwareDescription[id,referenceCode,longDescription],prices],activePresets,regions[location[location[priceGroups]]]"
 	packages, err := d.PackageService.Mask(mask).Filter(filter.Path("keyName").Eq("DEDICATED_HOST").Build()).GetAllObjects()
@@ -187,17 +187,17 @@ func (d dedicatedhostManager) GenerateOrderTemplate(size, hostname, domain, data
 	return order, nil
 }
 
-//Verify the dedicated host order.
+// Verify the dedicated host order.
 func (d dedicatedhostManager) VerifyInstanceCreation(orderTemplate datatypes.Container_Product_Order_Virtual_DedicatedHost) (datatypes.Container_Product_Order, error) {
 	return d.OrderService.VerifyOrder(&orderTemplate)
 }
 
-//Order a dedicated host.
+// Order a dedicated host.
 func (d dedicatedhostManager) OrderInstance(orderTemplate datatypes.Container_Product_Order_Virtual_DedicatedHost) (datatypes.Container_Product_Order_Receipt, error) {
 	return d.OrderService.PlaceOrder(&orderTemplate, sl.Bool(false))
 }
 
-//Get the package related to simple dedicatedhost ordering
+// Get the package related to simple dedicatedhost ordering
 func (d dedicatedhostManager) GetPackage() (datatypes.Product_Package, error) {
 	mask := "items[id,description,prices,capacity,keyName,itemCategory[categoryCode],bundleItems[capacity,keyName,categories[categoryCode],hardwareGenericComponentModel[id,hardwareComponentType[keyName]]]],regions[location[location[priceGroups]]]"
 	filters := filter.New()
@@ -212,7 +212,7 @@ func (d dedicatedhostManager) GetPackage() (datatypes.Product_Package, error) {
 	return packages[0], nil
 }
 
-//Returns valid options for ordering hardware.
+// Returns valid options for ordering hardware.
 func (d dedicatedhostManager) GetCreateOptions(productPackage datatypes.Product_Package) map[string]map[string]string {
 	//locations
 	locations := make(map[string]string)
@@ -237,7 +237,7 @@ func (d dedicatedhostManager) GetCreateOptions(productPackage datatypes.Product_
 	}
 }
 
-//Get the private vlans in the account.
+// Get the private vlans in the account.
 func (d dedicatedhostManager) GetVlansOptions(datacenter string, flavor string, productPackage datatypes.Product_Package) ([]datatypes.Network_Vlan, error) {
 	maskVlans := "primaryRouter[datacenter]"
 	maskItemPrices := "pricingLocationGroup[locations]"