Merge branch 'master' into patch-1

Author: remyleone

.github/workflows/announce.yaml

@@ -10,15 +10,15 @@ jobs:
     steps:
       - name: Get tag
         id: get_tag
-        run: echo "{TAG}=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+        run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
       - name: Get version
         id: get_version
-        run: echo "{VERSION}=${TAG##v}" >> $GITHUB_OUTPUT
+        run: echo "VERSION=${TAG##v}" >> $GITHUB_OUTPUT
         env:
           TAG: ${{ steps.get_tag.outputs.TAG }}
       - name: Prepare message
         id: get_message
-        run: echo "{MSG}=${{ secrets.SLACK_MESSAGE }}" >> $GITHUB_OUTPUT
+        run: echo "MSG=${{ secrets.SLACK_MESSAGE }}" >> $GITHUB_OUTPUT
         env:
           VERSION: ${{ steps.get_version.outputs.VERSION }}
           TAG: ${{ steps.get_tag.outputs.TAG }}

docs/data-sources/instance_server.md

@@ -63,8 +63,6 @@ attached to the server.
 
 - `enable_dynamic_ip` - True if dynamic IP in enable on the server.
 
-- `routed_ip_enabled` - True if the server support routed ip only.
-
 - `state` - The state of the server. Possible values are: `started`, `stopped` or `standby`.
 
 - `cloud_init` - The cloud init script associated with this server.

docs/data-sources/instance_servers.md

@@ -60,7 +60,6 @@ In addition to all above arguments, the following attributes are exported:
     - `ipv6_address` - The default ipv6 address routed to the server. ( Only set when enable_ipv6 is set to true )
     - `ipv6_gateway` - The ipv6 gateway address. ( Only set when enable_ipv6 is set to true )
     - `ipv6_prefix_length` - The prefix length of the ipv6 subnet routed to the server. ( Only set when enable_ipv6 is set to true )
-    - `routed_ip_enabled` - True if the server support routed ip only.
     - `enable_dynamic_ip` - If true a dynamic IP will be attached to the server.
     - `image` - The UUID or the label of the base image used by the server.
     - `placement_group_id` - The [placement group](https://developers.scaleway.com/en/products/instance/api/#placement-groups-d8f653) the server is attached to.

docs/resources/baremetal_server.md

@@ -226,6 +226,47 @@ resource "scaleway_baremetal_server" "base" {
 
 ```
 
+### Migrate from hourly to monthly plan
+
+To migrate from an hourly to a monthly subscription for a Scaleway Baremetal server, it is important to understand that the migration can only be done by using the data source.
+You cannot directly modify the subscription_period of an existing scaleway_baremetal_offer resource. Instead, you must define the monthly offer using the data source and then update the server configuration accordingly.
+
+#### Hourly Plan Example
+
+```terraform
+data "scaleway_baremetal_offer" "my_offer" {
+  zone = "fr-par-1"
+  name = "EM-B220E-NVME"
+  subscription_period = "hourly"
+}
+
+resource "scaleway_baremetal_server" "server01" {
+  name = "UpdateSubscriptionPeriod"
+  offer = data.scaleway_baremetal_offer.my_offer.offer_id
+  zone = "%s"
+  install_config_afterward = true
+}
+```
+
+#### Monthly Plan Example
+
+```terraform
+data "scaleway_baremetal_offer" "my_offer" {
+  zone = "fr-par-1"
+  name = "EM-B220E-NVME"
+  subscription_period = "monthly"
+}
+
+resource "scaleway_baremetal_server" "server01" {
+  name = "UpdateSubscriptionPeriod"
+  offer = data.scaleway_baremetal_offer.my_offer.offer_id
+  zone = "fr-par-1"
+  install_config_afterward = true
+}
+```
+
+**Important**  Once you migrate to a monthly subscription, you cannot downgrade back to an hourly plan. Ensure that the monthly plan meets your needs before making the switch.
+
 ## Argument Reference
 
 The following arguments are supported:

docs/resources/instance_server.md

@@ -227,7 +227,7 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 ~> **Important:** If this field contains local volumes, you have to first detach them, in one apply, and then delete the volume in another apply.
 
-- `enable_ipv6` - (Defaults to `false`) Determines if IPv6 is enabled for the server. Useful only with `routed_ip_enabled` as false, otherwise ipv6 is always supported.
+- `enable_ipv6` - (Defaults to `false`) Determines if IPv6 is enabled for the server.
   Deprecated: Please use a scaleway_instance_ip with a `routed_ipv6` type.
 
 - `ip_id` - (Optional) The ID of the reserved IP that is attached to the server.
@@ -238,10 +238,6 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 - `enable_dynamic_ip` - (Defaults to `false`) If true a dynamic IP will be attached to the server.
 
-- `routed_ip_enabled` - (Defaults to `true`) If true, the server will support routed ips only. Changing it to true will migrate the server and its IP to routed type.
-
-~> **Important:** Enabling routed ip will restart the server
-
 - `state` - (Defaults to `started`) The state of the server. Possible values are: `started`, `stopped` or `standby`.
 
 - `user_data` - (Optional) The user data associated with the server.

internal/services/baremetal/helpers.go

@@ -12,8 +12,10 @@ import (
 	"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/scaleway-sdk-go/validation"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
@@ -224,3 +226,51 @@ func privateNetworkSetHash(v interface{}) int {
 
 	return schema.HashString(buf.String())
 }
+
+func getOfferInformations(ctx context.Context, offer interface{}, id string, i interface{}) (*baremetal.Offer, error) {
+	api, zone, err := NewAPIWithZoneAndID(i, id)
+	if err != nil {
+		return nil, err
+	}
+
+	if validation.IsUUID(regional.ExpandID(offer.(string)).ID) {
+		offerID := regional.ExpandID(offer.(string))
+
+		return FindOfferByID(ctx, api, zone.Zone, offerID.ID)
+	} else {
+		return api.GetOfferByName(&baremetal.GetOfferByNameRequest{
+			OfferName: offer.(string),
+			Zone:      zone.Zone,
+		})
+	}
+}
+
+func customDiffOffer() func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
+	return func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
+		if diff.Get("offer") == "" || !diff.HasChange("offer") || diff.Id() == "" {
+			return nil
+		}
+
+		oldOffer, newOffer := diff.GetChange("offer")
+
+		oldOfferInfo, err := getOfferInformations(ctx, oldOffer, diff.Id(), i)
+		if err != nil {
+			return errors.New(err.Error())
+		}
+
+		newOfferInfo, err := getOfferInformations(ctx, newOffer, diff.Id(), i)
+		if err != nil {
+			return errors.New(err.Error())
+		}
+
+		if oldOfferInfo.Name != newOfferInfo.Name {
+			return diff.ForceNew("offer")
+		}
+
+		if oldOfferInfo.SubscriptionPeriod == baremetal.OfferSubscriptionPeriodMonthly && newOfferInfo.SubscriptionPeriod == baremetal.OfferSubscriptionPeriodHourly {
+			return errors.New("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")
+		}
+
+		return nil
+	}
+}

internal/services/baremetal/server.go

@@ -18,6 +18,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/dsf"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
@@ -54,10 +55,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",
+				Type:             schema.TypeString,
+				Required:         true,
+				Description:      "ID or name of the server offer",
+				ValidateDiagFunc: verify.IsUUIDOrNameOffer(),
 				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) {
@@ -68,7 +69,6 @@ func ResourceServer() *schema.Resource {
 
 					return ok && newValue == offerName
 				},
-				ValidateDiagFunc: verify.IsUUIDOrNameOffer(),
 			},
 			"offer_id": {
 				Type:        schema.TypeString,
@@ -264,8 +264,8 @@ If this behaviour is wanted, please set 'reinstall_on_ssh_key_changes' argument
 				Description: "The partitioning schema in json format",
 			},
 		},
-
 		CustomizeDiff: customdiff.Sequence(
+			customDiffOffer(),
 			cdf.LocalityCheck("private_network.#.id"),
 			customDiffPrivateNetworkOption(),
 		),
@@ -529,6 +529,26 @@ func ResourceServerUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	var serverGetOptionIDs []*baremetal.ServerOption
 	serverGetOptionIDs = append(serverGetOptionIDs, server.Options...)
 
+	if d.HasChange("offer") {
+		ServerID := regional.ExpandID(server.ID)
+
+		_, err = api.MigrateServerToMonthlyOffer(&baremetal.MigrateServerToMonthlyOfferRequest{
+			Zone:     zonedID.Zone,
+			ServerID: ServerID.ID,
+		}, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		_, err := api.WaitForServer(&baremetal.WaitForServerRequest{
+			Zone:     zonedID.Zone,
+			ServerID: ServerID.ID,
+		})
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("options") {
 		options, err := expandOptions(d.Get("options"))
 		if err != nil {

internal/services/baremetal/server_test.go

@@ -1039,6 +1039,100 @@ func TestAccServer_WithIPAMPrivateNetwork(t *testing.T) {
 	})
 }
 
+func TestAccServer_UpdateSubscriptionPeriod(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+
+	newOffer := "EM-B320E-NVME"
+
+	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,
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			baremetalchecks.CheckServerDestroy(tt),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					data "scaleway_baremetal_offer" "my_offer" {
+						zone = "%s"
+						name = "%s"
+						subscription_period = "hourly"
+					}
+
+					resource "scaleway_baremetal_server" "server01" {
+						name = "TestAccServer_UpdateSubscriptionPeriod"
+						offer = data.scaleway_baremetal_offer.my_offer.offer_id
+						zone = "%s"
+						install_config_afterward = true
+					}`, Zone, OfferName, Zone),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "zone", Zone),
+					resource.TestCheckResourceAttrPair("scaleway_baremetal_server.server01", "offer_id", "data.scaleway_baremetal_offer.my_offer", "offer_id"),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					data "scaleway_baremetal_offer" "my_offer" {
+						zone = "%s"
+						name = "%s"
+						subscription_period = "monthly"
+					}
+
+					resource "scaleway_baremetal_server" "server01" {
+						name = "TestAccServer_UpdateSubscriptionPeriod"
+						offer = data.scaleway_baremetal_offer.my_offer.offer_id
+						zone = "%s"
+						install_config_afterward = true
+					}`, Zone, OfferName, Zone),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "zone", Zone),
+					resource.TestCheckResourceAttrPair("scaleway_baremetal_server.server01", "offer_id", "data.scaleway_baremetal_offer.my_offer", "offer_id"),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+					data "scaleway_baremetal_offer" "my_offer" {
+						zone = "%s"
+						name = "%s"
+						subscription_period = "hourly"
+					}
+
+					resource "scaleway_baremetal_server" "server01" {
+						name = "TestAccServer_UpdateSubscriptionPeriod"
+						offer = data.scaleway_baremetal_offer.my_offer.offer_id
+						zone = "%s"
+						install_config_afterward = true
+					}`, Zone, OfferName, 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 = "%s"
+						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, newOffer, Zone),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.server01", "zone", "fr-par-1"),
+					resource.TestCheckResourceAttrPair("scaleway_baremetal_server.server01", "offer_id", "data.scaleway_baremetal_offer.my_offer", "offer_id"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckBaremetalServerExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]