Skip to content

Commit 329d1cd

Browse files
committed
Change type of DiskSize to int to uint
It help us to fix integer overflow issue with latest version of golint-ci.
1 parent 7f4bfec commit 329d1cd

8 files changed

Lines changed: 12 additions & 11 deletions

File tree

cmd/crc/cmd/start.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func runStart(ctx context.Context) (*types.StartResult, error) {
7070
startConfig := types.StartConfig{
7171
BundlePath: config.Get(crcConfig.Bundle).AsString(),
7272
Memory: config.Get(crcConfig.Memory).AsUInt(),
73-
DiskSize: config.Get(crcConfig.DiskSize).AsInt(),
73+
DiskSize: config.Get(crcConfig.DiskSize).AsUInt(),
7474
CPUs: config.Get(crcConfig.CPUs).AsUInt(),
7575
NameServer: config.Get(crcConfig.NameServer).AsString(),
7676
PullSecret: cluster.NewInteractivePullSecretLoader(config),
@@ -187,7 +187,7 @@ func validateStartFlags() error {
187187
if err := validation.ValidateCPUs(config.Get(crcConfig.CPUs).AsUInt(), crcConfig.GetPreset(config)); err != nil {
188188
return err
189189
}
190-
if err := validation.ValidateDiskSize(config.Get(crcConfig.DiskSize).AsInt()); err != nil {
190+
if err := validation.ValidateDiskSize(config.Get(crcConfig.DiskSize).AsUInt()); err != nil {
191191
return err
192192
}
193193
if err := validation.ValidateBundle(config.Get(crcConfig.Bundle).AsString(), crcConfig.GetPreset(config)); err != nil {

pkg/crc/api/handlers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func getStartConfig(cfg crcConfig.Storage, args client.StartConfig) types.StartC
122122
return types.StartConfig{
123123
BundlePath: cfg.Get(crcConfig.Bundle).AsString(),
124124
Memory: cfg.Get(crcConfig.Memory).AsUInt(),
125-
DiskSize: cfg.Get(crcConfig.DiskSize).AsInt(),
125+
DiskSize: cfg.Get(crcConfig.DiskSize).AsUInt(),
126126
CPUs: cfg.Get(crcConfig.CPUs).AsUInt(),
127127
NameServer: cfg.Get(crcConfig.NameServer).AsString(),
128128
PullSecret: cluster.NewNonInteractivePullSecretLoader(cfg, args.PullSecretFile),

pkg/crc/config/validations.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func validateString(value interface{}) (bool, string) {
3030

3131
// validateDiskSize checks if provided disk size is valid in the config
3232
func validateDiskSize(value interface{}) (bool, string) {
33-
diskSize, err := cast.ToIntE(value)
33+
diskSize, err := cast.ToUintE(value)
3434
if err != nil {
3535
return false, fmt.Sprintf("could not convert '%s' to integer", value)
3636
}

pkg/crc/machine/config/config.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ type MachineConfig struct {
99
// Virtual machine configuration
1010
Name string
1111
// Memory holds value in MiB
12-
Memory uint
13-
CPUs uint
14-
DiskSize int
12+
Memory uint
13+
CPUs uint
14+
// DiskSize holds value in GiB
15+
DiskSize uint
1516
ImageSourcePath string
1617
ImageFormat string
1718
SSHKeyPath string

pkg/crc/machine/config/driver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"github.com/crc-org/machine/libmachine/drivers"
55
)
66

7-
func ConvertGiBToBytes(gib int) uint64 {
7+
func ConvertGiBToBytes(gib uint) uint64 {
88
return uint64(gib) * 1024 * 1024 * 1024
99
}
1010

pkg/crc/machine/driver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func setVcpus(host *host.Host, vcpus uint) error {
4545
return updateDriverValue(host, vcpuSetter)
4646
}
4747

48-
func setDiskSize(host *host.Host, diskSizeGiB int) error {
48+
func setDiskSize(host *host.Host, diskSizeGiB uint) error {
4949
diskSizeSetter := func(driver *libmachine.VMDriver) bool {
5050
capacity := config.ConvertGiBToBytes(diskSizeGiB)
5151
if driver.DiskCapacity == capacity {

pkg/crc/machine/types/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type StartConfig struct {
1515
// Hypervisor
1616
Memory uint // Memory size in MiB
1717
CPUs uint
18-
DiskSize int // Disk size in GiB
18+
DiskSize uint // Disk size in GiB
1919

2020
// Nameserver
2121
NameServer string

pkg/crc/validation/validation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func ValidateMemory(value uint, preset crcpreset.Preset) error {
3434
return ValidateEnoughMemory(value)
3535
}
3636

37-
func ValidateDiskSize(value int) error {
37+
func ValidateDiskSize(value uint) error {
3838
if value < constants.DefaultDiskSize {
3939
return fmt.Errorf("requires disk size in GiB >= %d", constants.DefaultDiskSize)
4040
}

0 commit comments

Comments
 (0)