Define CloudInitDiskType in tests since checking/defaulting is done i…

…n Prepare. config.go formatting
hashicorp · May 29, 2024 · f75bdf4 · f75bdf4
1 parent 41412c2
commit f75bdf4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go
@@ -711,12 +711,12 @@ func (c *Config) Prepare(upper interface{}, raws ...interface{}) ([]string, []st
 	}
 	if c.CloudInit {
 		switch c.CloudInitDiskType {
-			case "ide", "scsi", "sata":
-			case "":
-				log.Printf("Cloud-Init disk type not set, using default 'ide'")
-				c.CloudInitDiskType = "ide"
-			default:
-				errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("invalid value for `cloud_init_disk_type` %q: only one of 'ide', 'scsi', 'sata' is valid", c.CloudInitDiskType))
+		case "ide", "scsi", "sata":
+		case "":
+			log.Printf("Cloud-Init disk type not set, using default 'ide'")
+			c.CloudInitDiskType = "ide"
+		default:
+			errs = packersdk.MultiErrorAppend(errs, fmt.Errorf("invalid value for `cloud_init_disk_type` %q: only one of 'ide', 'scsi', 'sata' is valid", c.CloudInitDiskType))
 		}
 	}
 

diff --git a/builder/proxmox/common/step_finalize_template_config_test.go b/builder/proxmox/common/step_finalize_template_config_test.go
@@ -109,6 +109,7 @@ func TestTemplateFinalize(t *testing.T) {
 				TemplateName:        "my-template",
 				TemplateDescription: "some-description",
 				CloudInit:           true,
+				CloudInitDiskType:   "ide",
 			},
 			initialVMConfig: map[string]interface{}{
 				"name":        "dummy",
@@ -130,6 +131,7 @@ func TestTemplateFinalize(t *testing.T) {
 				TemplateName:        "my-template",
 				TemplateDescription: "some-description",
 				CloudInit:           true,
+				CloudInitDiskType:   "ide",
 			},
 			initialVMConfig: map[string]interface{}{
 				"name":        "dummy",
@@ -150,6 +152,7 @@ func TestTemplateFinalize(t *testing.T) {
 				TemplateName:        "my-template",
 				TemplateDescription: "some-description",
 				CloudInit:           true,
+				CloudInitDiskType:   "ide",
 			},
 			getConfigErr:        fmt.Errorf("some error"),
 			expectCallSetConfig: false,