fixes

Author: drewmalin

v1/bytes.go

@@ -137,6 +137,7 @@ func (b Bytes) GreaterThan(other Bytes) bool {
 	return b.byteCount.Cmp(other.byteCount) > 0
 }
 
+// Equal returns true if the Bytes is equal to the other Bytes
 func (b Bytes) Equal(other Bytes) bool {
 	return b.byteCount.Cmp(other.byteCount) == 0
 }

v1/bytes_test.go

@@ -375,3 +375,33 @@ func TestBytesByteCountInUnitInt64(t *testing.T) {
 		})
 	}
 }
+
+func TestBytesByteCountInUnitInt32(t *testing.T) {
+	tests := []struct {
+		name    string
+		bytes   Bytes
+		unit    BytesUnit
+		want    int32
+		wantErr error
+	}{
+		{name: "2048 MiB -> GiB", bytes: NewBytes(2048, Mebibyte), unit: Gibibyte, want: 2, wantErr: nil},
+		{name: "2048 EiB -> B", bytes: NewBytes(2048, Exbibyte), unit: Byte, want: 0, wantErr: ErrBytesNotAnInt64},
+		{name: "2048 EiB -> KB", bytes: NewBytes(2048, Exbibyte), unit: Kilobyte, want: 0, wantErr: ErrBytesNotAnInt32},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			got, err := test.bytes.ByteCountInUnitInt32(test.unit)
+			if err != nil {
+				if test.wantErr != nil {
+					if !errors.Is(err, test.wantErr) {
+						t.Errorf("Bytes.ByteCountInUnitInt32() = %v, want %v", err, test.wantErr)
+					}
+				} else {
+					t.Errorf("Bytes.ByteCountInUnitInt32() = %v, want %v", err, test.wantErr)
+				}
+			} else if got != test.want {
+				t.Errorf("Bytes.ByteCountInUnitInt32() = %v, want %v", got, test.want)
+			}
+		})
+	}
+}

v1/kubernetes_test.go

@@ -209,7 +209,7 @@ func TestClusterUnmarshalJSON(t *testing.T) { //nolint:gocyclo,funlen // test ok
 	if cluster.nodeGroups[0].instanceType != "test-instanceType" {
 		t.Fatalf("Cluster NodeGroup InstanceType = %s, want %s", cluster.nodeGroups[0].instanceType, "test-instanceType")
 	}
-	if cluster.nodeGroups[0].diskSize != NewBytes(10, Gibibyte) {
+	if !cluster.nodeGroups[0].diskSize.Equal(NewBytes(10, Gibibyte)) {
 		t.Fatalf("Cluster NodeGroup DiskSize = %s, want %s", cluster.nodeGroups[0].diskSize, "10 GiB")
 	}
 	if len(cluster.nodeGroups[0].tags) != 1 {

v1/kubernetes_validation.go

@@ -84,7 +84,7 @@ func ValidateCreateKubernetesNodeGroup(ctx context.Context, client CloudMaintain
 	if nodeGroup.GetInstanceType() != attrs.InstanceType {
 		return nil, fmt.Errorf("node group instanceType does not match create args: '%s' != '%s'", nodeGroup.GetInstanceType(), attrs.InstanceType)
 	}
-	if nodeGroup.GetDiskSize() != attrs.DiskSize {
+	if !nodeGroup.GetDiskSize().Equal(attrs.DiskSize) {
 		return nil, fmt.Errorf("node group diskSize does not match create args: '%s' != '%s'", nodeGroup.GetDiskSize(), attrs.DiskSize)
 	}
 
@@ -121,7 +121,7 @@ func ValidateClusterNodeGroups(ctx context.Context, client CloudMaintainKubernet
 	if clusterNodeGroup.GetInstanceType() != nodeGroup.GetInstanceType() {
 		return fmt.Errorf("cluster node group instanceType does not match create args: '%s' != '%s'", clusterNodeGroup.GetInstanceType(), nodeGroup.GetInstanceType())
 	}
-	if clusterNodeGroup.GetDiskSize() != nodeGroup.GetDiskSize() {
+	if !clusterNodeGroup.GetDiskSize().Equal(nodeGroup.GetDiskSize()) {
 		return fmt.Errorf("cluster node group diskSize does not match create args: '%s' != '%s'", clusterNodeGroup.GetDiskSize(), nodeGroup.GetDiskSize())
 	}
 	for key, value := range nodeGroup.GetTags() {

v1/providers/aws/kubernetes.go

@@ -25,6 +25,8 @@ import (
 )
 
 var (
+	minDiskSize = v1.NewBytes(20, v1.Gibibyte)
+
 	errUsernameIsRequired     = fmt.Errorf("username is required")
 	errRoleIsRequired         = fmt.Errorf("role is required")
 	errClusterIDIsRequired    = fmt.Errorf("cluster ID is required")
@@ -34,7 +36,7 @@ var (
 	errNodeGroupMaxNodeCountMustBeGreaterThan0                     = fmt.Errorf("node group maxNodeCount must be greater than 0")
 	errNodeGroupMaxNodeCountMustBeGreaterThanOrEqualToMinNodeCount = fmt.Errorf("node group maxNodeCount must be greater than or equal to minNodeCount")
 	errNodeGroupInstanceTypeIsRequired                             = fmt.Errorf("node group instanceType is required")
-	errNodeGroupDiskSizeGiBMustBeGreaterThanOrEqualTo20            = fmt.Errorf("node group diskSizeGiB must be greater than or equal to 20")
+	errNodeGroupDiskSizeGiBMustBeGreaterThanOrEqualToMinDiskSize   = fmt.Errorf("node group diskSizeGiB must be greater than or equal to %v", minDiskSize)
 	errNodeGroupDiskSizeGiBMustBeLessThanOrEqualToMaxInt32         = fmt.Errorf("node group diskSizeGiB must be less than or equal to %d", math.MaxInt32)
 	errNodeGroupMaxNodeCountMustBeLessThanOrEqualToMaxInt32        = fmt.Errorf("node group maxNodeCount must be less than or equal to %d", math.MaxInt32)
 	errNodeGroupMinNodeCountMustBeLessThanOrEqualToMaxInt32        = fmt.Errorf("node group minNodeCount must be less than or equal to %d", math.MaxInt32)
@@ -518,8 +520,8 @@ func validateCreateNodeGroupArgs(args v1.CreateNodeGroupArgs) error {
 	if args.InstanceType == "" {
 		errs = append(errs, errNodeGroupInstanceTypeIsRequired)
 	}
-	if args.DiskSize.LessThan(v1.NewBytes(20, v1.Gibibyte)) {
-		errs = append(errs, errNodeGroupDiskSizeGiBMustBeGreaterThanOrEqualTo20)
+	if args.DiskSize.LessThan(minDiskSize) {
+		errs = append(errs, errNodeGroupDiskSizeGiBMustBeGreaterThanOrEqualToMinDiskSize)
 	}
 	if args.DiskSize.GreaterThan(v1.NewBytes(math.MaxInt32, v1.Gibibyte)) {
 		errs = append(errs, errNodeGroupDiskSizeGiBMustBeLessThanOrEqualToMaxInt32)

v1/providers/aws/kubernetes_unit_test.go

@@ -89,7 +89,7 @@ func TestValidateCreateNodeGroupArgs(t *testing.T) { //nolint:funlen // test ok
 				InstanceType: "t3.medium",
 				DiskSize:     v1.NewBytes(10, v1.Gibibyte),
 			},
-			expectError: errNodeGroupDiskSizeGiBMustBeGreaterThanOrEqualTo20,
+			expectError: errNodeGroupDiskSizeGiBMustBeGreaterThanOrEqualToMinDiskSize,
 		},
 		{
 			name: "disk size exceeds max int32",