Merge branch 'master' into compress_rdb

Author: remyleone

docs/resources/instance_server.md

@@ -214,7 +214,7 @@ To retrieve more information by label please use: ```scw marketplace image get l
       To find the right size use [this endpoint](https://www.scaleway.com/en/developers/api/instance/#path-instances-list-all-instances) and
       check the `volumes_constraint.{min|max}_size` (in bytes) for your `commercial_type`.
       Depending on `volume_type`, updates to this field may recreate a new resource.
-    - `volume_type` - (Optional) Volume type of root volume, can be `b_ssd`, `l_ssd` or `sbs_volume`, default value depends on server type
+    - `volume_type` - (Optional) Volume type of root volume, can be `l_ssd` or `sbs_volume`, default value depends on server type
     - `delete_on_termination` - (Defaults to `true`) Forces deletion of the root volume on instance termination.
     - `sbs_iops` - (Optional) Choose IOPS of your sbs volume, has to be used with `sbs_volume` for root volume type.
 

internal/services/baremetal/offer_data_source_test.go

@@ -48,7 +48,6 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
-					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "stock", "available"), // skipping this as stocks vary too much
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "AMD EPYC 7232P"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "8"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3100"),
@@ -100,7 +99,6 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "include_disabled", "false"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "bandwidth", "1000000000"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "commercial_range", "beryllium"),
-					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "stock", "available"), // skipping this as stocks vary too much
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.name", "AMD EPYC 7232P"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.core_count", "8"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test2", "cpu.0.frequency", "3100"),

internal/services/baremetal/testdata/data-source-offer-basic.cassette.yaml

@@ -58,8 +58,8 @@ func DataSourceMarketplaceImageRead(ctx context.Context, d *schema.ResourceData,
 	zonedID := datasource.NewZonedID(image.ID, zone)
 	d.SetId(zonedID)
 	_ = d.Set("zone", zone)
-	_ = d.Set("label", d.Get("label"))
-	_ = d.Set("instance_type", d.Get("type"))
+	_ = d.Set("label", image.Label)
+	_ = d.Set("instance_type", d.Get("instance_type").(string))
 	_ = d.Set("image_type", image.Type)
 
 	return nil