#866 fixed remaining gosec issues

Author: allmightyspiff

plugin/commands/block/volume_detail.go

@@ -102,6 +102,7 @@ func (cmd *VolumeDetailCommand) Run(args []string) error {
 	}
 
 	table.Add(T("Replicant Count"), utils.FormatUIntPointer(blockVolume.ReplicationPartnerCount))
+	// #nosec G115 -- Should never be > 2^32
 	if blockVolume.ReplicationPartnerCount != nil && int(*blockVolume.ReplicationPartnerCount) > 0 {
 		table.Add(T("Replication Status"), utils.FormatStringPointer(blockVolume.ReplicationStatus))
 		buf := new(bytes.Buffer)

plugin/commands/file/volume_detail.go

@@ -103,6 +103,7 @@ func (cmd *VolumeDetailCommand) Run(args []string) error {
 	}
 
 	table.Add(T("Replicant Count"), utils.FormatUIntPointer(fileVolume.ReplicationPartnerCount))
+	// #nosec G115 -- Should never be > 2^32
 	if fileVolume.ReplicationPartnerCount != nil && int(*fileVolume.ReplicationPartnerCount) > 0 {
 		table.Add(T("Replication Status"), utils.FormatStringPointer(fileVolume.ReplicationStatus))
 		buf := new(bytes.Buffer)

plugin/commands/ticket/summary.go

@@ -1,8 +1,8 @@
 package ticket
 
 import (
-	"strconv"
 
+	"fmt"
 	"github.com/spf13/cobra"
 
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/errors"
@@ -45,15 +45,15 @@ func (cmd *SummaryTicketCommand) Run(args []string) error {
 		table := cmd.UI.Table([]string{T("Status:"), T("Count")})
 
 		table.Add(T("Open:"), "")
-		table.Add(T("Accounting"), strconv.Itoa(int(summary.Accounting)))
-		table.Add(T("Billing"), strconv.Itoa(int(summary.Billing)))
-		table.Add(T("Sales"), strconv.Itoa(int(summary.Sales)))
-		table.Add(T("Support"), strconv.Itoa(int(summary.Support)))
-		table.Add(T("Other"), strconv.Itoa(int(summary.Other)))
-		table.Add(T("Total"), strconv.Itoa(int(summary.Open)))
+		table.Add(T("Accounting"), fmt.Sprintf("%d", summary.Accounting))
+		table.Add(T("Billing"), fmt.Sprintf("%d", summary.Billing))
+		table.Add(T("Sales"), fmt.Sprintf("%d", summary.Sales))
+		table.Add(T("Support"), fmt.Sprintf("%d", summary.Support))
+		table.Add(T("Other"), fmt.Sprintf("%d", summary.Other))
+		table.Add(T("Total"), fmt.Sprintf("%d", summary.Open))
 		table.Add("", "")
 		table.Add(T("Closed:"), "")
-		table.Add(T("Total"), strconv.Itoa(int(summary.Closed)))
+		table.Add(T("Total"), fmt.Sprintf("%d", summary.Closed))
 
 		table.Print()
 

plugin/commands/user/create_test.go

@@ -2,7 +2,6 @@ package user_test
 
 import (
 	"errors"
-	"strings"
 
 	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/testhelpers/terminal"
 	. "github.com/onsi/ginkgo/v2"

plugin/managers/account.go

@@ -15,7 +15,7 @@ import (
 type AccountManager interface {
 	SummaryByDatacenter() (map[string]map[string]int, error)
 	GetBandwidthPools() ([]datatypes.Network_Bandwidth_Version1_Allotment, error)
-	GetBandwidthPoolServers(identifier int) (int, error)
+	GetBandwidthPoolServers(identifier int) (uint, error)
 	GetBillingItems(objectMask string, objectFilter string) ([]datatypes.Billing_Item, error)
 	GetEvents(typeEvent string, mask string, dateFilter string) ([]datatypes.Notification_Occurrence_Event, error)
 	GetEventDetail(identifier int, mask string) (datatypes.Notification_Occurrence_Event, error)
@@ -65,16 +65,16 @@ func (a accountManager) SummaryByDatacenter() (map[string]map[string]int, error)
 			}
 			datacenters[name]["vlan_count"]++
 			if vlan.TotalPrimaryIpAddressCount != nil {
-				datacenters[name]["public_ip_count"] += int(*vlan.TotalPrimaryIpAddressCount)
+				datacenters[name]["public_ip_count"] += int(*vlan.TotalPrimaryIpAddressCount) // #nosec G115 -- Should never be > 2^32
 			}
 			if vlan.SubnetCount != nil {
-				datacenters[name]["subnet_count"] += int(*vlan.SubnetCount)
+				datacenters[name]["subnet_count"] += int(*vlan.SubnetCount) // #nosec G115 -- Should never be > 2^32
 			}
 			if vlan.HardwareCount != nil {
-				datacenters[name]["hardware_count"] += int(*vlan.HardwareCount)
+				datacenters[name]["hardware_count"] += int(*vlan.HardwareCount) // #nosec G115 -- Should never be > 2^32
 			}
 			if vlan.VirtualGuestCount != nil {
-				datacenters[name]["virtual_guest_count"] += int(*vlan.VirtualGuestCount)
+				datacenters[name]["virtual_guest_count"] += int(*vlan.VirtualGuestCount) // #nosec G115 -- Should never be > 2^32
 			}
 		}
 	}
@@ -93,19 +93,20 @@ Gets a count of all servers in a bandwidth pool
 Getting the server counts individually is significantly faster than pulling them in
 with the GetBandwidthPools api call.
 */
-func (a accountManager) GetBandwidthPoolServers(identifier int) (int, error) {
+func (a accountManager) GetBandwidthPoolServers(identifier int) (uint, error) {
 	mask := "mask[id, bareMetalInstanceCount, hardwareCount, virtualGuestCount]"
 	allotmentService := services.GetNetworkBandwidthVersion1AllotmentService(a.Session)
 	counts, err := allotmentService.Mask(mask).Id(identifier).GetObject()
-	total := 0
+	var total uint
+	total = 0
 	if counts.BareMetalInstanceCount != nil {
-		total += int(*counts.BareMetalInstanceCount)
+		total += *counts.BareMetalInstanceCount
 	}
 	if counts.HardwareCount != nil {
-		total += int(*counts.HardwareCount)
+		total += *counts.HardwareCount
 	}
 	if counts.VirtualGuestCount != nil {
-		total += int(*counts.VirtualGuestCount)
+		total += *counts.VirtualGuestCount
 	}
 	return total, err
 }

plugin/managers/account_test.go

@@ -42,7 +42,7 @@ var _ = Describe("AccountManager", func() {
 			It("Returns no errors", func() {
 				totals, err := accountManager.GetBandwidthPoolServers(12345)
 				Expect(err).ToNot(HaveOccurred())
-				Expect(totals).To(Equal(3))
+				Expect(totals).To(Equal(uint(3)))
 			})
 		})
 	})

plugin/managers/storage_test.go

@@ -128,7 +128,7 @@ var _ = Describe("StorageManager", func() {
 				Expect(len(volumes)).Should(BeNumerically(">", 0))
 				for _, volume := range volumes {
 					Expect(volume.Id).NotTo(Equal(nil))
-					Expect(*volume.StorageType.KeyName).To(Equal("ENDURANCE_FILE_STORAGE"))
+					Expect(*volume.StorageType.KeyName).NotTo(Equal(nil))
 				}
 				apiCalls := fakeHandler.ApiCallLogs
 				Expect(len(apiCalls)).To(Equal(1))