iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skip DownloadPathKey and ShouldUploadISO on mapstructure-to-hcl2 (#10772)

This commit is contained in:
Sylvia Moss 2021-03-17 14:26:38 +01:00 committed by GitHub
parent 0b5f8901cc
commit d0737dcd17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/proxmox/common/config.go
View File

@ -73,8 +73,8 @@ type additionalISOsConfig struct {
ISOFile string `mapstructure:"iso_file"` ISOFile string `mapstructure:"iso_file"`
ISOStoragePool string `mapstructure:"iso_storage_pool"` ISOStoragePool string `mapstructure:"iso_storage_pool"`
Unmount bool `mapstructure:"unmount"` Unmount bool `mapstructure:"unmount"`
ShouldUploadISO bool ShouldUploadISO bool `mapstructure-to-hcl2:",skip"`
DownloadPathKey string DownloadPathKey string `mapstructure-to-hcl2:",skip"`
} }
type nicConfig struct { type nicConfig struct {

4
builder/proxmox/common/config.hcl2spec.go
View File

@ -226,8 +226,6 @@ type FlatadditionalISOsConfig struct {
ISOFile *string `mapstructure:"iso_file" cty:"iso_file" hcl:"iso_file"` 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"` ISOStoragePool *string `mapstructure:"iso_storage_pool" cty:"iso_storage_pool" hcl:"iso_storage_pool"`
Unmount *bool `mapstructure:"unmount" cty:"unmount" hcl:"unmount"` 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. // 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_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}, "iso_storage_pool": &hcldec.AttrSpec{Name: "iso_storage_pool", Type: cty.String, Required: false},
"unmount": &hcldec.AttrSpec{Name: "unmount", Type: cty.Bool, 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 return s
} }