From b17ecbd3de03e0698ed97cf3a2f5ab2fb44fd7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Fri, 30 Oct 2020 14:54:56 +0100 Subject: [PATCH] Convert the return values to use uint64 instead --- pkg/minikube/machine/info.go | 4 ++-- pkg/util/utils.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/minikube/machine/info.go b/pkg/minikube/machine/info.go index 3d18b74341e0..0bf6048439d0 100644 --- a/pkg/minikube/machine/info.go +++ b/pkg/minikube/machine/info.go @@ -97,8 +97,8 @@ func RemoteHostInfo(r command.Runner) (*HostInfo, error, error, error) { var info HostInfo info.CPUs = ncpus - info.Memory = memory - info.DiskSize = disksize + info.Memory = int64(memory) + info.DiskSize = int64(disksize) return &info, cpuErr, memErr, diskErr } diff --git a/pkg/util/utils.go b/pkg/util/utils.go index b0d1632ee3ae..f6189473fb67 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -65,7 +65,7 @@ func ConvertUnsignedBytesToMB(byteSize uint64) int64 { // ParseMemFree parses the output of the `free -m` command // returns: total, available -func ParseMemFree(out string) (int64, int64, error) { +func ParseMemFree(out string) (uint64, uint64, error) { // total used free shared buff/cache available //Mem: 1987 706 194 1 1086 1173 //Swap: 0 0 0 @@ -76,11 +76,11 @@ func ParseMemFree(out string) (int64, int64, error) { if len(parsedLine) < 7 { continue } - t, err := strconv.ParseInt(parsedLine[1], 10, 64) + t, err := strconv.ParseUint(parsedLine[1], 10, 64) if err != nil { return 0, 0, err } - a, err := strconv.ParseInt(parsedLine[6], 10, 64) + a, err := strconv.ParseUint(parsedLine[6], 10, 64) if err != nil { return 0, 0, err } @@ -94,7 +94,7 @@ func ParseMemFree(out string) (int64, int64, error) { // ParseDiskFree parses the output of the `df -m` command // returns: total, available -func ParseDiskFree(out string) (int64, int64, error) { +func ParseDiskFree(out string) (uint64, uint64, error) { // Filesystem 1M-blocks Used Available Use% Mounted on // /dev/sda1 39643 3705 35922 10% / outlines := strings.Split(out, "\n") @@ -104,11 +104,11 @@ func ParseDiskFree(out string) (int64, int64, error) { if len(parsedLine) < 6 { continue } - t, err := strconv.ParseInt(parsedLine[1], 10, 64) + t, err := strconv.ParseUint(parsedLine[1], 10, 64) if err != nil { return 0, 0, err } - a, err := strconv.ParseInt(parsedLine[3], 10, 64) + a, err := strconv.ParseUint(parsedLine[3], 10, 64) if err != nil { return 0, 0, err }