Merge branch 'feat/support-route-waf-on-cache-tls' of github.com:yfodil/terraform-provider-scaleway into feat/support-route-waf-on-cache-tls

Author: yfodil

.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 }}

.golangci.yml

@@ -105,6 +105,10 @@ linters:
     - varnamelen # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
 
   settings:
+    govet:
+      disable-all: true
+      enable:
+        - fieldalignment
     goconst:
       min-len: 5
     gosec:

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.
@@ -258,6 +254,8 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 - `replace_on_type_change` - (Defaults to false) If true, the server will be replaced if `type` is changed. Otherwise, the server will migrate.
 
+- `protected` - (Optional) Set to true to activate server protection option.
+
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the server should be created.
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the server is associated with.

go.mod

@@ -1,6 +1,7 @@
 module github.com/scaleway/terraform-provider-scaleway/v2
 
 go 1.24.0
+
 require (
 	github.com/aws/aws-sdk-go-v2 v1.36.3
 	github.com/aws/aws-sdk-go-v2/config v1.29.9
@@ -25,7 +26,7 @@ require (
 	github.com/nats-io/jwt/v2 v2.7.3
 	github.com/nats-io/nats.go v1.38.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250320132958-0f59cae533d0
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250407124844-38ab1ca8e81d
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/crypto v0.36.0
 	gopkg.in/dnaeon/go-vcr.v3 v3.2.0

go.sum

@@ -296,8 +296,8 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250320132958-0f59cae533d0 h1:aqpUaCWx5ta43b9dZv1bMIvUUJTux9Am+S7RmJbiVN8=
-github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250320132958-0f59cae533d0/go.mod h1:792k1RTU+5JeMXm35/e2Wgp71qPH/DmDoZrRc+EFZDk=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250407124844-38ab1ca8e81d h1:EjD1RHPgsTomVw0lKgZu6YHK4ZMSBkSjeFrirnvWBcw=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250407124844-38ab1ca8e81d/go.mod h1:792k1RTU+5JeMXm35/e2Wgp71qPH/DmDoZrRc+EFZDk=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

internal/datasource/search.go

@@ -60,8 +60,8 @@ func notFound(err error) bool {
 }
 
 type TooManyResultsError struct {
-	Count       int
 	LastRequest interface{}
+	Count       int
 }
 
 func (e *TooManyResultsError) Error() string {

internal/meta/meta.go

@@ -75,13 +75,13 @@ func (m Meta) ZoneSource() string {
 
 type Config struct {
 	ProviderSchema      *schema.ResourceData
+	HTTPClient          *http.Client
 	TerraformVersion    string
 	ForceZone           scw.Zone
 	ForceProjectID      string
 	ForceOrganizationID string
 	ForceAccessKey      string
 	ForceSecretKey      string
-	HTTPClient          *http.Client
 }
 
 // NewMeta creates the Meta object containing the SDK client.
@@ -247,26 +247,26 @@ func loadProfile(ctx context.Context, d *schema.ResourceData) (*scw.Profile, *Cr
 // GetCredentialsSource infers the source of the credentials based on the priority order of the different profiles
 func GetCredentialsSource(defaultZoneProfile, activeProfile, providerProfile, envProfile *scw.Profile) *CredentialsSource {
 	type SourceProfilePair struct {
-		Source  string
 		Profile *scw.Profile
+		Source  string
 	}
 
 	profilesInOrder := []SourceProfilePair{
 		{
-			CredentialsSourceDefault,
-			defaultZoneProfile,
+			Source:  CredentialsSourceDefault,
+			Profile: defaultZoneProfile,
 		},
 		{
-			CredentialsSourceActiveProfile,
-			activeProfile,
+			Source:  CredentialsSourceActiveProfile,
+			Profile: activeProfile,
 		},
 		{
-			CredentialsSourceProviderProfile,
-			providerProfile,
+			Source:  CredentialsSourceProviderProfile,
+			Profile: providerProfile,
 		},
 		{
-			CredentialsSourceEnvironment,
-			envProfile,
+			Source:  CredentialsSourceEnvironment,
+			Profile: envProfile,
 		},
 	}
 	credentialsSource := &CredentialsSource{}