Merge branch 'master' into feat/migrate_webhosting_to_v1

Author: remyleone

docs/guides/migrate-instance-volume-to-sbs.md

@@ -0,0 +1,130 @@
+---
+page_title: "Migrating the management of Instance Block Storage volumes to SBS"
+---
+
+# Migration
+
+This page describes how to migrate the management of your Instance's volumes from Block Storage legacy to SBS (Scaleway Block Storage).
+This documentation **only applies if you have created Block Storage legacy volumes** (`b_ssd`).
+
+Migration of local volumes is not supported, you will have to migrate your data manually.
+
+Find out about the advantages of migrating from the Instance API to the Block Storage API for managing block volumes in the [dedicated documentation](https://www.scaleway.com/en/docs/block-storage/reference-content/advantages-migrating-to-sbs/).
+
+## Migrate your implicit root_volume
+
+If your infrastructure includes a server with a root volume that must be migrated:
+
+```terraform
+resource scaleway_instance_server "server" {
+  type  = "PLAY2-PICO"
+  image = "ubuntu_jammy"
+  root_volume {
+    volume_type = "b_ssd"
+  }
+}
+```
+
+In the snippet above, the `root_volume` type is explicitly configured as a `b_ssd`. This configuration must be removed to prepare for migration.
+
+```terraform
+resource scaleway_instance_server "server" {
+  type  = "PLAY2-PICO"
+  image = "ubuntu_jammy"
+}
+```
+
+You can now migrate your root_volume using the [Scaleway CLI documentation](https://www.scaleway.com/en/docs/instances/how-to/migrate-volumes-snapshots-to-sbs/#migrating-an-existing-block-storage-volume-to-scaleway-block-storage-management).
+After migration, the output when running `terraform plan` should be empty as the provider should have picked up that the volume is now managed by the Scaleway Block Storage API.
+
+## Migrate your explicit volumes
+
+If your infrastructure includes servers and explicit volumes.
+
+```terraform
+resource scaleway_instance_volume "root_volume" {
+  size_in_gb = 20
+  type = "b_ssd"
+}
+
+resource scaleway_instance_volume "volume" {
+  size_in_gb = 20
+  type = "b_ssd"
+}
+
+resource scaleway_instance_server "server" {
+  type  = "PLAY2-PICO"
+  root_volume {
+    volume_id = scaleway_instance_volume.root_volume.id
+  }
+
+  additional_volume_ids = [scaleway_instance_volume.volume.id]
+}
+```
+
+You can rely on Terraform to perform the migration which will be done in 2 steps.
+The first one will be a transitional state to migrate and is described in the next snippet.
+In this snippet, the `migrate_to_sbs` field will prevent the old volume state from being updated during the migration.
+
+
+```terraform
+resource scaleway_instance_volume "root_volume" {
+  size_in_gb = 20
+  type = "b_ssd"
+  migrate_to_sbs = true # Mark migration to avoid failure
+}
+
+resource scaleway_block_volume "root_volume" {
+  size_in_gb = 20
+  iops = 5000 # b_ssd is a 5000 iops volume
+  instance_volume_id = scaleway_instance_volume.root_volume.id # block resource will handle migration
+}
+
+resource scaleway_instance_volume "volume" {
+  size_in_gb = 20
+  type = "b_ssd"
+  migrate_to_sbs = true # Mark migration to avoid failure
+}
+
+resource scaleway_block_volume "volume" {
+  size_in_gb = 20
+  iops = 5000 # b_ssd is a 5000 iops volume
+  instance_volume_id = scaleway_instance_volume.volume.id # block resource will handle migration
+}
+
+
+resource scaleway_instance_server "server" {
+  type  = "PLAY2-PICO"
+  root_volume {
+    volume_id = scaleway_block_volume.root_volume.id # Start using your new resource
+  }
+
+  additional_volume_ids = [scaleway_block_volume.volume.id] # Start using your new resource
+}
+```
+
+The first migration step should have created your new Block Storage volumes and updated the existing instance_volume resources.
+After confirming the migration is successful, you must remove the old Instance's resources manually.
+Terraform's scaleway_instance_volume resource cannot delete a volume that has been migrated to the Scaleway Block Storage API. Before applying the final step, check in the Scaleway [console](https://console.scaleway.com) or using the [CLI](https://cli.scaleway.com/block/#list-volumes) to confirm that your volume was successfully migrated.
+
+
+```terraform
+resource scaleway_block_volume "root_volume" {
+  size_in_gb = 20
+  iops = 5000
+}
+
+resource scaleway_block_volume "volume" {
+  size_in_gb = 20
+  iops = 5000
+}
+
+resource scaleway_instance_server "server" {
+  type  = "PLAY2-PICO"
+  root_volume {
+    volume_id = scaleway_block_volume.root_volume.id
+  }
+
+  additional_volume_ids = [scaleway_block_volume.volume.id]
+}
+```

docs/resources/baremetal_server.md

@@ -16,9 +16,14 @@ data "scaleway_iam_ssh_key" "main" {
   name = "main"
 }
 
+data "scaleway_baremetal_offer" "my_offer" {
+  zone = "fr-par-2"
+  name = "EM-I220E-NVME"
+}
+
 resource "scaleway_baremetal_server" "base" {
   zone		  = "fr-par-2"
-  offer       = "GP-BM1-S"
+  offer       = data.scaleway_baremetal_offer.my_offer.offer_id
   os          = "d17d6872-0412-45d9-a198-af82c34d3c5c"
   ssh_key_ids = [data.scaleway_account_ssh_key.main.id]
 }
@@ -201,11 +206,17 @@ resource "scaleway_iam_ssh_key" "main" {
   name 	   = "main"
 }
 
+data "scaleway_baremetal_offer" "my_offer" {
+  zone = "fr-par-1"
+  name = "EM-B220E-NVME"
+  subscription_period = "hourly"
+}
+
 resource "scaleway_baremetal_server" "base" {
   name        = "%s"
   zone        = "fr-par-1"
   description = "test a description"
-  offer       = "EM-B220E-NVME"
+  offer       = data.scaleway_baremetal_offer.my_offer.offer_id
   os    = data.scaleway_baremetal_os.my_os.os_id
   partitioning = var.configCustomPartitioning
 
@@ -219,7 +230,7 @@ resource "scaleway_baremetal_server" "base" {
 
 The following arguments are supported:
 
-- `offer` - (Required) The offer name or UUID of the baremetal server.
+- `offer` - (Required) The offer UUID of the baremetal server.
   Use [this endpoint](https://www.scaleway.com/en/developers/api/elastic-metal/#path-servers-get-a-specific-elastic-metal-server) to find the right offer.
 
 ~> **Important:** Updates to `offer` will recreate the server.