Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: panic and crash when size parameter of a disk is not parseable into a Quantity #111

Merged
merged 2 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN wget --quiet https://github.com/docker/buildx/releases/download/v0.13.1/buil
mv buildx-v0.13.1.linux-${ARCH} /usr/local/bin/buildx && \
mv terraform /usr/local/bin/terraform

ENV DAPPER_RUN_ARGS="--network host -v /run/containerd/containerd.sock:/run/containerd/containerd.sock"
ENV DAPPER_ENV REPO TAG DRONE_TAG
ENV DAPPER_SOURCE /go/src/github.com/harvester/terraform-provider-harvester
ENV DAPPER_OUTPUT ./bin ./dist
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/harvester/harvester/pkg/builder"
harvesterutil "github.com/harvester/harvester/pkg/util"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
kubevirtv1 "kubevirt.io/api/core/v1"
Expand Down Expand Up @@ -198,9 +199,7 @@ func (c *Constructor) Setup() util.Processors {
diskBus = builder.DiskBusVirtio
}
}
if diskSize == "" {
diskSize = util.If(existingVolumeName == "", "", builder.DefaultDiskSize).(string)
}

vmBuilder.Disk(diskName, diskBus, isCDRom, uint(bootOrder))
if existingVolumeName != "" {
vmBuilder.ExistingPVCVolume(diskName, existingVolumeName, hotPlug)
Expand Down Expand Up @@ -256,6 +255,14 @@ func (c *Constructor) Setup() util.Processors {
constants.AnnotationDiskAutoDelete: "true",
}
}

_, err := resource.ParseQuantity(diskSize)
if diskSize == "" {
diskSize = builder.DefaultDiskSize
} else if err != nil {
return fmt.Errorf("\"%v\" is not a parsable quantity: %v", diskSize, err)
}

vmBuilder.PVCVolume(diskName, diskSize, volumeName, hotPlug, pvcOption)
}
return nil
Expand Down
62 changes: 62 additions & 0 deletions internal/tests/resource_virtualmachine_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package tests
import (
"context"
"fmt"
"regexp"
"testing"

"github.com/google/uuid"
Expand Down Expand Up @@ -137,6 +138,67 @@ func TestAccVirtualMachine_input(t *testing.T) {
})
}

func TestAccVirtualMachine_disk_size(t *testing.T) {
var (
testAccImageName = "test-acc-image-leap-" + uuid.New().String()[:6]
testAccImageResourceName = constants.ResourceTypeImage + "." + testAccImageName
ctx = context.Background()
)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckVirtualMachineDestroy(ctx),
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(`
resource harvester_image "%s" {
name = "leap-15.6"
namespace = "default"
display_name = "openSUSE-Leap-15.6"
source_type = "download"
url = "https://download.opensuse.org/repositories/Cloud:/Images:/Leap_15.6/images/openSUSE-Leap-15.6.x86_64-NoCloud.qcow2"
}
`,
testAccImageName,
),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(testAccImageResourceName, constants.FieldCommonName, "leap-15.6"),
resource.TestCheckResourceAttr(testAccImageResourceName, constants.FieldCommonNamespace, "default"),
),
},
{
Config: `
resource harvester_virtualmachine "disk_test" {
name = "disk-test"

cpu = 1
memory = "1Gi"

run_strategy = "RerunOnFailure"
machine_type = "q35"

network_interface {
name = "default"
}

disk {
name = "cdrom-disk"
type = "cd-rom"
bus = "sata"
boot_order = 1
size = "foobar"
image = "default/leap-15.6"
}
}
`,
ExpectError: regexp.MustCompile(".*is not a parsable quantity.*"),
Check: resource.ComposeTestCheckFunc(),
},
},
})
}

func testAccVirtualMachineExists(ctx context.Context, n string, vm *kubevirtv1.VirtualMachine) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
Expand Down
Loading