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

refactor: change step tag bsu volumes to new OSC SDK

This commit is contained in:
Marin Salinas 2020-08-21 10:40:14 -05:00
parent c58d6f9b33
commit 7a45e4c8b0
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,12 @@ func waitUntilVmStopped(conn *oapi.Client, vmID string) error {
return <-errCh return <-errCh
} }
func waitUntilOscVmStopped(conn *osc.APIClient, vmID string) error {
errCh := make(chan error, 1)
go waitForState(errCh, "stopped", waitUntilOscVmStateFunc(conn, vmID))
return <-errCh
}
func WaitUntilSnapshotCompleted(conn *oapi.Client, id string) error { func WaitUntilSnapshotCompleted(conn *oapi.Client, id string) error {
errCh := make(chan error, 1) errCh := make(chan error, 1)
go waitForState(errCh, "completed", waitUntilSnapshotStateFunc(conn, id)) go waitForState(errCh, "completed", waitUntilSnapshotStateFunc(conn, id))

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

@ -4,11 +4,11 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/antihax/optional"
"github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/hashicorp/packer/common" "github.com/hashicorp/packer/common"
"github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/helper/multistep"
"github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/packer"
"github.com/outscale/osc-go/oapi"
"github.com/outscale/osc-sdk-go/osc" "github.com/outscale/osc-sdk-go/osc"
) )
@ -18,7 +18,7 @@ type StepStopBSUBackedVm struct {
} }
func (s *StepStopBSUBackedVm) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction { func (s *StepStopBSUBackedVm) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
oapiconn := state.Get("oapi").(*oapi.Client) oscconn := state.Get("osc").(*osc.APIClient)
vm := state.Get("vm").(osc.Vm) vm := state.Get("vm").(osc.Vm)
ui := state.Get("ui").(packer.Ui) ui := state.Get("ui").(packer.Ui)
@ -44,8 +44,10 @@ func (s *StepStopBSUBackedVm) Run(ctx context.Context, state multistep.StateBag)
err := common.Retry(10, 60, 6, func(i uint) (bool, error) { err := common.Retry(10, 60, 6, func(i uint) (bool, error) {
ui.Message(fmt.Sprintf("Stopping vm, attempt %d", i+1)) ui.Message(fmt.Sprintf("Stopping vm, attempt %d", i+1))
_, err = oapiconn.POST_StopVms(oapi.StopVmsRequest{ _, _, err = oscconn.VmApi.StopVms(context.Background(), &osc.StopVmsOpts{
VmIds: []string{vm.VmId}, StopVmsRequest: optional.NewInterface(osc.StopVmsRequest{
VmIds: []string{vm.VmId},
}),
}) })
if err == nil { if err == nil {
@ -79,7 +81,7 @@ func (s *StepStopBSUBackedVm) Run(ctx context.Context, state multistep.StateBag)
// Wait for the vm to actually stop // Wait for the vm to actually stop
ui.Say("Waiting for the vm to stop...") ui.Say("Waiting for the vm to stop...")
err = waitUntilVmStopped(oapiconn, vm.VmId) err = waitUntilOscVmStopped(oscconn, vm.VmId)
if err != nil { if err != nil {
err := fmt.Errorf("Error waiting for vm to stop: %s", err) err := fmt.Errorf("Error waiting for vm to stop: %s", err)