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

fix: remove pointer when gets vm from the state

This commit is contained in:
Marin Salinas 2019-03-05 13:31:28 -06:00 committed by Megan Marsh
parent 9d6c4a8e5b
commit 987b4148e1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/osc/bsu/builder_acc_test.go
View File

@ -46,9 +46,9 @@ const testBuilderAccBasic = `
"builders": [{
"type": "test",
"region": "eu-west-2",
"vm_type": "m3.medium",
"vm_type": "t2.micro",
"source_omi": "ami-46260446",
"ssh_username": "ubuntu",
"ssh_username": "outscale",
"omi_name": "packer-test {{timestamp}}"
}]
}

2
builder/osc/bsu/step_create_omi.go
View File

@ -18,7 +18,7 @@ type stepCreateOMI struct {
func (s *stepCreateOMI) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
config := state.Get("config").(*Config)
oapiconn := state.Get("oapi").(*oapi.Client)
vm := state.Get("vm").(*oapi.Vm)
vm := state.Get("vm").(oapi.Vm)
ui := state.Get("ui").(packer.Ui)
// Create the image

6
builder/osc/common/step_cleanup_volumes.go
View File

@ -25,12 +25,12 @@ func (s *StepCleanupVolumes) Run(_ context.Context, state multistep.StateBag) mu
func (s *StepCleanupVolumes) Cleanup(state multistep.StateBag) {
oapiconn := state.Get("oapi").(*oapi.Client)
vmRaw := state.Get("vm")
var vm *oapi.Vm
var vm oapi.Vm
if vmRaw != nil {
vm = vmRaw.(*oapi.Vm)
vm = vmRaw.(oapi.Vm)
}
ui := state.Get("ui").(packer.Ui)
if vm == nil {
if vm.VmId == "" {
ui.Say("No volumes to clean up, skipping")
return
}

2
builder/osc/common/step_stop_bsu_backed_vm.go
View File

@ -18,7 +18,7 @@ type StepStopBSUBackedVm struct {
func (s *StepStopBSUBackedVm) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
oapiconn := state.Get("oapi").(*oapi.Client)
vm := state.Get("vm").(*oapi.Vm)
vm := state.Get("vm").(oapi.Vm)
ui := state.Get("ui").(packer.Ui)
// Skip when it is a spot vm