From d0737dcd17f23ebc535eb2e82ab700b8be15e393 Mon Sep 17 00:00:00 2001 From: Sylvia Moss Date: Wed, 17 Mar 2021 14:26:38 +0100 Subject: [PATCH] skip DownloadPathKey and ShouldUploadISO on mapstructure-to-hcl2 (#10772) --- builder/proxmox/common/config.go | 4 ++-- builder/proxmox/common/config.hcl2spec.go | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go index 417f120b0..33810c57d 100644 --- a/builder/proxmox/common/config.go +++ b/builder/proxmox/common/config.go @@ -73,8 +73,8 @@ type additionalISOsConfig struct { ISOFile string `mapstructure:"iso_file"` ISOStoragePool string `mapstructure:"iso_storage_pool"` Unmount bool `mapstructure:"unmount"` - ShouldUploadISO bool - DownloadPathKey string + ShouldUploadISO bool `mapstructure-to-hcl2:",skip"` + DownloadPathKey string `mapstructure-to-hcl2:",skip"` } type nicConfig struct { diff --git a/builder/proxmox/common/config.hcl2spec.go b/builder/proxmox/common/config.hcl2spec.go index ad5aa1b6a..96a5e09e8 100644 --- a/builder/proxmox/common/config.hcl2spec.go +++ b/builder/proxmox/common/config.hcl2spec.go @@ -226,8 +226,6 @@ type FlatadditionalISOsConfig struct { 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"` - ShouldUploadISO *bool `cty:"should_upload_iso" hcl:"should_upload_iso"` - DownloadPathKey *string `cty:"download_path_key" hcl:"download_path_key"` } // FlatMapstructure returns a new FlatadditionalISOsConfig. @@ -251,8 +249,6 @@ func (*FlatadditionalISOsConfig) HCL2Spec() map[string]hcldec.Spec { "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}, - "should_upload_iso": &hcldec.AttrSpec{Name: "should_upload_iso", Type: cty.Bool, Required: false}, - "download_path_key": &hcldec.AttrSpec{Name: "download_path_key", Type: cty.String, Required: false}, } return s }