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

Hcl2 upgrade fix (#10625) 

* fix random nil pointer dereference I found while debugging hcl2_upgrade issues

* fix hcl2_upgrade command by creating passthroughs for all text template fields
This commit is contained in:
Megan Marsh 2021-02-15 01:40:21 -08:00 committed by GitHub
parent b20dea6aec
commit 80ed988ffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 111 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/amazon/common/step_run_source_instance.go
View File

@ -258,7 +258,7 @@ func (s *StepRunSourceInstance) Run(ctx context.Context, state multistep.StateBa
if resp, e := ec2conn.DescribeInstances(describeInstance); e == nil {
if len(resp.Reservations) > 0 && len(resp.Reservations[0].Instances) > 0 {
instance := resp.Reservations[0].Instances[0]
if instance.StateTransitionReason != nil && instance.StateReason.Message != nil {
if instance.StateTransitionReason != nil && instance.StateReason != nil && instance.StateReason.Message != nil {
ui.Error(fmt.Sprintf("Instance state change details: %s: %s",
*instance.StateTransitionReason, *instance.StateReason.Message))
}

126
command/hcl2_upgrade.go
View File

@ -292,14 +292,9 @@ func transposeTemplatingCalls(s []byte) []byte {
}
str := &bytes.Buffer{}
v := struct {
HTTPIP string
HTTPPort string
}{
HTTPIP: "{{ .HTTPIP }}",
HTTPPort: "{{ .HTTPPort }}",
}
if err := tpl.Execute(str, v); err != nil {
// PASSTHROUGHS is a map of variable-specific golang text template fields
// that should remain in the text template format.
if err := tpl.Execute(str, PASSTHROUGHS); err != nil {
return fallbackReturn(err)
}
@ -453,14 +448,9 @@ func variableTransposeTemplatingCalls(s []byte) (isLocal bool, body []byte) {
}
str := &bytes.Buffer{}
v := struct {
HTTPIP string
HTTPPort string
}{
HTTPIP: "{{ .HTTPIP }}",
HTTPPort: "{{ .HTTPPort }}",
}
if err := tpl.Execute(str, v); err != nil {
// PASSTHROUGHS is a map of variable-specific golang text template fields
// that should remain in the text template format.
if err := tpl.Execute(str, PASSTHROUGHS); err != nil {
return isLocal, fallbackReturn(err)
}
@ -1021,3 +1011,107 @@ func (p *PostProcessorParser) Write(out *bytes.Buffer) {
out.Write(p.out)
}
}
var PASSTHROUGHS = map[string]string{"NVME_Present": "{{ .NVME_Present }}",
"Usb_Present": "{{ .Usb_Present }}",
"Serial_Type": "{{ .Serial_Type }}",
"MapKey": "{{ .MapKey }}",
"HostAlias": "{{ .HostAlias }}",
"BoxName": "{{ .BoxName }}",
"Port": "{{ .Port }}",
"Header": "{{ .Header }}",
"HTTPIP": "{{ .HTTPIP }}",
"Host": "{{ .Host }}",
"PACKER_TEST_TEMP": "{{ .PACKER_TEST_TEMP }}",
"SCSI_diskAdapterType": "{{ .SCSI_diskAdapterType }}",
"VHDBlockSizeBytes": "{{ .VHDBlockSizeBytes }}",
"Parallel_Auto": "{{ .Parallel_Auto }}",
"KTyp": "{{ .KTyp }}",
"MemorySize": "{{ .MemorySize }}",
"APIURL": "{{ .APIURL }}",
"SourcePath": "{{ .SourcePath }}",
"CDROMType": "{{ .CDROMType }}",
"Parallel_Present": "{{ .Parallel_Present }}",
"HTTPPort": "{{ .HTTPPort }}",
"BuildName": "{{ .BuildName }}",
"Network_Device": "{{ .Network_Device }}",
"Flavor": "{{ .Flavor }}",
"Image": "{{ .Image }}",
"Os": "{{ .Os }}",
"Network_Type": "{{ .Network_Type }}",
"SourceOMIName": "{{ .SourceOMIName }}",
"Serial_Yield": "{{ .Serial_Yield }}",
"SourceAMI": "{{ .SourceAMI }}",
"SSHHostPort": "{{ .SSHHostPort }}",
"Vars": "{{ .Vars }}",
"Slice": "{{ .Slice }}",
"Version": "{{ .Version }}",
"Parallel_Bidirectional": "{{ .Parallel_Bidirectional }}",
"Serial_Auto": "{{ .Serial_Auto }}",
"VHDX": "{{ .VHDX }}",
"WinRMPassword": "{{ .WinRMPassword }}",
"DefaultOrganizationID": "{{ .DefaultOrganizationID }}",
"HTTPDir": "{{ .HTTPDir }}",
"SegmentPath": "{{ .SegmentPath }}",
"NewVHDSizeBytes": "{{ .NewVHDSizeBytes }}",
"CTyp": "{{ .CTyp }}",
"VMName": "{{ .VMName }}",
"Serial_Present": "{{ .Serial_Present }}",
"Varname": "{{ .Varname }}",
"DiskNumber": "{{ .DiskNumber }}",
"SecondID": "{{ .SecondID }}",
"Typ": "{{ .Typ }}",
"SourceAMIName": "{{ .SourceAMIName }}",
"ActiveProfile": "{{ .ActiveProfile }}",
"Primitive": "{{ .Primitive }}",
"Elem": "{{ .Elem }}",
"Network_Adapter": "{{ .Network_Adapter }}",
"Minor": "{{ .Minor }}",
"ProjectName": "{{ .ProjectName }}",
"Generation": "{{ .Generation }}",
"User": "{{ .User }}",
"Size": "{{ .Size }}",
"Parallel_Filename": "{{ .Parallel_Filename }}",
"ID": "{{ .ID }}",
"FastpathLen": "{{ .FastpathLen }}",
"Tag": "{{ .Tag }}",
"Serial_Endpoint": "{{ .Serial_Endpoint }}",
"GuestOS": "{{ .GuestOS }}",
"Major": "{{ .Major }}",
"Serial_Filename": "{{ .Serial_Filename }}",
"Name": "{{ .Name }}",
"SourceOMI": "{{ .SourceOMI }}",
"SCSI_Present": "{{ .SCSI_Present }}",
"CpuCount": "{{ .CpuCount }}",
"DefaultProjectID": "{{ .DefaultProjectID }}",
"CDROMType_PrimarySecondary": "{{ .CDROMType_PrimarySecondary }}",
"Arch": "{{ .Arch }}",
"ImageFile": "{{ .ImageFile }}",
"SATA_Present": "{{ .SATA_Present }}",
"Serial_Host": "{{ .Serial_Host }}",
"BuildRegion": "{{ .BuildRegion }}",
"Id": "{{ .Id }}",
"SyncedFolder": "{{ .SyncedFolder }}",
"Network_Name": "{{ .Network_Name }}",
"AccountID": "{{ .AccountID }}",
"OPTION": "{{ .OPTION }}",
"Type": "{{ .Type }}",
"CustomVagrantfile": "{{ .CustomVagrantfile }}",
"SendTelemetry": "{{ .SendTelemetry }}",
"DiskType": "{{ .DiskType }}",
"Password": "{{ .Password }}",
"HardDrivePath": "{{ .HardDrivePath }}",
"ISOPath": "{{ .ISOPath }}",
"Insecure": "{{ .Insecure }}",
"Region": "{{ .Region }}",
"SecretKey": "{{ .SecretKey }}",
"DefaultRegion": "{{ .DefaultRegion }}",
"MemoryStartupBytes": "{{ .MemoryStartupBytes }}",
"SwitchName": "{{ .SwitchName }}",
"Path": "{{ .Path }}",
"Username": "{{ .Username }}",
"OutputDir": "{{ .OutputDir }}",
"DiskName": "{{ .DiskName }}",
"ProviderVagrantfile": "{{ .ProviderVagrantfile }}",
"Sound_Present": "{{ .Sound_Present }}",
}