Merge branch 'master' into feat-add-support-inference

Author: Laure-di

docs/data-sources/instance_servers.md

@@ -54,7 +54,6 @@ In addition to all above arguments, the following attributes are exported:
     - `zone` - The [zone](../guides/regions_and_zones.md#zones) in which the server is.
     - `name` - The name of the server.
     - `boot_type` - The boot Type of the server. Possible values are: `local`, `bootscript` or `rescue`.
-    - `bootscript_id` - The ID of the bootscript.
     - `type` - The commercial type of the server.
     - `security_group_id` - The [security group](https://developers.scaleway.com/en/products/instance/api/#security-groups-8d7f89) the server is attached to.
     - `enable_ipv6` - Determines if IPv6 is enabled for the server.

docs/resources/baremetal_server.md

@@ -12,7 +12,7 @@ Creates and manages Scaleway Compute Baremetal servers. For more information, se
 ### Basic
 
 ```terraform
-data "scaleway_account_ssh_key" "main" {
+data "scaleway_iam_ssh_key" "main" {
   name = "main"
 }
 
@@ -27,7 +27,7 @@ resource "scaleway_baremetal_server" "base" {
 ### With option
 
 ```terraform
-data "scaleway_account_ssh_key" "main" {
+data "scaleway_iam_ssh_key" "main" {
   name = "main"
 }
 
@@ -71,7 +71,7 @@ resource "scaleway_baremetal_server" "base" {
 ### With private network
 
 ```terraform
-data "scaleway_account_ssh_key" "main" {
+data "scaleway_iam_ssh_key" "main" {
   name = "main"
 }
 
@@ -111,6 +111,64 @@ resource "scaleway_baremetal_server" "base" {
 }
 ```
 
+### With IPAM IP IDs
+
+```terraform
+resource "scaleway_vpc" "vpc01" {
+  name   = "vpc_baremetal"
+}
+
+resource "scaleway_vpc_private_network" "pn01" {
+  name   = "private_network_baremetal"
+  ipv4_subnet {
+    subnet = "172.16.64.0/22"
+  }
+  vpc_id = scaleway_vpc.vpc01.id
+}
+
+resource "scaleway_ipam_ip" "ip01" {
+  address = "172.16.64.7"
+  source {
+    private_network_id = scaleway_vpc_private_network.pn01.id
+  }
+}
+
+data "scaleway_iam_ssh_key" "my_key" {
+  name = "main"
+}
+
+data "scaleway_baremetal_os" "my_os" {
+  zone = "fr-par-1"
+  name = "Ubuntu"
+  version = "22.04 LTS (Jammy Jellyfish)"
+}
+
+data "scaleway_baremetal_offer" "my_offer" {
+  zone = "fr-par-1"
+  name = "EM-A115X-SSD"
+}
+
+data "scaleway_baremetal_option" "private_network" {
+  zone = "fr-par-1"
+  name = "Private Network"
+}
+
+resource "scaleway_baremetal_server" "base" {
+  zone        = "fr-par-2"
+  offer       = data.scaleway_baremetal_offer.my_offer.offer_id
+  os          = data.scaleway_baremetal_os.my_os.os_id
+  ssh_key_ids = [data.scaleway_account_ssh_key.my_key.id]
+
+  options {
+    id = data.scaleway_baremetal_option.private_network.option_id
+  }
+  private_network {
+    id = scaleway_vpc_private_network.pn01.id
+    ipam_ip_ids = [scaleway_ipam_ip.ip01.id]
+  }
+}
+```
+
 ### Without install config
 
 ```terraform
@@ -156,6 +214,7 @@ The following arguments are supported:
     - `expires_at` - (Optional) The auto expiration date for compatible options
 - `private_network` - (Required) The private networks to attach to the server. For more information, see [the documentation](https://www.scaleway.com/en/docs/compute/elastic-metal/how-to/use-private-networks/)
     - `id` - (Required) The id of the private network to attach.
+    - `ipam_ip_ids` - (Optional) List of IPAM IP IDs to assign to the server in the requested private network.
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the server should be created.
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the server is associated with.
 

docs/resources/instance_server.md

@@ -256,8 +256,6 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 - `replace_on_type_change` - (Defaults to false) If true, the server will be replaced if `type` is changed. Otherwise, the server will migrate.
 
-- `bootscript_id` (Deprecated) - The ID of the bootscript to use  (set boot_type to `bootscript`).
-
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the server should be created.
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the server is associated with.

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.7.0
 	github.com/nats-io/nats.go v1.37.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241021115642-2d127a2d76c7
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/crypto v0.27.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0
@@ -110,7 +110,7 @@ require (
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/appengine v1.6.8 // indirect

go.sum

@@ -242,8 +242,8 @@ github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXq
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30 h1:yoKAVkEVwAqbGbR8n87rHQ1dulL25rKloGadb3vm770=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30/go.mod h1:sH0u6fq6x4R5M7WxkoQFY/o7UaiItec0o1LinLCJNq8=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241021115642-2d127a2d76c7 h1:mWi3yS37Lhf73OP2Z4CboKtXJM4mWDAUWFHKSx2WK7k=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30.0.20241021115642-2d127a2d76c7/go.mod h1:3jrRJM7638J+P33hKy9MBvfOBxNo8pEGNQQoIv65Ihg=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
@@ -361,8 +361,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

internal/locality/regional/ids.go

@@ -65,3 +65,14 @@ func ParseID(regionalID string) (region scw.Region, id string, err error) {
 	region, err = scw.ParseRegion(loc)
 	return
 }
+
+func NewRegionalIDs(region scw.Region, ids []string) []string {
+	if ids == nil {
+		return nil
+	}
+	flattenedIDs := make([]string, len(ids))
+	for i, id := range ids {
+		flattenedIDs[i] = NewIDString(region, id)
+	}
+	return flattenedIDs
+}

internal/services/baremetal/helpers.go

@@ -5,10 +5,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sort"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
+	baremetalV3 "github.com/scaleway/scaleway-sdk-go/api/baremetal/v3"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
@@ -47,8 +49,8 @@ func NewAPIWithZoneAndID(m interface{}, id string) (*baremetal.API, zonal.ID, er
 }
 
 // returns a new private network API and the zone for a Create request
-func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) (*baremetal.PrivateNetworkAPI, scw.Zone, error) {
-	privateNetworkAPI := baremetal.NewPrivateNetworkAPI(meta.ExtractScwClient(m))
+func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) (*baremetalV3.PrivateNetworkAPI, scw.Zone, error) {
+	privateNetworkAPI := baremetalV3.NewPrivateNetworkAPI(meta.ExtractScwClient(m))
 
 	zone, err := meta.ExtractZone(d, m)
 	if err != nil {
@@ -58,8 +60,8 @@ func newPrivateNetworkAPIWithZone(d *schema.ResourceData, m interface{}) (*barem
 }
 
 // NewPrivateNetworkAPIWithZoneAndID returns a private network API with zone and ID extracted from the state
-func NewPrivateNetworkAPIWithZoneAndID(m interface{}, id string) (*baremetal.PrivateNetworkAPI, zonal.ID, error) {
-	privateNetworkAPI := baremetal.NewPrivateNetworkAPI(meta.ExtractScwClient(m))
+func NewPrivateNetworkAPIWithZoneAndID(m interface{}, id string) (*baremetalV3.PrivateNetworkAPI, zonal.ID, error) {
+	privateNetworkAPI := baremetalV3.NewPrivateNetworkAPI(meta.ExtractScwClient(m))
 
 	zone, ID, err := zonal.ParseID(id)
 	if err != nil {
@@ -73,7 +75,7 @@ func detachAllPrivateNetworkFromServer(ctx context.Context, d *schema.ResourceDa
 	if err != nil {
 		return err
 	}
-	listPrivateNetwork, err := privateNetworkAPI.ListServerPrivateNetworks(&baremetal.PrivateNetworkAPIListServerPrivateNetworksRequest{
+	listPrivateNetwork, err := privateNetworkAPI.ListServerPrivateNetworks(&baremetalV3.PrivateNetworkAPIListServerPrivateNetworksRequest{
 		Zone:     zone,
 		ServerID: &serverID,
 	}, scw.WithContext(ctx))
@@ -82,7 +84,7 @@ func detachAllPrivateNetworkFromServer(ctx context.Context, d *schema.ResourceDa
 	}
 
 	for _, pn := range listPrivateNetwork.ServerPrivateNetworks {
-		err := privateNetworkAPI.DeleteServerPrivateNetwork(&baremetal.PrivateNetworkAPIDeleteServerPrivateNetworkRequest{
+		err := privateNetworkAPI.DeleteServerPrivateNetwork(&baremetalV3.PrivateNetworkAPIDeleteServerPrivateNetworkRequest{
 			Zone:             zone,
 			ServerID:         serverID,
 			PrivateNetworkID: pn.PrivateNetworkID,
@@ -187,12 +189,26 @@ func customDiffPrivateNetworkOption() func(ctx context.Context, diff *schema.Res
 }
 
 func privateNetworkSetHash(v interface{}) int {
-	var buf bytes.Buffer
-
 	m := v.(map[string]interface{})
-	if pnID, ok := m["id"]; ok {
-		buf.WriteString(locality.ExpandID(pnID))
+	id := locality.ExpandID(m["id"].(string))
+
+	var buf bytes.Buffer
+	buf.WriteString(id)
+
+	if ipamIPs, ok := m["ipam_ip_ids"]; ok && ipamIPs != nil {
+		ipamIPsList := ipamIPs.([]interface{})
+		var ipamIPIDs []string
+		for _, ip := range ipamIPsList {
+			if ipStr, ok := ip.(string); ok && ipStr != "" {
+				ipamIPIDs = append(ipamIPIDs, ipStr)
+			}
+		}
+		sort.Strings(ipamIPIDs)
+		for _, ipID := range ipamIPIDs {
+			buf.WriteString("-")
+			buf.WriteString(ipID)
+		}
 	}
 
-	return types.StringHashcode(buf.String())
+	return schema.HashString(buf.String())
 }

internal/services/baremetal/server.go

@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	"github.com/scaleway/scaleway-sdk-go/api/baremetal/v1"
+	baremetalV3 "github.com/scaleway/scaleway-sdk-go/api/baremetal/v3"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	sdkValidation "github.com/scaleway/scaleway-sdk-go/validation"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/cdf"
@@ -220,6 +221,16 @@ If this behaviour is wanted, please set 'reinstall_on_ssh_key_changes' argument
 								return locality.ExpandID(i.(string))
 							},
 						},
+						"ipam_ip_ids": {
+							Type:     schema.TypeList,
+							Optional: true,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type:             schema.TypeString,
+								ValidateDiagFunc: verify.IsUUIDorUUIDWithLocality(),
+							},
+							Description: "List of IPAM IP IDs to attach to the server",
+						},
 						// computed
 						"vlan": {
 							Type:        schema.TypeInt,
@@ -370,10 +381,10 @@ func ResourceServerCreate(ctx context.Context, d *schema.ResourceData, m interfa
 
 	privateNetworkIDs, pnExist := d.GetOk("private_network")
 	if pnExist {
-		createBaremetalPrivateNetworkRequest := &baremetal.PrivateNetworkAPISetServerPrivateNetworksRequest{
-			Zone:              zone,
-			ServerID:          server.ID,
-			PrivateNetworkIDs: expandPrivateNetworks(privateNetworkIDs),
+		createBaremetalPrivateNetworkRequest := &baremetalV3.PrivateNetworkAPISetServerPrivateNetworksRequest{
+			Zone:                       zone,
+			ServerID:                   server.ID,
+			PerPrivateNetworkIpamIPIDs: expandPrivateNetworks(privateNetworkIDs),
 		}
 
 		baremetalPrivateNetwork, err := privateNetworkAPI.SetServerPrivateNetworks(
@@ -457,7 +468,7 @@ func ResourceServerRead(ctx context.Context, d *schema.ResourceData, m interface
 	_ = d.Set("description", server.Description)
 	_ = d.Set("options", flattenOptions(server.Zone, server.Options))
 
-	listPrivateNetworks, err := privateNetworkAPI.ListServerPrivateNetworks(&baremetal.PrivateNetworkAPIListServerPrivateNetworksRequest{
+	listPrivateNetworks, err := privateNetworkAPI.ListServerPrivateNetworks(&baremetalV3.PrivateNetworkAPIListServerPrivateNetworksRequest{
 		Zone:     server.Zone,
 		ServerID: &server.ID,
 	})
@@ -533,12 +544,12 @@ func ResourceServerUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	}
 
 	if d.HasChange("private_network") {
-		privateNetworkIDs := d.Get("private_network")
+		privateNetworks := d.Get("private_network")
 
-		updateBaremetalPrivateNetworkRequest := &baremetal.PrivateNetworkAPISetServerPrivateNetworksRequest{
-			Zone:              zone,
-			ServerID:          server.ID,
-			PrivateNetworkIDs: expandPrivateNetworks(privateNetworkIDs),
+		updateBaremetalPrivateNetworkRequest := &baremetalV3.PrivateNetworkAPISetServerPrivateNetworksRequest{
+			Zone:                       zone,
+			ServerID:                   server.ID,
+			PerPrivateNetworkIpamIPIDs: expandPrivateNetworks(privateNetworks),
 		}
 
 		baremetalPrivateNetwork, err := privateNetworkAPI.SetServerPrivateNetworks(