Skip to content

Commit

Permalink
upgrade sdk go from v1 to v2
Browse files Browse the repository at this point in the history 
Signed-off-by: outscale_hmi <hanen.mizouni@outscale.com>
  • Loading branch information
@outscale-hmi
outscale-hmi committed Oct 5, 2022
1 parent 6405925 commit e44c1c8
Show file tree
Hide file tree
Showing 42 changed files with 911 additions and 1,666 deletions.
6 changes: 3 additions & 3 deletions builder/osc/bsu/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
"github.com/hashicorp/packer-plugin-sdk/template/config"
"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
"github.com/outscale/osc-sdk-go/osc"
oscgo "github.com/outscale/osc-sdk-go/v2"
osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
)

Expand Down Expand Up @@ -86,7 +86,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
}

func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook) (packersdk.Artifact, error) {
var oscConn *osc.APIClient
var oscConn *oscgo.APIClient
var err error
if oscConn, err = b.config.NewOSCClient(); err != nil {
return nil, err
Expand Down Expand Up @@ -164,7 +164,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
&communicator.StepConnect{
Config: &b.config.RunConfig.Comm,
Host: osccommon.OscSSHHost(
oscConn.VmApi,
oscConn,
b.config.SSHInterface),
SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
},
Expand Down
78 changes: 35 additions & 43 deletions builder/osc/bsu/step_create_omi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,98 +5,91 @@ import (
"fmt"
"log"

"github.com/antihax/optional"
"github.com/hashicorp/packer-plugin-sdk/multistep"
packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
"github.com/outscale/osc-sdk-go/osc"
oscgo "github.com/outscale/osc-sdk-go/v2"
osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
)

type stepCreateOMI struct {
image *osc.Image
image *oscgo.Image
RawRegion string
}

func (s *stepCreateOMI) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
config := state.Get("config").(*Config)
oscconn := state.Get("osc").(*osc.APIClient)
vm := state.Get("vm").(osc.Vm)
oscconn := state.Get("osc").(*oscgo.APIClient)
vm := state.Get("vm").(oscgo.Vm)
ui := state.Get("ui").(packersdk.Ui)

// Create the image
omiName := config.OMIName

ui.Say(fmt.Sprintf("Creating OMI %s from vm %s", omiName, vm.VmId))
createOpts := osc.CreateImageRequest{
ui.Say(fmt.Sprintf("Creating OMI %s from vm %s", omiName, vm.GetVmId()))
blockDeviceMapping := config.BlockDevices.BuildOscOMIDevices()
createOpts := oscgo.CreateImageRequest{
VmId: vm.VmId,
ImageName: omiName,
BlockDeviceMappings: config.BlockDevices.BuildOscOMIDevices(),
ImageName: &omiName,
BlockDeviceMappings: &blockDeviceMapping,
}
if config.OMIDescription != "" {
createOpts.Description = config.OMIDescription
createOpts.Description = &config.OMIDescription
}

resp, _, err := oscconn.ImageApi.CreateImage(context.Background(), &osc.CreateImageOpts{
CreateImageRequest: optional.NewInterface(createOpts),
})
if err != nil || resp.Image.ImageId == "" {
resp, _, err := oscconn.ImageApi.CreateImage(context.Background()).CreateImageRequest(createOpts).Execute()
if err != nil || resp.GetImage().ImageId == nil {
err := fmt.Errorf("Error creating OMI: %s", err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}

image := resp.Image
image := resp.GetImage()

// Set the OMI ID in the state
ui.Message(fmt.Sprintf("OMI: %s", image.ImageId))
ui.Message(fmt.Sprintf("OMI: %s", image.GetImageId()))
omis := make(map[string]string)
omis[s.RawRegion] = image.ImageId
omis[s.RawRegion] = image.GetImageId()
state.Put("omis", omis)

// Wait for the image to become ready
ui.Say("Waiting for OMI to become ready...")
if err := osccommon.WaitUntilOscImageAvailable(oscconn, image.ImageId); err != nil {
if err := osccommon.WaitUntilOscImageAvailable(oscconn, *image.ImageId); err != nil {
log.Printf("Error waiting for OMI: %s", err)
imagesResp, _, err := oscconn.ImageApi.ReadImages(context.Background(), &osc.ReadImagesOpts{
ReadImagesRequest: optional.NewInterface(osc.ReadImagesRequest{
Filters: osc.FiltersImage{
ImageIds: []string{image.ImageId},
},
}),
})
req := oscgo.ReadImagesRequest{
Filters: &oscgo.FiltersImage{ImageIds: &[]string{image.GetImageId()}},
}
imagesResp, _, err := oscconn.ImageApi.ReadImages(context.Background()).ReadImagesRequest(req).Execute()
if err != nil {
log.Printf("Unable to determine reason waiting for OMI failed: %s", err)
err = fmt.Errorf("Unknown error waiting for OMI")
} else {
stateReason := imagesResp.Images[0].StateComment
err = fmt.Errorf("Error waiting for OMI. Reason: %s", stateReason)
stateReason := imagesResp.GetImages()[0].GetStateComment()
err = fmt.Errorf("Error waiting for OMI. Reason: %s", *stateReason.StateMessage)
}

state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}

imagesResp, _, err := oscconn.ImageApi.ReadImages(context.Background(), &osc.ReadImagesOpts{
ReadImagesRequest: optional.NewInterface(osc.ReadImagesRequest{
Filters: osc.FiltersImage{
ImageIds: []string{image.ImageId},
},
}),
})
req := oscgo.ReadImagesRequest{
Filters: &oscgo.FiltersImage{ImageIds: &[]string{image.GetImageId()}},
}
imagesResp, _, err := oscconn.ImageApi.ReadImages(context.Background()).ReadImagesRequest(req).Execute()
if err != nil {
err := fmt.Errorf("Error searching for OMI: %s", err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
s.image = &imagesResp.Images[0]
s.image = &imagesResp.GetImages()[0]

snapshots := make(map[string][]string)
for _, blockDeviceMapping := range imagesResp.Images[0].BlockDeviceMappings {
if blockDeviceMapping.Bsu.SnapshotId != "" {
snapshots[s.RawRegion] = append(snapshots[s.RawRegion], blockDeviceMapping.Bsu.SnapshotId)
blockMapping := imagesResp.GetImages()[0].BlockDeviceMappings
for _, blockDeviceMapping := range *blockMapping {
if blockDeviceMapping.Bsu.SnapshotId != nil {
snapshots[s.RawRegion] = append(snapshots[s.RawRegion], *blockDeviceMapping.Bsu.SnapshotId)
}
}
state.Put("snapshots", snapshots)
Expand All @@ -115,14 +108,13 @@ func (s *stepCreateOMI) Cleanup(state multistep.StateBag) {
return
}

oscconn := state.Get("osc").(*osc.APIClient)
oscconn := state.Get("osc").(*oscgo.APIClient)
ui := state.Get("ui").(packersdk.Ui)

ui.Say("Deregistering the OMI because cancellation or error...")
DeleteOpts := osc.DeleteImageRequest{ImageId: s.image.ImageId}
if _, _, err := oscconn.ImageApi.DeleteImage(context.Background(), &osc.DeleteImageOpts{
DeleteImageRequest: optional.NewInterface(DeleteOpts),
}); err != nil {
DeleteOpts := oscgo.DeleteImageRequest{ImageId: s.image.GetImageId()}
_, _, err := oscconn.ImageApi.DeleteImage(context.Background()).DeleteImageRequest(DeleteOpts).Execute()
if err != nil {
ui.Error(fmt.Sprintf("Error Deleting OMI, may still be around: %s", err))
return
}
Expand Down
6 changes: 3 additions & 3 deletions builder/osc/bsusurrogate/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
"github.com/hashicorp/packer-plugin-sdk/template/config"
"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
"github.com/outscale/osc-sdk-go/osc"
oscgo "github.com/outscale/osc-sdk-go/v2"
osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
)

Expand Down Expand Up @@ -103,7 +103,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
}

func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook) (packersdk.Artifact, error) {
var oscConn *osc.APIClient
var oscConn *oscgo.APIClient
var err error

if oscConn, err = b.config.NewOSCClient(); err != nil {
Expand Down Expand Up @@ -186,7 +186,7 @@ func (b *Builder) Run(ctx context.Context, ui packersdk.Ui, hook packersdk.Hook)
&communicator.StepConnect{
Config: &b.config.RunConfig.Comm,
Host: osccommon.OscSSHHost(
oscConn.VmApi,
oscConn,
b.config.SSHInterface),
SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
},
Expand Down
98 changes: 45 additions & 53 deletions builder/osc/bsusurrogate/step_register_omi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,86 +4,81 @@ import (
"context"
"fmt"

"github.com/antihax/optional"
"github.com/hashicorp/packer-plugin-sdk/multistep"
packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
"github.com/outscale/osc-sdk-go/osc"
"github.com/outscale/osc-sdk-go/v2"
oscgo "github.com/outscale/osc-sdk-go/v2"
osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
)

// StepRegisterOMI creates the OMI.
type StepRegisterOMI struct {
RootDevice RootBlockDevice
OMIDevices []osc.BlockDeviceMappingImage
LaunchDevices []osc.BlockDeviceMappingVmCreation
image *osc.Image
OMIDevices []oscgo.BlockDeviceMappingImage
LaunchDevices []oscgo.BlockDeviceMappingVmCreation
image *oscgo.Image
RawRegion string
}

func (s *StepRegisterOMI) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
config := state.Get("config").(*Config)
oscconn := state.Get("osc").(*osc.APIClient)
oscconn := state.Get("osc").(*oscgo.APIClient)
snapshotIds := state.Get("snapshot_ids").(map[string]string)
ui := state.Get("ui").(packersdk.Ui)

ui.Say("Registering the OMI...")

blockDevices := s.combineDevices(snapshotIds)

registerOpts := osc.CreateImageRequest{
ImageName: config.OMIName,
Architecture: "x86_64",
RootDeviceName: s.RootDevice.DeviceName,
BlockDeviceMappings: blockDevices,
architecture := "x86_64"
registerOpts := oscgo.CreateImageRequest{
ImageName: &config.OMIName,
Architecture: &architecture,
RootDeviceName: &s.RootDevice.DeviceName,
BlockDeviceMappings: &blockDevices,
}

if config.OMIDescription != "" {
registerOpts.Description = config.OMIDescription
registerOpts.Description = &config.OMIDescription
}
registerResp, _, err := oscconn.ImageApi.CreateImage(context.Background(), &osc.CreateImageOpts{
CreateImageRequest: optional.NewInterface(registerOpts),
})
registerResp, _, err := oscconn.ImageApi.CreateImage(context.Background()).CreateImageRequest(registerOpts).Execute()
if err != nil {
state.Put("error", fmt.Errorf("Error registering OMI: %s", err))
ui.Error(state.Get("error").(error).Error())
return multistep.ActionHalt
}

// Set the OMI ID in the state
ui.Say(fmt.Sprintf("OMI: %s", registerResp.Image.ImageId))
ui.Say(fmt.Sprintf("OMI: %s", *registerResp.GetImage().ImageId))
omis := make(map[string]string)
omis[s.RawRegion] = registerResp.Image.ImageId
omis[s.RawRegion] = *registerResp.GetImage().ImageId
state.Put("omis", omis)

// Wait for the image to become ready
ui.Say("Waiting for OMI to become ready...")
if err := osccommon.WaitUntilOscImageAvailable(oscconn, registerResp.Image.ImageId); err != nil {
if err := osccommon.WaitUntilOscImageAvailable(oscconn, *registerResp.GetImage().ImageId); err != nil {
err := fmt.Errorf("Error waiting for OMI: %s", err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}

imagesResp, _, err := oscconn.ImageApi.ReadImages(context.Background(), &osc.ReadImagesOpts{
ReadImagesRequest: optional.NewInterface(osc.ReadImagesRequest{
Filters: osc.FiltersImage{
ImageIds: []string{registerResp.Image.ImageId},
},
}),
})

filterReq := oscgo.ReadImagesRequest{
Filters: &oscgo.FiltersImage{ImageIds: &[]string{*registerResp.GetImage().ImageId}},
}
imagesResp, _, err := oscconn.ImageApi.ReadImages(context.Background()).ReadImagesRequest(filterReq).Execute()
if err != nil {
err := fmt.Errorf("Error searching for OMI: %s", err)
state.Put("error", err)
ui.Error(err.Error())
return multistep.ActionHalt
}
s.image = &imagesResp.Images[0]
s.image = &imagesResp.GetImages()[0]

snapshots := make(map[string][]string)
for _, blockDeviceMapping := range imagesResp.Images[0].BlockDeviceMappings {
if blockDeviceMapping.Bsu.SnapshotId != "" {
snapshots[s.RawRegion] = append(snapshots[s.RawRegion], blockDeviceMapping.Bsu.SnapshotId)
block := imagesResp.GetImages()[0].BlockDeviceMappings
for _, blockDeviceMapping := range *block {
if blockDeviceMapping.Bsu.GetSnapshotId() != "" {
snapshots[s.RawRegion] = append(snapshots[s.RawRegion], blockDeviceMapping.Bsu.GetSnapshotId())
}
}
state.Put("snapshots", snapshots)
Expand All @@ -102,62 +97,59 @@ func (s *StepRegisterOMI) Cleanup(state multistep.StateBag) {
return
}

oscconn := state.Get("osc").(*osc.APIClient)
oscconn := state.Get("osc").(*oscgo.APIClient)
ui := state.Get("ui").(packersdk.Ui)

ui.Say("Deregistering the OMI because cancellation or error...")
deregisterOpts := osc.DeleteImageRequest{ImageId: s.image.ImageId}
_, _, err := oscconn.ImageApi.DeleteImage(context.Background(), &osc.DeleteImageOpts{
DeleteImageRequest: optional.NewInterface(deregisterOpts),
})

deregisterOpts := oscgo.DeleteImageRequest{ImageId: *s.image.ImageId}
_, _, err := oscconn.ImageApi.DeleteImage(context.Background()).DeleteImageRequest(deregisterOpts).Execute()
if err != nil {
ui.Error(fmt.Sprintf("Error deregistering OMI, may still be around: %s", err))
return
}
}

func (s *StepRegisterOMI) combineDevices(snapshotIDs map[string]string) []osc.BlockDeviceMappingImage {
devices := map[string]osc.BlockDeviceMappingImage{}
func (s *StepRegisterOMI) combineDevices(snapshotIDs map[string]string) []oscgo.BlockDeviceMappingImage {
devices := map[string]oscgo.BlockDeviceMappingImage{}

for _, device := range s.OMIDevices {
devices[device.DeviceName] = device
devices[device.GetDeviceName()] = device
}

// Devices in launch_block_device_mappings override any with
// the same name in ami_block_device_mappings, except for the
// one designated as the root device in ami_root_device
for _, device := range s.LaunchDevices {
snapshotID, ok := snapshotIDs[device.DeviceName]
snapshotID, ok := snapshotIDs[device.GetDeviceName()]
if ok {
device.Bsu.SnapshotId = snapshotID
device.Bsu.SnapshotId = &snapshotID
}
if device.DeviceName == s.RootDevice.SourceDeviceName {
device.DeviceName = s.RootDevice.DeviceName
if device.GetDeviceName() == s.RootDevice.SourceDeviceName {
device.DeviceName = &s.RootDevice.DeviceName

if device.Bsu.VolumeType != "" {
device.Bsu.VolumeType = s.RootDevice.VolumeType
if device.Bsu.VolumeType != "io1" {
device.Bsu.Iops = 0
if device.Bsu.VolumeType != nil {
device.Bsu.VolumeType = &s.RootDevice.VolumeType
if *device.Bsu.VolumeType != "io1" {
*device.Bsu.Iops = 0
}
}

}
devices[device.DeviceName] = copyToDeviceMappingImage(device)
devices[device.GetDeviceName()] = copyToDeviceMappingImage(device)
}

blockDevices := []osc.BlockDeviceMappingImage{}
blockDevices := []oscgo.BlockDeviceMappingImage{}
for _, device := range devices {
blockDevices = append(blockDevices, device)
}
return blockDevices
}

func copyToDeviceMappingImage(device osc.BlockDeviceMappingVmCreation) osc.BlockDeviceMappingImage {
deviceImage := osc.BlockDeviceMappingImage{
func copyToDeviceMappingImage(device osc.BlockDeviceMappingVmCreation) oscgo.BlockDeviceMappingImage {
deviceImage := oscgo.BlockDeviceMappingImage{
DeviceName: device.DeviceName,
VirtualDeviceName: device.VirtualDeviceName,
Bsu: osc.BsuToCreate{
Bsu: &oscgo.BsuToCreate{
DeleteOnVmDeletion: device.Bsu.DeleteOnVmDeletion,
Iops: device.Bsu.Iops,
SnapshotId: device.Bsu.SnapshotId,
Expand Down
Loading

0 comments on commit e44c1c8

Please sign in to comment.