proxmox: move iso.storageConfig to common.storageConfig

builder/proxmox/clone/config.hcl2spec.go

@@ -21,6 +21,7 @@ type FlatConfig struct {
 	HTTPPortMin               *int                        `mapstructure:"http_port_min" cty:"http_port_min" hcl:"http_port_min"`
 	HTTPPortMax               *int                        `mapstructure:"http_port_max" cty:"http_port_max" hcl:"http_port_max"`
 	HTTPAddress               *string                     `mapstructure:"http_bind_address" cty:"http_bind_address" hcl:"http_bind_address"`
+	HTTPInterface             *string                     `mapstructure:"http_interface" undocumented:"true" cty:"http_interface" hcl:"http_interface"`
 	BootGroupInterval         *string                     `mapstructure:"boot_keygroup_interval" cty:"boot_keygroup_interval" hcl:"boot_keygroup_interval"`
 	BootWait                  *string                     `mapstructure:"boot_wait" cty:"boot_wait" hcl:"boot_wait"`
 	BootCommand               []string                    `mapstructure:"boot_command" cty:"boot_command" hcl:"boot_command"`
@@ -96,14 +97,8 @@ type FlatConfig struct {
 	TemplateDescription       *string                     `mapstructure:"template_description" cty:"template_description" hcl:"template_description"`
 	CloudInit                 *bool                       `mapstructure:"cloud_init" cty:"cloud_init" hcl:"cloud_init"`
 	CloudInitStoragePool      *string                     `mapstructure:"cloud_init_storage_pool" cty:"cloud_init_storage_pool" hcl:"cloud_init_storage_pool"`
-	Data                      interface{}              `cty:"data" hcl:"data"`
+	AdditionalISOFiles        []proxmox.FlatstorageConfig `mapstructure:"additional_iso_files" cty:"additional_iso_files" hcl:"additional_iso_files"`
-	Funcs                     map[string]interface{}   `cty:"funcs" hcl:"funcs"`
+	VMInterface               *string                     `mapstructure:"vm_interface" cty:"vm_interface" hcl:"vm_interface"`
-	UserVariables             map[string]string        `cty:"user_variables" hcl:"user_variables"`
-	SensitiveVariables        []string                 `cty:"sensitive_variables" hcl:"sensitive_variables"`
-	EnableEnv                 *bool                    `cty:"enable_env" hcl:"enable_env"`
-	BuildName                 *string                  `cty:"build_name" hcl:"build_name"`
-	BuildType                 *string                  `cty:"build_type" hcl:"build_type"`
-	TemplatePath              *string                  `cty:"template_path" hcl:"template_path"`
 	CloneVM                   *string                     `mapstructure:"clone_vm" cty:"clone_vm" hcl:"clone_vm"`
 	FullClone                 *bool                       `mapstructure:"full_clone" cty:"full_clone" hcl:"full_clone"`
 }
@@ -131,6 +126,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"http_port_min":                &hcldec.AttrSpec{Name: "http_port_min", Type: cty.Number, Required: false},
 		"http_port_max":                &hcldec.AttrSpec{Name: "http_port_max", Type: cty.Number, Required: false},
 		"http_bind_address":            &hcldec.AttrSpec{Name: "http_bind_address", Type: cty.String, Required: false},
+		"http_interface":               &hcldec.AttrSpec{Name: "http_interface", Type: cty.String, Required: false},
 		"boot_keygroup_interval":       &hcldec.AttrSpec{Name: "boot_keygroup_interval", Type: cty.String, Required: false},
 		"boot_wait":                    &hcldec.AttrSpec{Name: "boot_wait", Type: cty.String, Required: false},
 		"boot_command":                 &hcldec.AttrSpec{Name: "boot_command", Type: cty.List(cty.String), Required: false},
@@ -206,14 +202,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"template_description":         &hcldec.AttrSpec{Name: "template_description", Type: cty.String, Required: false},
 		"cloud_init":                   &hcldec.AttrSpec{Name: "cloud_init", Type: cty.Bool, Required: false},
 		"cloud_init_storage_pool":      &hcldec.AttrSpec{Name: "cloud_init_storage_pool", Type: cty.String, Required: false},
-		"data":                         &hcldec.AttrSpec{Name: "data", Type: cty.Bool, Required: false}, /* TODO(azr): could not find type */
+		"additional_iso_files":         &hcldec.BlockListSpec{TypeName: "additional_iso_files", Nested: hcldec.ObjectSpec((*proxmox.FlatstorageConfig)(nil).HCL2Spec())},
-		"funcs":                        &hcldec.AttrSpec{Name: "funcs", Type: cty.Map(cty.String), Required: false},
+		"vm_interface":                 &hcldec.AttrSpec{Name: "vm_interface", Type: cty.String, Required: false},
-		"user_variables":               &hcldec.AttrSpec{Name: "user_variables", Type: cty.Map(cty.String), Required: false},
-		"sensitive_variables":          &hcldec.AttrSpec{Name: "sensitive_variables", Type: cty.List(cty.String), Required: false},
-		"enable_env":                   &hcldec.AttrSpec{Name: "enable_env", Type: cty.Bool, Required: false},
-		"build_name":                   &hcldec.AttrSpec{Name: "build_name", Type: cty.String, Required: false},
-		"build_type":                   &hcldec.AttrSpec{Name: "build_type", Type: cty.String, Required: false},
-		"template_path":                &hcldec.AttrSpec{Name: "template_path", Type: cty.String, Required: false},
 		"clone_vm":                     &hcldec.AttrSpec{Name: "clone_vm", Type: cty.String, Required: false},
 		"full_clone":                   &hcldec.AttrSpec{Name: "full_clone", Type: cty.Bool, Required: false},
 	}

builder/proxmox/common/config.go

@@ -1,4 +1,4 @@
-//go:generate mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig
+//go:generate mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig,storageConfig
 
 package proxmox
 
@@ -66,6 +66,16 @@ type Config struct {
 	Ctx interpolate.Context `mapstructure-to-hcl2:"skip"`
 }
 
+type storageConfig struct {
+	common.ISOConfig `mapstructure:",squash"`
+	Device           string `mapstructure:"device"`
+	ISOFile          string `mapstructure:"iso_file"`
+	ISOStoragePool   string `mapstructure:"iso_storage_pool"`
+	Unmount          bool   `mapstructure:"unmount"`
+	ShouldUploadISO  bool
+	DownloadPathKey  string
+}
+
 type nicConfig struct {
 	Model        string `mapstructure:"model"`
 	PacketQueues int    `mapstructure:"packet_queues"`

builder/proxmox/common/config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig"; DO NOT EDIT.
+// Code generated by "mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig,storageConfig"; DO NOT EDIT.
 package proxmox
 
 import (
@@ -20,6 +20,7 @@ type FlatConfig struct {
 	HTTPPortMin               *int                `mapstructure:"http_port_min" cty:"http_port_min" hcl:"http_port_min"`
 	HTTPPortMax               *int                `mapstructure:"http_port_max" cty:"http_port_max" hcl:"http_port_max"`
 	HTTPAddress               *string             `mapstructure:"http_bind_address" cty:"http_bind_address" hcl:"http_bind_address"`
+	HTTPInterface             *string             `mapstructure:"http_interface" undocumented:"true" cty:"http_interface" hcl:"http_interface"`
 	BootGroupInterval         *string             `mapstructure:"boot_keygroup_interval" cty:"boot_keygroup_interval" hcl:"boot_keygroup_interval"`
 	BootWait                  *string             `mapstructure:"boot_wait" cty:"boot_wait" hcl:"boot_wait"`
 	BootCommand               []string            `mapstructure:"boot_command" cty:"boot_command" hcl:"boot_command"`
@@ -95,14 +96,8 @@ type FlatConfig struct {
 	TemplateDescription       *string             `mapstructure:"template_description" cty:"template_description" hcl:"template_description"`
 	CloudInit                 *bool               `mapstructure:"cloud_init" cty:"cloud_init" hcl:"cloud_init"`
 	CloudInitStoragePool      *string             `mapstructure:"cloud_init_storage_pool" cty:"cloud_init_storage_pool" hcl:"cloud_init_storage_pool"`
-	Data                      interface{}            `cty:"data" hcl:"data"`
+	AdditionalISOFiles        []FlatstorageConfig `mapstructure:"additional_iso_files" cty:"additional_iso_files" hcl:"additional_iso_files"`
-	Funcs                     map[string]interface{} `cty:"funcs" hcl:"funcs"`
+	VMInterface               *string             `mapstructure:"vm_interface" cty:"vm_interface" hcl:"vm_interface"`
-	UserVariables             map[string]string      `cty:"user_variables" hcl:"user_variables"`
-	SensitiveVariables        []string               `cty:"sensitive_variables" hcl:"sensitive_variables"`
-	EnableEnv                 *bool                  `cty:"enable_env" hcl:"enable_env"`
-	BuildName                 *string                `cty:"build_name" hcl:"build_name"`
-	BuildType                 *string                `cty:"build_type" hcl:"build_type"`
-	TemplatePath              *string                `cty:"template_path" hcl:"template_path"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -128,6 +123,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"http_port_min":                &hcldec.AttrSpec{Name: "http_port_min", Type: cty.Number, Required: false},
 		"http_port_max":                &hcldec.AttrSpec{Name: "http_port_max", Type: cty.Number, Required: false},
 		"http_bind_address":            &hcldec.AttrSpec{Name: "http_bind_address", Type: cty.String, Required: false},
+		"http_interface":               &hcldec.AttrSpec{Name: "http_interface", Type: cty.String, Required: false},
 		"boot_keygroup_interval":       &hcldec.AttrSpec{Name: "boot_keygroup_interval", Type: cty.String, Required: false},
 		"boot_wait":                    &hcldec.AttrSpec{Name: "boot_wait", Type: cty.String, Required: false},
 		"boot_command":                 &hcldec.AttrSpec{Name: "boot_command", Type: cty.List(cty.String), Required: false},
@@ -203,14 +199,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"template_description":         &hcldec.AttrSpec{Name: "template_description", Type: cty.String, Required: false},
 		"cloud_init":                   &hcldec.AttrSpec{Name: "cloud_init", Type: cty.Bool, Required: false},
 		"cloud_init_storage_pool":      &hcldec.AttrSpec{Name: "cloud_init_storage_pool", Type: cty.String, Required: false},
-		"data":                         &hcldec.AttrSpec{Name: "data", Type: cty.Bool, Required: false}, /* TODO(azr): could not find type */
+		"additional_iso_files":         &hcldec.BlockListSpec{TypeName: "additional_iso_files", Nested: hcldec.ObjectSpec((*FlatstorageConfig)(nil).HCL2Spec())},
-		"funcs":                        &hcldec.AttrSpec{Name: "funcs", Type: cty.Map(cty.String), Required: false},
+		"vm_interface":                 &hcldec.AttrSpec{Name: "vm_interface", Type: cty.String, Required: false},
-		"user_variables":               &hcldec.AttrSpec{Name: "user_variables", Type: cty.Map(cty.String), Required: false},
-		"sensitive_variables":          &hcldec.AttrSpec{Name: "sensitive_variables", Type: cty.List(cty.String), Required: false},
-		"enable_env":                   &hcldec.AttrSpec{Name: "enable_env", Type: cty.Bool, Required: false},
-		"build_name":                   &hcldec.AttrSpec{Name: "build_name", Type: cty.String, Required: false},
-		"build_type":                   &hcldec.AttrSpec{Name: "build_type", Type: cty.String, Required: false},
-		"template_path":                &hcldec.AttrSpec{Name: "template_path", Type: cty.String, Required: false},
 	}
 	return s
 }
@@ -224,6 +214,7 @@ type FlatdiskConfig struct {
 	Size            *string `mapstructure:"disk_size" cty:"disk_size" hcl:"disk_size"`
 	CacheMode       *string `mapstructure:"cache_mode" cty:"cache_mode" hcl:"cache_mode"`
 	DiskFormat      *string `mapstructure:"format" cty:"format" hcl:"format"`
+	IOThread        *bool   `mapstructure:"io_thread" cty:"io_thread" hcl:"io_thread"`
 }
 
 // FlatMapstructure returns a new FlatdiskConfig.
@@ -244,6 +235,7 @@ func (*FlatdiskConfig) HCL2Spec() map[string]hcldec.Spec {
 		"disk_size":         &hcldec.AttrSpec{Name: "disk_size", Type: cty.String, Required: false},
 		"cache_mode":        &hcldec.AttrSpec{Name: "cache_mode", Type: cty.String, Required: false},
 		"format":            &hcldec.AttrSpec{Name: "format", Type: cty.String, Required: false},
+		"io_thread":         &hcldec.AttrSpec{Name: "io_thread", Type: cty.Bool, Required: false},
 	}
 	return s
 }
@@ -281,6 +273,45 @@ func (*FlatnicConfig) HCL2Spec() map[string]hcldec.Spec {
 	return s
 }
 
+// FlatstorageConfig is an auto-generated flat version of storageConfig.
+// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
+type FlatstorageConfig struct {
+	ISOChecksum     *string  `mapstructure:"iso_checksum" required:"true" cty:"iso_checksum" hcl:"iso_checksum"`
+	RawSingleISOUrl *string  `mapstructure:"iso_url" required:"true" cty:"iso_url" hcl:"iso_url"`
+	ISOUrls         []string `mapstructure:"iso_urls" cty:"iso_urls" hcl:"iso_urls"`
+	TargetPath      *string  `mapstructure:"iso_target_path" cty:"iso_target_path" hcl:"iso_target_path"`
+	TargetExtension *string  `mapstructure:"iso_target_extension" cty:"iso_target_extension" hcl:"iso_target_extension"`
+	Device          *string  `mapstructure:"device" cty:"device" hcl:"device"`
+	ISOFile         *string  `mapstructure:"iso_file" cty:"iso_file" hcl:"iso_file"`
+	ISOStoragePool  *string  `mapstructure:"iso_storage_pool" cty:"iso_storage_pool" hcl:"iso_storage_pool"`
+	Unmount         *bool    `mapstructure:"unmount" cty:"unmount" hcl:"unmount"`
+}
+
+// FlatMapstructure returns a new FlatstorageConfig.
+// FlatstorageConfig is an auto-generated flat version of storageConfig.
+// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
+func (*storageConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
+	return new(FlatstorageConfig)
+}
+
+// HCL2Spec returns the hcl spec of a storageConfig.
+// This spec is used by HCL to read the fields of storageConfig.
+// The decoded values from this spec will then be applied to a FlatstorageConfig.
+func (*FlatstorageConfig) HCL2Spec() map[string]hcldec.Spec {
+	s := map[string]hcldec.Spec{
+		"iso_checksum":         &hcldec.AttrSpec{Name: "iso_checksum", Type: cty.String, Required: false},
+		"iso_url":              &hcldec.AttrSpec{Name: "iso_url", Type: cty.String, Required: false},
+		"iso_urls":             &hcldec.AttrSpec{Name: "iso_urls", Type: cty.List(cty.String), Required: false},
+		"iso_target_path":      &hcldec.AttrSpec{Name: "iso_target_path", Type: cty.String, Required: false},
+		"iso_target_extension": &hcldec.AttrSpec{Name: "iso_target_extension", Type: cty.String, Required: false},
+		"device":               &hcldec.AttrSpec{Name: "device", Type: cty.String, Required: false},
+		"iso_file":             &hcldec.AttrSpec{Name: "iso_file", Type: cty.String, Required: false},
+		"iso_storage_pool":     &hcldec.AttrSpec{Name: "iso_storage_pool", Type: cty.String, Required: false},
+		"unmount":              &hcldec.AttrSpec{Name: "unmount", Type: cty.Bool, Required: false},
+	}
+	return s
+}
+
 // FlatvgaConfig is an auto-generated flat version of vgaConfig.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatvgaConfig struct {

builder/proxmox/iso/builder.go

@@ -48,8 +48,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Checksum:    b.config.AdditionalISOFiles[idx].ISOChecksum,
 			Description: "additional ISO",
 			Extension:   b.config.AdditionalISOFiles[idx].TargetExtension,
-			ResultKey:   b.config.AdditionalISOFiles[idx].downloadPathKey,
+			ResultKey:   b.config.AdditionalISOFiles[idx].DownloadPathKey,
-			TargetPath:  b.config.AdditionalISOFiles[idx].downloadPathKey,
+			TargetPath:  b.config.AdditionalISOFiles[idx].DownloadPathKey,
 			Url:         b.config.AdditionalISOFiles[idx].ISOUrls,
 		})
 	}

builder/proxmox/iso/config.go

@@ -1,4 +1,4 @@
-//go:generate mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig,storageConfig
+//go:generate mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig
 
 package proxmoxiso
 
@@ -19,22 +19,11 @@ type Config struct {
 
 	common.ISOConfig `mapstructure:",squash"`
 	ISOFile          string `mapstructure:"iso_file"`
-	AdditionalISOFiles []storageConfig `mapstructure:"additional_iso_files"`
 	ISOStoragePool   string `mapstructure:"iso_storage_pool"`
 	UnmountISO       bool   `mapstructure:"unmount_iso"`
 	shouldUploadISO  bool
 }
 
-type storageConfig struct {
-	common.ISOConfig `mapstructure:",squash"`
-	Device           string `mapstructure:"device"`
-	ISOFile          string `mapstructure:"iso_file"`
-	ISOStoragePool   string `mapstructure:"iso_storage_pool"`
-	Unmount          bool   `mapstructure:"unmount"`
-	shouldUploadISO  bool
-	downloadPathKey  string
-}
-
 func (c *Config) Prepare(raws ...interface{}) ([]string, []string, error) {
 	var errs *packer.MultiError
 	_, warnings, merrs := c.Config.Prepare(c, raws...)
@@ -68,13 +57,13 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, []string, error) {
 		// (possibly to a local file) to an ISO file that will be downloaded and
 		// then uploaded to Proxmox.
 		if c.AdditionalISOFiles[idx].ISOFile != "" {
-			c.AdditionalISOFiles[idx].shouldUploadISO = false
+			c.AdditionalISOFiles[idx].ShouldUploadISO = false
 		} else {
-			c.AdditionalISOFiles[idx].downloadPathKey = "downloaded_additional_iso_path_" + strconv.Itoa(idx)
+			c.AdditionalISOFiles[idx].DownloadPathKey = "downloaded_additional_iso_path_" + strconv.Itoa(idx)
 			isoWarnings, isoErrors := c.AdditionalISOFiles[idx].ISOConfig.Prepare(&c.Ctx)
 			errs = packer.MultiErrorAppend(errs, isoErrors...)
 			warnings = append(warnings, isoWarnings...)
-			c.AdditionalISOFiles[idx].shouldUploadISO = true
+			c.AdditionalISOFiles[idx].ShouldUploadISO = true
 		}
 		if c.AdditionalISOFiles[idx].Device == "" {
 			log.Printf("AdditionalISOFile %d Device not set, using default 'ide3'", idx)

builder/proxmox/iso/config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig,storageConfig"; DO NOT EDIT.
+// Code generated by "mapstructure-to-hcl2 -type Config,nicConfig,diskConfig,vgaConfig"; DO NOT EDIT.
 package proxmoxiso
 
 import (
@@ -21,6 +21,7 @@ type FlatConfig struct {
 	HTTPPortMin               *int                        `mapstructure:"http_port_min" cty:"http_port_min" hcl:"http_port_min"`
 	HTTPPortMax               *int                        `mapstructure:"http_port_max" cty:"http_port_max" hcl:"http_port_max"`
 	HTTPAddress               *string                     `mapstructure:"http_bind_address" cty:"http_bind_address" hcl:"http_bind_address"`
+	HTTPInterface             *string                     `mapstructure:"http_interface" undocumented:"true" cty:"http_interface" hcl:"http_interface"`
 	BootGroupInterval         *string                     `mapstructure:"boot_keygroup_interval" cty:"boot_keygroup_interval" hcl:"boot_keygroup_interval"`
 	BootWait                  *string                     `mapstructure:"boot_wait" cty:"boot_wait" hcl:"boot_wait"`
 	BootCommand               []string                    `mapstructure:"boot_command" cty:"boot_command" hcl:"boot_command"`
@@ -96,21 +97,14 @@ type FlatConfig struct {
 	TemplateDescription       *string                     `mapstructure:"template_description" cty:"template_description" hcl:"template_description"`
 	CloudInit                 *bool                       `mapstructure:"cloud_init" cty:"cloud_init" hcl:"cloud_init"`
 	CloudInitStoragePool      *string                     `mapstructure:"cloud_init_storage_pool" cty:"cloud_init_storage_pool" hcl:"cloud_init_storage_pool"`
-	Data                      interface{}              `cty:"data" hcl:"data"`
+	AdditionalISOFiles        []proxmox.FlatstorageConfig `mapstructure:"additional_iso_files" cty:"additional_iso_files" hcl:"additional_iso_files"`
-	Funcs                     map[string]interface{}   `cty:"funcs" hcl:"funcs"`
+	VMInterface               *string                     `mapstructure:"vm_interface" cty:"vm_interface" hcl:"vm_interface"`
-	UserVariables             map[string]string        `cty:"user_variables" hcl:"user_variables"`
-	SensitiveVariables        []string                 `cty:"sensitive_variables" hcl:"sensitive_variables"`
-	EnableEnv                 *bool                    `cty:"enable_env" hcl:"enable_env"`
-	BuildName                 *string                  `cty:"build_name" hcl:"build_name"`
-	BuildType                 *string                  `cty:"build_type" hcl:"build_type"`
-	TemplatePath              *string                  `cty:"template_path" hcl:"template_path"`
 	ISOChecksum               *string                     `mapstructure:"iso_checksum" required:"true" cty:"iso_checksum" hcl:"iso_checksum"`
 	RawSingleISOUrl           *string                     `mapstructure:"iso_url" required:"true" cty:"iso_url" hcl:"iso_url"`
 	ISOUrls                   []string                    `mapstructure:"iso_urls" cty:"iso_urls" hcl:"iso_urls"`
 	TargetPath                *string                     `mapstructure:"iso_target_path" cty:"iso_target_path" hcl:"iso_target_path"`
 	TargetExtension           *string                     `mapstructure:"iso_target_extension" cty:"iso_target_extension" hcl:"iso_target_extension"`
 	ISOFile                   *string                     `mapstructure:"iso_file" cty:"iso_file" hcl:"iso_file"`
-	AdditionalISOFiles        []FlatstorageConfig      `mapstructure:"additional_iso_files" cty:"additional_iso_files" hcl:"additional_iso_files"`
 	ISOStoragePool            *string                     `mapstructure:"iso_storage_pool" cty:"iso_storage_pool" hcl:"iso_storage_pool"`
 	UnmountISO                *bool                       `mapstructure:"unmount_iso" cty:"unmount_iso" hcl:"unmount_iso"`
 }
@@ -138,6 +132,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"http_port_min":                &hcldec.AttrSpec{Name: "http_port_min", Type: cty.Number, Required: false},
 		"http_port_max":                &hcldec.AttrSpec{Name: "http_port_max", Type: cty.Number, Required: false},
 		"http_bind_address":            &hcldec.AttrSpec{Name: "http_bind_address", Type: cty.String, Required: false},
+		"http_interface":               &hcldec.AttrSpec{Name: "http_interface", Type: cty.String, Required: false},
 		"boot_keygroup_interval":       &hcldec.AttrSpec{Name: "boot_keygroup_interval", Type: cty.String, Required: false},
 		"boot_wait":                    &hcldec.AttrSpec{Name: "boot_wait", Type: cty.String, Required: false},
 		"boot_command":                 &hcldec.AttrSpec{Name: "boot_command", Type: cty.List(cty.String), Required: false},
@@ -213,62 +208,16 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"template_description":         &hcldec.AttrSpec{Name: "template_description", Type: cty.String, Required: false},
 		"cloud_init":                   &hcldec.AttrSpec{Name: "cloud_init", Type: cty.Bool, Required: false},
 		"cloud_init_storage_pool":      &hcldec.AttrSpec{Name: "cloud_init_storage_pool", Type: cty.String, Required: false},
-		"data":                         &hcldec.AttrSpec{Name: "data", Type: cty.Bool, Required: false}, /* TODO(azr): could not find type */
+		"additional_iso_files":         &hcldec.BlockListSpec{TypeName: "additional_iso_files", Nested: hcldec.ObjectSpec((*proxmox.FlatstorageConfig)(nil).HCL2Spec())},
-		"funcs":                        &hcldec.AttrSpec{Name: "funcs", Type: cty.Map(cty.String), Required: false},
+		"vm_interface":                 &hcldec.AttrSpec{Name: "vm_interface", Type: cty.String, Required: false},
-		"user_variables":               &hcldec.AttrSpec{Name: "user_variables", Type: cty.Map(cty.String), Required: false},
-		"sensitive_variables":          &hcldec.AttrSpec{Name: "sensitive_variables", Type: cty.List(cty.String), Required: false},
-		"enable_env":                   &hcldec.AttrSpec{Name: "enable_env", Type: cty.Bool, Required: false},
-		"build_name":                   &hcldec.AttrSpec{Name: "build_name", Type: cty.String, Required: false},
-		"build_type":                   &hcldec.AttrSpec{Name: "build_type", Type: cty.String, Required: false},
-		"template_path":                &hcldec.AttrSpec{Name: "template_path", Type: cty.String, Required: false},
 		"iso_checksum":                 &hcldec.AttrSpec{Name: "iso_checksum", Type: cty.String, Required: false},
 		"iso_url":                      &hcldec.AttrSpec{Name: "iso_url", Type: cty.String, Required: false},
 		"iso_urls":                     &hcldec.AttrSpec{Name: "iso_urls", Type: cty.List(cty.String), Required: false},
 		"iso_target_path":              &hcldec.AttrSpec{Name: "iso_target_path", Type: cty.String, Required: false},
 		"iso_target_extension":         &hcldec.AttrSpec{Name: "iso_target_extension", Type: cty.String, Required: false},
 		"iso_file":                     &hcldec.AttrSpec{Name: "iso_file", Type: cty.String, Required: false},
-		"additional_iso_files":         &hcldec.BlockListSpec{TypeName: "additional_iso_files", Nested: hcldec.ObjectSpec((*FlatstorageConfig)(nil).HCL2Spec())},
 		"iso_storage_pool":             &hcldec.AttrSpec{Name: "iso_storage_pool", Type: cty.String, Required: false},
 		"unmount_iso":                  &hcldec.AttrSpec{Name: "unmount_iso", Type: cty.Bool, Required: false},
 	}
 	return s
 }
-
-// FlatstorageConfig is an auto-generated flat version of storageConfig.
-// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
-type FlatstorageConfig struct {
-	ISOChecksum     *string  `mapstructure:"iso_checksum" required:"true" cty:"iso_checksum" hcl:"iso_checksum"`
-	RawSingleISOUrl *string  `mapstructure:"iso_url" required:"true" cty:"iso_url" hcl:"iso_url"`
-	ISOUrls         []string `mapstructure:"iso_urls" cty:"iso_urls" hcl:"iso_urls"`
-	TargetPath      *string  `mapstructure:"iso_target_path" cty:"iso_target_path" hcl:"iso_target_path"`
-	TargetExtension *string  `mapstructure:"iso_target_extension" cty:"iso_target_extension" hcl:"iso_target_extension"`
-	Device          *string  `mapstructure:"device" cty:"device" hcl:"device"`
-	ISOFile         *string  `mapstructure:"iso_file" cty:"iso_file" hcl:"iso_file"`
-	ISOStoragePool  *string  `mapstructure:"iso_storage_pool" cty:"iso_storage_pool" hcl:"iso_storage_pool"`
-	Unmount         *bool    `mapstructure:"unmount" cty:"unmount" hcl:"unmount"`
-}
-
-// FlatMapstructure returns a new FlatstorageConfig.
-// FlatstorageConfig is an auto-generated flat version of storageConfig.
-// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
-func (*storageConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
-	return new(FlatstorageConfig)
-}
-
-// HCL2Spec returns the hcl spec of a storageConfig.
-// This spec is used by HCL to read the fields of storageConfig.
-// The decoded values from this spec will then be applied to a FlatstorageConfig.
-func (*FlatstorageConfig) HCL2Spec() map[string]hcldec.Spec {
-	s := map[string]hcldec.Spec{
-		"iso_checksum":         &hcldec.AttrSpec{Name: "iso_checksum", Type: cty.String, Required: false},
-		"iso_url":              &hcldec.AttrSpec{Name: "iso_url", Type: cty.String, Required: false},
-		"iso_urls":             &hcldec.AttrSpec{Name: "iso_urls", Type: cty.List(cty.String), Required: false},
-		"iso_target_path":      &hcldec.AttrSpec{Name: "iso_target_path", Type: cty.String, Required: false},
-		"iso_target_extension": &hcldec.AttrSpec{Name: "iso_target_extension", Type: cty.String, Required: false},
-		"device":               &hcldec.AttrSpec{Name: "device", Type: cty.String, Required: false},
-		"iso_file":             &hcldec.AttrSpec{Name: "iso_file", Type: cty.String, Required: false},
-		"iso_storage_pool":     &hcldec.AttrSpec{Name: "iso_storage_pool", Type: cty.String, Required: false},
-		"unmount":              &hcldec.AttrSpec{Name: "unmount", Type: cty.Bool, Required: false},
-	}
-	return s
-}

builder/proxmox/iso/step_upload_additional_isos.go

@@ -23,12 +23,12 @@ func (s *stepUploadAdditionalISOs) Run(ctx context.Context, state multistep.Stat
 	c := state.Get("iso-config").(*Config)
 
 	for idx := range c.AdditionalISOFiles {
-		if !c.AdditionalISOFiles[idx].shouldUploadISO {
+		if !c.AdditionalISOFiles[idx].ShouldUploadISO {
 			state.Put("additional_iso_files", c.AdditionalISOFiles)
 			continue
 		}
 
-		p := state.Get(c.AdditionalISOFiles[idx].downloadPathKey).(string)
+		p := state.Get(c.AdditionalISOFiles[idx].DownloadPathKey).(string)
 		if p == "" {
 			err := fmt.Errorf("Path to downloaded ISO was empty")
 			state.Put("erroe", err)