upgrade sdk go from v1 to v2

Signed-off-by: outscale_hmi <hanen.mizouni@outscale.com>
outscale · Dec 14, 2022 · 518ce81 · 518ce81
1 parent 6d60832
commit 518ce81
Show file tree

Hide file tree

Showing 43 changed files with 842 additions and 983 deletions.
diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go
@@ -19,7 +19,6 @@ 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"
 	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
 )
 
@@ -85,7 +84,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 *osccommon.OscClient
 	var err error
 	if oscConn, err = b.config.NewOSCClient(); err != nil {
 		return nil, err
@@ -163,7 +162,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(),
 		},

diff --git a/builder/osc/bsu/step_create_omi.go b/builder/osc/bsu/step_create_omi.go
@@ -5,98 +5,97 @@ 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").(*osccommon.OscClient)
+	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.Api.ImageApi.CreateImage(oscconn.Auth).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.GetImageId()); 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.Api.ImageApi.ReadImages(oscconn.Auth).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.GetStateMessage())
 		}
 
 		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.Api.ImageApi.ReadImages(oscconn.Auth).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]
+	if s.image == nil {
+		err := fmt.Errorf("Error while reading an empty image id': %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
 
 	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].GetBlockDeviceMappings()
+	for _, blockDeviceMapping := range blockMapping {
+		if blockDeviceMapping.Bsu.SnapshotId != nil {
+			snapshots[s.RawRegion] = append(snapshots[s.RawRegion], *blockDeviceMapping.Bsu.SnapshotId)
 		}
 	}
 	state.Put("snapshots", snapshots)
@@ -115,14 +114,13 @@ func (s *stepCreateOMI) Cleanup(state multistep.StateBag) {
 		return
 	}
 
-	oscconn := state.Get("osc").(*osc.APIClient)
+	oscconn := state.Get("osc").(*osccommon.OscClient)
 	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.Api.ImageApi.DeleteImage(oscconn.Auth).DeleteImageRequest(deleteOpts).Execute()
+	if err != nil {
 		ui.Error(fmt.Sprintf("Error Deleting OMI, may still be around: %s", err))
 		return
 	}

diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go
@@ -17,7 +17,6 @@ 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"
 	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
 )
 
@@ -103,7 +102,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 *osccommon.OscClient
 	var err error
 
 	if oscConn, err = b.config.NewOSCClient(); err != nil {
@@ -186,7 +185,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(),
 		},