fix(baremetal): clean tests (#3009)

Author: Laure-di

internal/services/baremetal/offer_data_source_test.go

@@ -23,25 +23,21 @@ func TestAccDataSourceOffer_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
-	if !IsOfferAvailable(OfferID, Zone, tt) {
-		t.Skip("Offer is out of stock")
-	}
-
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
 					data "scaleway_baremetal_offer" "test1" {
-						zone = "fr-par-1"
+						zone = "%s"
 						name = "%s"
 					}
 					
 					data "scaleway_baremetal_offer" "test2" {
 						offer_id = data.scaleway_baremetal_offer.test1.offer_id
 					}
-				`, OfferName),
+				`, Zone, OfferName),
 				Check: resource.ComposeTestCheckFunc(
 					isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", OfferName),
@@ -75,18 +71,14 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
-	if !IsOfferAvailable(OfferID, Zone, tt) {
-		t.Skip("Offer is out of stock")
-	}
-
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
 					data "scaleway_baremetal_offer" "test1" {
-						zone = "fr-par-1"
+						zone = "%s"
 						name = "%s"
 
 						subscription_period = "hourly"
@@ -95,7 +87,7 @@ func TestAccDataSourceOffer_SubscriptionPeriodHourly(t *testing.T) {
 					data "scaleway_baremetal_offer" "test2" {
 						offer_id = data.scaleway_baremetal_offer.test1.offer_id
 					}
-				`, OfferName),
+				`, Zone, OfferName),
 				Check: resource.ComposeTestCheckFunc(
 					isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", OfferName),
@@ -131,18 +123,14 @@ func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
-	if !IsOfferAvailable(OfferID, Zone, tt) {
-		t.Skip("Offer is out of stock")
-	}
-
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
 					data "scaleway_baremetal_offer" "test1" {
-						zone = "fr-par-1"
+						zone = "%s"
 						name = "%s"
 
 						subscription_period = "monthly"
@@ -151,7 +139,7 @@ func TestAccDataSourceOffer_SubscriptionPeriodMonthly(t *testing.T) {
 					data "scaleway_baremetal_offer" "test2" {
 						offer_id = data.scaleway_baremetal_offer.test1.offer_id
 					}
-				`, OfferName),
+				`, Zone, OfferName),
 				Check: resource.ComposeTestCheckFunc(
 					isOfferPresent(tt, "data.scaleway_baremetal_offer.test1"),
 					resource.TestCheckResourceAttr("data.scaleway_baremetal_offer.test1", "name", OfferName),

internal/services/baremetal/server_data_source_test.go

@@ -28,13 +28,13 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
 			{
 				Config: fmt.Sprintf(`
 					data "scaleway_baremetal_os" "my_os" {
-						zone = "fr-par-1"
+						zone = "%s"
 						name = "Ubuntu"
 						version = "22.04 LTS (Jammy Jellyfish)"						
 					}
 
 					data "scaleway_baremetal_offer" "my_offer" {
-						zone = "fr-par-1"
+						zone = "%s"
 						name = "%s"
 					}
 
@@ -45,25 +45,25 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
 					
 					resource "scaleway_baremetal_server" "main" {
 						name        = "%s"
-						zone        = "fr-par-1"
+						zone        = "%s"
 						description = "test a description"
 						offer       = data.scaleway_baremetal_offer.my_offer.offer_id
 						os          = data.scaleway_baremetal_os.my_os.os_id
 					
 						ssh_key_ids = [ scaleway_iam_ssh_key.main.id ]
 					}
-				`, OfferName, SSHKeyName, SSHKeyBaremetal, name),
+				`, Zone, Zone, OfferName, SSHKeyName, SSHKeyBaremetal, name, Zone),
 			},
 			{
 				Config: fmt.Sprintf(`
 					data "scaleway_baremetal_os" "my_os" {
-						zone = "fr-par-1"
+						zone = "%s"
 						name = "Ubuntu"
 						version = "22.04 LTS (Jammy Jellyfish)"						
 					}
 
 					data "scaleway_baremetal_offer" "my_offer" {
-						zone = "fr-par-1"
+						zone = "%s"
 						name = "%s"
 					}
 
@@ -74,7 +74,7 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
 					
 					resource "scaleway_baremetal_server" "main" {
 						name        = "%s"
-						zone        = "fr-par-1"
+						zone        = "%s"
 						description = "test a description"
 						offer       = data.scaleway_baremetal_offer.my_offer.offer_id
 						os          = data.scaleway_baremetal_os.my_os.os_id
@@ -84,14 +84,14 @@ func TestAccDataSourceServer_Basic(t *testing.T) {
 
 					data "scaleway_baremetal_server" "by_name" {
 						name = "${scaleway_baremetal_server.main.name}"
-						zone = "fr-par-1"
+						zone = "%s"
 					}
 					
 					data "scaleway_baremetal_server" "by_id" {
 						server_id = "${scaleway_baremetal_server.main.id}"
-						zone = "fr-par-1"
+						zone = "%s"
 					}
-				`, OfferName, SSHKeyName, SSHKeyBaremetal, name),
+				`, Zone, Zone, OfferName, SSHKeyName, SSHKeyBaremetal, name, Zone, Zone, Zone),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckBaremetalServerExists(tt, "data.scaleway_baremetal_server.by_id"),
 					testAccCheckBaremetalServerExists(tt, "data.scaleway_baremetal_server.by_name"),