diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index 46fadd758..70ab6f520 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -114,6 +114,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack &osccommon.StepPreValidate{ DestOmiName: b.config.OMIName, ForceDeregister: b.config.OMIForceDeregister, + API: b.config.AccessConfig.API, }, &osccommon.StepSourceOMIInfo{ SourceOmi: b.config.SourceOmi, diff --git a/builder/osc/bsu/builder_acc_test.go b/builder/osc/bsu/builder_acc_test.go index 10cb6d815..2771a1165 100644 --- a/builder/osc/bsu/builder_acc_test.go +++ b/builder/osc/bsu/builder_acc_test.go @@ -47,7 +47,8 @@ const testBuilderAccBasic = ` "vm_type": "t2.micro", "source_omi": "ami-abe953fa", "ssh_username": "outscale", - "omi_name": "packer-test {{timestamp}}" + "omi_name": "packer-test {{timestamp}}", + "api":"osc" }] } ` diff --git a/builder/osc/common/build_filters.go b/builder/osc/common/build_filters.go index fe88ed09f..17a48a1b5 100644 --- a/builder/osc/common/build_filters.go +++ b/builder/osc/common/build_filters.go @@ -5,6 +5,7 @@ import ( "strconv" "github.com/outscale/osc-go/oapi" + "github.com/outscale/osc-sdk-go/osc" ) func buildNetFilters(input map[string]string) oapi.FiltersNet { @@ -33,6 +34,32 @@ func buildNetFilters(input map[string]string) oapi.FiltersNet { return filters } +func buildOscNetFilters(input map[string]string) osc.FiltersNet { + var filters osc.FiltersNet + for k, v := range input { + filterValue := []string{v} + switch name := k; name { + case "ip-range": + filters.IpRanges = filterValue + case "dhcp-options-set-id": + filters.DhcpOptionsSetIds = filterValue + case "is-default": + if isDefault, err := strconv.ParseBool(v); err == nil { + filters.IsDefault = isDefault + } + case "state": + filters.States = filterValue + case "tag-key": + filters.TagKeys = filterValue + case "tag-value": + filters.TagValues = filterValue + default: + log.Printf("[Debug] Unknown Filter Name: %s.", name) + } + } + return filters +} + func buildSubnetFilters(input map[string]string) oapi.FiltersSubnet { var filters oapi.FiltersSubnet for k, v := range input { @@ -59,6 +86,32 @@ func buildSubnetFilters(input map[string]string) oapi.FiltersSubnet { return filters } +func buildOscSubnetFilters(input map[string]string) osc.FiltersSubnet { + var filters osc.FiltersSubnet + for k, v := range input { + filterValue := []string{v} + switch name := k; name { + case "available-ips-counts": + if ipCount, err := strconv.Atoi(v); err == nil { + filters.AvailableIpsCounts = []int32{int32(ipCount)} + } + case "ip-ranges": + filters.IpRanges = filterValue + case "net-ids": + filters.NetIds = filterValue + case "states": + filters.States = filterValue + case "subnet-ids": + filters.SubnetIds = filterValue + case "sub-region-names": + filters.SubregionNames = filterValue + default: + log.Printf("[Debug] Unknown Filter Name: %s.", name) + } + } + return filters +} + func buildOMIFilters(input map[string]string) oapi.FiltersImage { var filters oapi.FiltersImage for k, v := range input { @@ -91,6 +144,38 @@ func buildOMIFilters(input map[string]string) oapi.FiltersImage { return filters } +func buildOSCOMIFilters(input map[string]string) osc.FiltersImage { + var filters osc.FiltersImage + for k, v := range input { + filterValue := []string{v} + + switch name := k; name { + case "account-alias": + filters.AccountAliases = filterValue + case "account-id": + filters.AccountIds = filterValue + case "architecture": + filters.Architectures = filterValue + case "image-id": + filters.ImageIds = filterValue + case "image-name": + filters.ImageNames = filterValue + // case "image-type": + // filters.ImageTypes = filterValue + case "virtualization-type": + filters.VirtualizationTypes = filterValue + case "root-device-type": + filters.RootDeviceTypes = filterValue + // case "block-device-mapping-volume-type": + // filters.BlockDeviceMappingVolumeType = filterValue + //Some params are missing. + default: + log.Printf("[WARN] Unknown Filter Name: %s.", name) + } + } + return filters +} + func buildSecurityGroupFilters(input map[string]string) oapi.FiltersSecurityGroup { var filters oapi.FiltersSecurityGroup for k, v := range input { diff --git a/builder/osc/common/interpolate_build_info.go b/builder/osc/common/interpolate_build_info.go index a3d62a00c..00f530319 100644 --- a/builder/osc/common/interpolate_build_info.go +++ b/builder/osc/common/interpolate_build_info.go @@ -2,7 +2,7 @@ package common import ( "github.com/hashicorp/packer/helper/multistep" - "github.com/outscale/osc-go/oapi" + "github.com/outscale/osc-sdk-go/osc" ) type BuildInfoTemplate struct { @@ -20,7 +20,7 @@ func extractBuildInfo(region string, state multistep.StateBag) *BuildInfoTemplat } } - sourceOMI := rawSourceOMI.(oapi.Image) + sourceOMI := rawSourceOMI.(osc.Image) sourceOMITags := make(map[string]string, len(sourceOMI.Tags)) for _, tag := range sourceOMI.Tags { sourceOMITags[tag.Key] = tag.Value diff --git a/builder/osc/common/step_network_info.go b/builder/osc/common/step_network_info.go index 937758bae..e583348df 100644 --- a/builder/osc/common/step_network_info.go +++ b/builder/osc/common/step_network_info.go @@ -7,9 +7,11 @@ import ( "math/rand" "sort" + "github.com/antihax/optional" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/outscale/osc-go/oapi" + "github.com/outscale/osc-sdk-go/osc" ) // StepNetworkInfo queries OUTSCALE for information about @@ -37,6 +39,14 @@ func (a subnetsSort) Less(i, j int) bool { return a[i].AvailableIpsCount < a[j].AvailableIpsCount } +type subnetsOscSort []osc.Subnet + +func (a subnetsOscSort) Len() int { return len(a) } +func (a subnetsOscSort) Swap(i, j int) { a[i], a[j] = a[j], a[i] } +func (a subnetsOscSort) Less(i, j int) bool { + return a[i].AvailableIpsCount < a[j].AvailableIpsCount +} + // Returns the most recent OMI out of a slice of images. func mostFreeSubnet(subnets []oapi.Subnet) oapi.Subnet { sortedSubnets := subnets @@ -44,19 +54,29 @@ func mostFreeSubnet(subnets []oapi.Subnet) oapi.Subnet { return sortedSubnets[len(sortedSubnets)-1] } +// Returns the most recent OMI out of a slice of images. +func mostFreeOscSubnet(subnets []osc.Subnet) osc.Subnet { + sortedSubnets := subnets + sort.Sort(subnetsOscSort(sortedSubnets)) + return sortedSubnets[len(sortedSubnets)-1] +} + +//Run ... func (s *StepNetworkInfo) Run(_ context.Context, state multistep.StateBag) multistep.StepAction { - oapiconn := state.Get("oapi").(*oapi.Client) + oscconn := state.Get("osc").(*osc.APIClient) ui := state.Get("ui").(packer.Ui) // NET if s.NetId == "" && !s.NetFilter.Empty() { - params := oapi.ReadNetsRequest{} - params.Filters = buildNetFilters(s.NetFilter.Filters) + params := osc.ReadNetsRequest{} + params.Filters = buildOscNetFilters(s.NetFilter.Filters) s.NetFilter.Filters["state"] = "available" log.Printf("Using NET Filters %v", params) - vpcResp, err := oapiconn.POST_ReadNets(params) + vpcResp, _, err := oscconn.NetApi.ReadNets(context.Background(), &osc.ReadNetsOpts{ + ReadNetsRequest: optional.NewInterface(params), + }) if err != nil { err := fmt.Errorf("Error querying NETs: %s", err) state.Put("error", err) @@ -64,20 +84,20 @@ func (s *StepNetworkInfo) Run(_ context.Context, state multistep.StateBag) multi return multistep.ActionHalt } - if len(vpcResp.OK.Nets) != 1 { - err := fmt.Errorf("Exactly one NET should match the filter, but %d NET's was found matching filters: %v", len(vpcResp.OK.Nets), params) + if len(vpcResp.Nets) != 1 { + err := fmt.Errorf("Exactly one NET should match the filter, but %d NET's was found matching filters: %v", len(vpcResp.Nets), params) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt } - s.NetId = vpcResp.OK.Nets[0].NetId + s.NetId = vpcResp.Nets[0].NetId ui.Message(fmt.Sprintf("Found NET ID: %s", s.NetId)) } // Subnet if s.SubnetId == "" && !s.SubnetFilter.Empty() { - params := oapi.ReadSubnetsRequest{} + params := osc.ReadSubnetsRequest{} s.SubnetFilter.Filters["state"] = "available" if s.NetId != "" { @@ -86,39 +106,41 @@ func (s *StepNetworkInfo) Run(_ context.Context, state multistep.StateBag) multi if s.SubregionName != "" { s.SubnetFilter.Filters["availability-zone"] = s.SubregionName } - params.Filters = buildSubnetFilters(s.SubnetFilter.Filters) + params.Filters = buildOscSubnetFilters(s.SubnetFilter.Filters) log.Printf("Using Subnet Filters %v", params) - subnetsResp, err := oapiconn.POST_ReadSubnets(params) + subnetsResp, _, err := oscconn.SubnetApi.ReadSubnets(context.Background(), &osc.ReadSubnetsOpts{ + ReadSubnetsRequest: optional.NewInterface(params), + }) if err != nil { - err := fmt.Errorf("Error querying Subnets: %s", err) + err := fmt.Errorf("error querying Subnets: %s", err) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt } - if len(subnetsResp.OK.Subnets) == 0 { + if len(subnetsResp.Subnets) == 0 { err := fmt.Errorf("No Subnets was found matching filters: %v", params) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt } - if len(subnetsResp.OK.Subnets) > 1 && !s.SubnetFilter.Random && !s.SubnetFilter.MostFree { - err := fmt.Errorf("Your filter matched %d Subnets. Please try a more specific search, or set random or most_free to true.", len(subnetsResp.OK.Subnets)) + if len(subnetsResp.Subnets) > 1 && !s.SubnetFilter.Random && !s.SubnetFilter.MostFree { + err := fmt.Errorf("your filter matched %d Subnets. Please try a more specific search, or set random or most_free to true", len(subnetsResp.Subnets)) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt } - var subnet oapi.Subnet + var subnet osc.Subnet switch { case s.SubnetFilter.MostFree: - subnet = mostFreeSubnet(subnetsResp.OK.Subnets) + subnet = mostFreeOscSubnet(subnetsResp.Subnets) case s.SubnetFilter.Random: - subnet = subnetsResp.OK.Subnets[rand.Intn(len(subnetsResp.OK.Subnets))] + subnet = subnetsResp.Subnets[rand.Intn(len(subnetsResp.Subnets))] default: - subnet = subnetsResp.OK.Subnets[0] + subnet = subnetsResp.Subnets[0] } s.SubnetId = subnet.SubnetId ui.Message(fmt.Sprintf("Found Subnet ID: %s", s.SubnetId)) @@ -127,24 +149,25 @@ func (s *StepNetworkInfo) Run(_ context.Context, state multistep.StateBag) multi // Try to find Subregion and NET Id from Subnet if they are not yet found/given if s.SubnetId != "" && (s.SubregionName == "" || s.NetId == "") { log.Printf("[INFO] Finding Subregion and NetId for the given subnet '%s'", s.SubnetId) - resp, err := oapiconn.POST_ReadSubnets( - oapi.ReadSubnetsRequest{ - Filters: oapi.FiltersSubnet{ + resp, _, err := oscconn.SubnetApi.ReadSubnets(context.Background(), &osc.ReadSubnetsOpts{ + ReadSubnetsRequest: optional.NewInterface(osc.ReadSubnetsRequest{ + Filters: osc.FiltersSubnet{ SubnetIds: []string{s.SubnetId}, }, - }) + }), + }) if err != nil { - err := fmt.Errorf("Describing the subnet: %s returned error: %s.", s.SubnetId, err) + err := fmt.Errorf("describing the subnet: %s returned error: %s", s.SubnetId, err) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt } if s.SubregionName == "" { - s.SubregionName = resp.OK.Subnets[0].SubregionName + s.SubregionName = resp.Subnets[0].SubregionName log.Printf("[INFO] SubregionName found: '%s'", s.SubregionName) } if s.NetId == "" { - s.NetId = resp.OK.Subnets[0].NetId + s.NetId = resp.Subnets[0].NetId log.Printf("[INFO] NetId found: '%s'", s.NetId) } } @@ -155,4 +178,5 @@ func (s *StepNetworkInfo) Run(_ context.Context, state multistep.StateBag) multi return multistep.ActionContinue } +//Cleanup ... func (s *StepNetworkInfo) Cleanup(multistep.StateBag) {} diff --git a/builder/osc/common/step_pre_validate.go b/builder/osc/common/step_pre_validate.go index 31efae31a..5fa2b8936 100644 --- a/builder/osc/common/step_pre_validate.go +++ b/builder/osc/common/step_pre_validate.go @@ -16,6 +16,7 @@ import ( type StepPreValidate struct { DestOmiName string ForceDeregister bool + API string } func (s *StepPreValidate) Run(_ context.Context, state multistep.StateBag) multistep.StepAction { @@ -60,7 +61,13 @@ func (s *StepPreValidate) Run(_ context.Context, state multistep.StateBag) multi return multistep.ActionHalt } - return multistep.ActionContinue + for _, omi := range resp.Images { + if omi.ImageName == imageName { + images = append(images, omi) + } + } + + return images, nil } func (s *StepPreValidate) Cleanup(multistep.StateBag) {} diff --git a/builder/osc/common/step_run_source_vm.go b/builder/osc/common/step_run_source_vm.go index 16d10d779..7777e913c 100644 --- a/builder/osc/common/step_run_source_vm.go +++ b/builder/osc/common/step_run_source_vm.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/outscale/osc-go/oapi" + "github.com/outscale/osc-sdk-go/osc" retry "github.com/hashicorp/packer/common" "github.com/hashicorp/packer/helper/communicator" @@ -67,7 +68,7 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul } ui.Say("Launching a source OUTSCALE vm...") - image, ok := state.Get("source_image").(oapi.Image) + image, ok := state.Get("source_image").(osc.Image) if !ok { state.Put("error", fmt.Errorf("source_image type assertion failed")) return multistep.ActionHalt diff --git a/builder/osc/common/step_source_omi_info.go b/builder/osc/common/step_source_omi_info.go index 19ec926cc..fe5d9081c 100644 --- a/builder/osc/common/step_source_omi_info.go +++ b/builder/osc/common/step_source_omi_info.go @@ -7,9 +7,11 @@ import ( "sort" "time" + "github.com/antihax/optional" "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/outscale/osc-go/oapi" + "github.com/outscale/osc-sdk-go/osc" ) // StepSourceOMIInfo extracts critical information from the source OMI @@ -24,6 +26,7 @@ type StepSourceOMIInfo struct { } type imageSort []oapi.Image +type imageOscSort []osc.Image func (a imageSort) Len() int { return len(a) } func (a imageSort) Swap(i, j int) { a[i], a[j] = a[j], a[i] } @@ -33,6 +36,14 @@ func (a imageSort) Less(i, j int) bool { return itime.Unix() < jtime.Unix() } +func (a imageOscSort) Len() int { return len(a) } +func (a imageOscSort) Swap(i, j int) { a[i], a[j] = a[j], a[i] } +func (a imageOscSort) Less(i, j int) bool { + itime, _ := time.Parse(time.RFC3339, a[i].CreationDate) + jtime, _ := time.Parse(time.RFC3339, a[j].CreationDate) + return itime.Unix() < jtime.Unix() +} + // Returns the most recent OMI out of a slice of images. func mostRecentOmi(images []oapi.Image) oapi.Image { sortedImages := images @@ -40,12 +51,19 @@ func mostRecentOmi(images []oapi.Image) oapi.Image { return sortedImages[len(sortedImages)-1] } +// Returns the most recent OMI out of a slice of images. +func mostRecentOscOmi(images []osc.Image) osc.Image { + sortedImages := images + sort.Sort(imageOscSort(sortedImages)) + return sortedImages[len(sortedImages)-1] +} + func (s *StepSourceOMIInfo) Run(_ context.Context, state multistep.StateBag) multistep.StepAction { - oapiconn := state.Get("oapi").(*oapi.Client) + oscconn := state.Get("osc").(*osc.APIClient) ui := state.Get("ui").(packer.Ui) - params := oapi.ReadImagesRequest{ - Filters: oapi.FiltersImage{}, + params := osc.ReadImagesRequest{ + Filters: osc.FiltersImage{}, } if s.SourceOmi != "" { @@ -54,7 +72,7 @@ func (s *StepSourceOMIInfo) Run(_ context.Context, state multistep.StateBag) mul // We have filters to apply if len(s.OmiFilters.Filters) > 0 { - params.Filters = buildOMIFilters(s.OmiFilters.Filters) + params.Filters = buildOSCOMIFilters(s.OmiFilters.Filters) } //TODO:Check if AccountIds correspond to Owners. if len(s.OmiFilters.Owners) > 0 { @@ -62,7 +80,9 @@ func (s *StepSourceOMIInfo) Run(_ context.Context, state multistep.StateBag) mul } log.Printf("Using OMI Filters %#v", params) - imageResp, err := oapiconn.POST_ReadImages(params) + imageResp, _, err := oscconn.ImageApi.ReadImages(context.Background(), &osc.ReadImagesOpts{ + ReadImagesRequest: optional.NewInterface(params), + }) if err != nil { err := fmt.Errorf("Error querying OMI: %s", err) state.Put("error", err) @@ -70,25 +90,25 @@ func (s *StepSourceOMIInfo) Run(_ context.Context, state multistep.StateBag) mul return multistep.ActionHalt } - if len(imageResp.OK.Images) == 0 { + if len(imageResp.Images) == 0 { err := fmt.Errorf("No OMI was found matching filters: %#v", params) state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt } - if len(imageResp.OK.Images) > 1 && !s.OmiFilters.MostRecent { - err := fmt.Errorf("Your query returned more than one result. Please try a more specific search, or set most_recent to true.") + if len(imageResp.Images) > 1 && !s.OmiFilters.MostRecent { + err := fmt.Errorf("your query returned more than one result. Please try a more specific search, or set most_recent to true") state.Put("error", err) ui.Error(err.Error()) return multistep.ActionHalt } - var image oapi.Image + var image osc.Image if s.OmiFilters.MostRecent { - image = mostRecentOmi(imageResp.OK.Images) + image = mostRecentOscOmi(imageResp.Images) } else { - image = imageResp.OK.Images[0] + image = imageResp.Images[0] } ui.Message(fmt.Sprintf("Found Image ID: %s", image.ImageId)) diff --git a/go.mod b/go.mod index f56e30b6d..5ac1101f8 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20170113022742-e6dbea820a9f github.com/antchfx/xpath v0.0.0-20170728053731-b5c552e1acbd // indirect github.com/antchfx/xquery v0.0.0-20170730121040-eb8c3c172607 // indirect + github.com/antihax/optional v1.0.0 github.com/approvals/go-approval-tests v0.0.0-20160714161514-ad96e53bea43 github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 // indirect github.com/aws/aws-sdk-go v1.30.8 @@ -109,6 +110,7 @@ require ( github.com/olekukonko/tablewriter v0.0.0-20180105111133-96aac992fc8b github.com/oracle/oci-go-sdk v18.0.0+incompatible github.com/outscale/osc-go v0.0.1 + github.com/outscale/osc-sdk-go/osc v0.0.0-20200722135656-d654809d0699 github.com/packer-community/winrmcp v0.0.0-20180921204643-0fd363d6159a github.com/pierrec/lz4 v2.0.5+incompatible github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 1d5aba68c..caa3e0834 100644 --- a/go.sum +++ b/go.sum @@ -112,6 +112,7 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= github.com/aws/aws-sdk-go v1.16.22/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.26.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.30.8 h1:4BHbh8K3qKmcnAgToZ2LShldRF9inoqIBccpCLNCy3I= github.com/aws/aws-sdk-go v1.30.8/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/azr/flock v0.0.0-20190823144736-958d66434653 h1:2H3Cu0cbG8iszfcgnANwC/cm0YkPJIQvaJ9/tSpwh9o= @@ -516,6 +517,9 @@ github.com/oracle/oci-go-sdk v18.0.0+incompatible h1:FLV4KixsVfF3rwyVTMI6Ryp/Q+O github.com/oracle/oci-go-sdk v18.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= github.com/outscale/osc-go v0.0.1 h1:hvBtORyu7sWSKW1norGlfIP8C7c2aegI2Vkq75SRPCE= github.com/outscale/osc-go v0.0.1/go.mod h1:hJLmXzqU/t07qQYh90I0TqZzu9s85Zs6FMrxk3ukiFM= +github.com/outscale/osc-sdk-go v1.2.0 h1:1HKr6OMLLVW4w6KQuiQwYZjhNaVz9mNzy/W3KW+zgnA= +github.com/outscale/osc-sdk-go/osc v0.0.0-20200722135656-d654809d0699 h1:SHe9i7h5cHe+cB77fQ6lsEgIwKg3ckNU90P03CjGMnI= +github.com/outscale/osc-sdk-go/osc v0.0.0-20200722135656-d654809d0699/go.mod h1:5AqqNH1X8zCHescKVlpSHRzrat1KCKDXqZoQPe8fY3A= github.com/packer-community/winrmcp v0.0.0-20180921204643-0fd363d6159a h1:A3QMuteviunoaY/8ex+RKFqwhcZJ/Cf3fCW3IwL2wx4= github.com/packer-community/winrmcp v0.0.0-20180921204643-0fd363d6159a/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=