fix stash

Author: Laure-di

internal/services/baremetal/helpers.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
-	"github.com/scaleway/terraform-provider-scaleway/v2/internal/logging"
 	"sort"
 	"time"
 
@@ -229,13 +228,10 @@ func privateNetworkSetHash(v interface{}) int {
 
 func customDiffOffer() func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
 	return func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
-		logging.L.Debugf("customDiffOffer() function")
-
 		if diff.Get("offer") == "" || !diff.HasChange("offer") || diff.Id() == "" {
 			return nil
 		}
 		api, zone, err := NewAPIWithZoneAndID(i, diff.Id())
-		logging.L.Debugf("value of api is %v and zone is %v", api, zone)
 		if err != nil {
 			return err
 		}

internal/services/baremetal/server.go

@@ -54,28 +54,10 @@ func ResourceServer() *schema.Resource {
 				Description: "Hostname of the server",
 			},
 			"offer": {
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
-				Description: "ID or name of the server offer",
-				DiffSuppressFunc: func(_, oldValue, newValue string, d *schema.ResourceData) bool {
-					// remove the locality from the IDs when checking diff
-					if locality.ExpandID(newValue) == locality.ExpandID(oldValue) {
-						return true
-					}
-					// if the offer was provided by name
-					offerName, ok := d.GetOk("offer_name")
-
-					return ok && newValue == offerName
-				},
-				ValidateDiagFunc: verify.IsUUIDOrNameOffer(),
-=======
 				Type:             schema.TypeString,
 				Required:         true,
-				ForceNew:         true,
 				Description:      "ID or name of the server offer",
 				ValidateDiagFunc: verify.IsUUIDOrNameOffer(),
->>>>>>> Stashed changes
 			},
 			"offer_id": {
 				Type:        schema.TypeString,
@@ -271,10 +253,9 @@ If this behaviour is wanted, please set 'reinstall_on_ssh_key_changes' argument
 				Description: "The partitioning schema in json format",
 			},
 		},
-
 		CustomizeDiff: customdiff.Sequence(
-			cdf.LocalityCheck("private_network.#.id"),
 			customDiffOffer(),
+			cdf.LocalityCheck("private_network.#.id"),
 			customDiffPrivateNetworkOption(),
 		),
 	}

internal/services/baremetal/server_test.go

@@ -1043,7 +1043,7 @@ func TestAccServer_UpdateSubscriptionPeriod(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
-	//if !IsOfferAvailable(OfferID, "fr-par-2", tt) {
+	//if !IsOfferAvailable(OfferID, Zone", tt) {
 	//	t.Skip("Offer is out of stock")
 	//}
 
@@ -1058,7 +1058,7 @@ func TestAccServer_UpdateSubscriptionPeriod(t *testing.T) {
 				Config: fmt.Sprintf(`
 					
 					data "scaleway_baremetal_offer" "my_offer" {
-						zone = "fr-par-2"
+						zone = "%s"
 						name			 	= "EM-B112X-SSD"
 						subscription_period = "hourly"
 					
@@ -1067,27 +1067,27 @@ func TestAccServer_UpdateSubscriptionPeriod(t *testing.T) {
 					resource "scaleway_baremetal_server" "server01" {
 						name		= "TestAccServer_UpdateSubscriptionPeriod"
 						offer 		= data.scaleway_baremetal_offer.my_offer.offer_id
-						zone        = "fr-par-2"
+						zone        = "%s"
 						install_config_afterward   = true
 					
-					}`,
+					}`, Zone, Zone,
 				),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "subscription_period", "hourly"),
-					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "zone", "fr-par-2"),
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "zone", "fr-par-1"),
 				),
 			},
 			{
 				Config: fmt.Sprintf(`
 					data "scaleway_baremetal_offer" "my_offer" {
-						zone = "fr-par-2"
+						zone = "%s"
 						name			 	= "EM-B112X-SSD"
 						subscription_period = "hourly"
 					
 					}
 					
 					data "scaleway_baremetal_offer" "my_offer_monthly" {
-						zone = "fr-par-2"
+						zone = "%s"
 						name			 	= "EM-B112X-SSD"
 						subscription_period = "monthly"
 					
@@ -1096,26 +1096,25 @@ func TestAccServer_UpdateSubscriptionPeriod(t *testing.T) {
 					resource "scaleway_baremetal_server" "server01" {
 						name		= "TestAccServer_UpdateSubscriptionPeriod"
 						offer 		= data.scaleway_baremetal_offer.my_offer_monthly.offer_id
-						zone        = "fr-par-2"
+						zone        = "%s"
 						install_config_afterward   = true
 					
 					}`,
-				),
+					Zone, Zone, Zone),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "subscription_period", "monthly"),
-					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "zone", "fr-par-2"),
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "zone", "fr-par-1"),
 				),
 			},
 			{
 				Config: fmt.Sprintf(`
 					data "scaleway_baremetal_offer" "my_offer" {
-						zone = "fr-par-2"
+						zone = "%s"
 						name 	= "EM-B112X-SSD"
 						subscription_period = "hourly"
 					
 					}
 					data "scaleway_baremetal_offer" "my_offer_monthly" {
-						zone = "fr-par-2"
+						zone = "%s"
 						name			 	= "EM-B112X-SSD"
 						subscription_period = "monthly"
 					
@@ -1124,13 +1123,35 @@ func TestAccServer_UpdateSubscriptionPeriod(t *testing.T) {
 					resource "scaleway_baremetal_server" "server01" {
 						name 		= "Test_UpdateSubscriptionPeriod"
 						offer 		= data.scaleway_baremetal_offer.my_offer.offer_id
-						zone        = "fr-par-2"
+						zone        = "%s"
 						install_config_afterward   = true
 					
-					}`,
+					}`, Zone, Zone, Zone,
 				),
 				ExpectError: regexp.MustCompile("invalid plan transition: you cannot transition from a monthly plan to an hourly plan. Only the reverse (hourly to monthly) is supported. Please update your configuration accordingly"),
 			},
+			{
+				Config: fmt.Sprintf(`
+					
+					data "scaleway_baremetal_offer" "my_offer" {
+						zone = "%s"
+						name 	= "EM-B111X-SATA"
+						subscription_period = "hourly"
+					
+					}
+					
+					resource "scaleway_baremetal_server" "server01" {
+						name 		= "Test_UpdateSubscriptionPeriod"
+						offer 		= data.scaleway_baremetal_offer.my_offer.offer_id
+						zone        = "%s"
+						install_config_afterward   = true
+					
+					}`, Zone, Zone,
+				),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "zone", "fr-par-1"),
+				),
+			},
 		},
 	})