add guide link and logs

yfodil · yfodil · commit 61316ee8d39a · 2025-03-25T12:10:14.000+01:00
diff --git a/docs/data-sources/vpc_public_gateway_dhcp.md b/docs/data-sources/vpc_public_gateway_dhcp.md
@@ -7,6 +7,7 @@ page_title: "Scaleway: scaleway_vpc_public_gateway_dhcp"
 
 ~> **Important:**  The data source `scaleway_vpc_public_gateway_dhcp` has been deprecated and will no longer be supported.
 In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed.
+For more information, please refer to the [dedicated guide](../guides/migration_guide_vpcgw_v2.md).
 
 Gets information about a Public Gateway DHCP configuration.
 
diff --git a/docs/data-sources/vpc_public_gateway_dhcp_reservation.md b/docs/data-sources/vpc_public_gateway_dhcp_reservation.md
@@ -7,7 +7,7 @@ page_title: "Scaleway: scaleway_vpc_public_gateway_dhcp_reservation"
 
 ~> **Important:**  The data source `scaleway_vpc_public_gateway_dhcp_reservation` has been deprecated and will no longer be supported.
 In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed.
-You can use IPAM to manage your IPs.
+You can use IPAM to manage your IPs. For more information, please refer to the [dedicated guide](../guides/migration_guide_vpcgw_v2.md).
 
 Gets information about a DHCP entry. For further information, please see the
 [API documentation](https://www.scaleway.com/en/developers/api/public-gateway/#path-dhcp-entries-list-dhcp-entries).
diff --git a/docs/resources/vpc_gateway_network.md b/docs/resources/vpc_gateway_network.md
@@ -89,12 +89,17 @@ The following arguments are supported:
 - `ipam_config` - Auto-configure the GatewayNetwork using Scaleway's IPAM (IP address management service). Only one of `dhcp_id`, `static_address` and `ipam_config` should be specified.
     - `push_default_route` - Defines whether to enable the default route on the GatewayNetwork.
     - `ipam_ip_id` - Use this IPAM-booked IP ID as the Gateway's IP in this Private Network.
-- `enable_masquerade` - (Defaults to true) Whether masquerade (dynamic NAT) should be enabled on this GatewayNetwork
+- `enable_masquerade` - (Defaults to true) Whether masquerade (dynamic NAT) should be enabled on this GatewayNetwork.
+- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the gateway network should be created.
+
+~> **Important:**  
+In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP fields are now deprecated.
+For more information, please refer to the [dedicated guide](../guides/migration_guide_vpcgw_v2.md).
+
 - `dhcp_id` - (Deprecated) Please use `ipam_config`. The ID of the Public Gateway DHCP configuration. Only one of `dhcp_id`, `static_address` and `ipam_config` should be specified.
 - `enable_dhcp` - (Deprecated) Please use `ipam_config`. Whether a DHCP configuration should be enabled on this GatewayNetwork. Requires a DHCP ID.
 - `cleanup_dhcp` - (Deprecated) Please use `ipam_config`. Whether to remove DHCP configuration on this GatewayNetwork upon destroy. Requires DHCP ID.
 - `static_address` - (Deprecated) Please use `ipam_config`. Enable DHCP configration on this GatewayNetwork. Only one of `dhcp_id`, `static_address` and `ipam_config` should be specified.
-- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the gateway network should be created.
 
 ## Attributes Reference
 
diff --git a/docs/resources/vpc_public_gateway.md b/docs/resources/vpc_public_gateway.md
@@ -59,10 +59,11 @@ The following arguments are supported:
 - `tags` - (Optional) The tags to associate with the Public Gateway.
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the Public Gateway should be created.
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the public gateway is associated with.
-- `upstream_dns_servers` - (Optional) Override the gateway's default recursive DNS servers, if DNS features are enabled.
+- `upstream_dns_servers` - (Deprecated) Override the gateway's default recursive DNS servers, if DNS features are enabled.
 - `ip_id` - (Optional) Attach an existing flexible IP to the gateway.
 - `bastion_enabled` - (Optional) Enable SSH bastion on the gateway.
 - `bastion_port` - (Optional) The port on which the SSH bastion will listen.
+- `allowed_ip_ranges` - (Optional) Set a definitive list of IP ranges (in CIDR notation) allowed to connect to the SSH bastion.
 - `enable_smtp` - (Optional) Enable SMTP on the gateway.
 - `refresh_ssh_keys` - (Optional) Trigger a refresh of the SSH keys on the Public Gateway by changing this field's value.
 
diff --git a/docs/resources/vpc_public_gateway_dhcp.md b/docs/resources/vpc_public_gateway_dhcp.md
@@ -7,6 +7,7 @@ page_title: "Scaleway: scaleway_vpc_public_gateway_dhcp"
 
 ~> **Important:**  The resource `scaleway_vpc_public_gateway_dhcp` has been deprecated and will no longer be supported.
 In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed.
+For more information, please refer to the [dedicated guide](../guides/migration_guide_vpcgw_v2.md).
 
 Creates and manages Scaleway VPC Public Gateway DHCP configurations.
 For more information, see the [API documentation](https://www.scaleway.com/en/developers/api/public-gateway/#dhcp-c05544).
diff --git a/docs/resources/vpc_public_gateway_dhcp_reservation.md b/docs/resources/vpc_public_gateway_dhcp_reservation.md
@@ -7,7 +7,7 @@ page_title: "Scaleway: scaleway_vpc_public_gateway_dhcp_reservation"
 
 ~> **Important:**  The resource `scaleway_vpc_public_gateway_dhcp_reservation` has been deprecated and will no longer be supported.
 In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed.
-You can use IPAM to manage your IPs.
+You can use IPAM to manage your IPs. For more information, please refer to the [dedicated guide](../guides/migration_guide_vpcgw_v2.md).
 
 Creates and manages [Scaleway DHCP Reservations](https://www.scaleway.com/en/docs/vpc/concepts/#dhcp).
 
diff --git a/internal/services/vpcgw/dhcp.go b/internal/services/vpcgw/dhcp.go
@@ -127,7 +127,7 @@ func ResourceDHCP() *schema.Resource {
 				Description: "The date and time of the last update of the public gateway.",
 			},
 		},
-		DeprecationMessage: "The 'dhcp' resource is deprecated. In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed.",
+		DeprecationMessage: "The 'dhcp' resource is deprecated. In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed. For more information, please refer to the dedicated guide: https://github.com/scaleway/terraform-provider-scaleway/blob/master/docs/guides/migration_guide_vpcgw_v2.md",
 	}
 }
 
diff --git a/internal/services/vpcgw/dhcp_reservation.go b/internal/services/vpcgw/dhcp_reservation.go
@@ -75,7 +75,7 @@ func ResourceDHCPReservation() *schema.Resource {
 			"zone": zonal.Schema(),
 		},
 		CustomizeDiff:      cdf.LocalityCheck("gateway_network_id"),
-		DeprecationMessage: "The 'dhcp_reservation' resource is deprecated. In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed. You can use IPAM to manage your IPs",
+		DeprecationMessage: "The 'dhcp_reservation' resource is deprecated. In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed. You can use IPAM to manage your IPs. For more information, please refer to the dedicated guide: https://github.com/scaleway/terraform-provider-scaleway/blob/master/docs/guides/migration_guide_vpcgw_v2.md",
 	}
 }
 
diff --git a/internal/services/vpcgw/network.go b/internal/services/vpcgw/network.go
@@ -65,7 +65,7 @@ func ResourceNetwork() *schema.Resource {
 
 					return oldValue == newValue
 				},
-				Deprecated: "Please use ipam_config",
+				Deprecated: "Please use ipam_config. For more information, please refer to the dedicated guide: https://github.com/scaleway/terraform-provider-scaleway/blob/master/docs/guides/migration_guide_vpcgw_v2.md",
 			},
 			"enable_masquerade": {
 				Type:        schema.TypeBool,
@@ -77,14 +77,14 @@ func ResourceNetwork() *schema.Resource {
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Description: "Enable DHCP config on this network",
-				Deprecated:  "Please use ipam_config",
+				Deprecated:  "Please use ipam_config. For more information, please refer to the dedicated guide: https://github.com/scaleway/terraform-provider-scaleway/blob/master/docs/guides/migration_guide_vpcgw_v2.md",
 			},
 			"cleanup_dhcp": {
 				Type:        schema.TypeBool,
 				Optional:    true,
 				Computed:    true,
 				Description: "Remove DHCP config on this network on destroy",
-				Deprecated:  "Please use ipam_config",
+				Deprecated:  "Please use ipam_config. For more information, please refer to the dedicated guide: https://github.com/scaleway/terraform-provider-scaleway/blob/master/docs/guides/migration_guide_vpcgw_v2.md",
 			},
 			"static_address": {
 				Type:          schema.TypeString,
@@ -93,7 +93,7 @@ func ResourceNetwork() *schema.Resource {
 				Computed:      true,
 				ValidateFunc:  validation.IsCIDR,
 				ConflictsWith: []string{"dhcp_id", "ipam_config"},
-				Deprecated:    "Please use ipam_config",
+				Deprecated:    "Please use ipam_config. For more information, please refer to the dedicated guide: https://github.com/scaleway/terraform-provider-scaleway/blob/master/docs/guides/migration_guide_vpcgw_v2.md",
 			},
 			"ipam_config": {
 				Type:          schema.TypeList,
@@ -211,6 +211,7 @@ func ResourceVPCGatewayNetworkRead(ctx context.Context, d *schema.ResourceData,
 	if err != nil {
 		if httperrors.Is412(err) {
 			// Fallback to v1 API.
+			tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
 			gatewayV1, err := waitForVPCGatewayNetwork(ctx, apiV1, zone, ID, d.Timeout(schema.TimeoutRead))
 			if err != nil {
 				return diag.FromErr(err)
@@ -243,6 +244,7 @@ func ResourceVPCGatewayNetworkUpdate(ctx context.Context, d *schema.ResourceData
 	_, err = waitForVPCGatewayNetworkV2(ctx, api, zone, id, d.Timeout(schema.TimeoutUpdate))
 	if err != nil {
 		if httperrors.Is412(err) {
+			tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
 			_, err = waitForVPCGatewayNetwork(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
 			if err != nil {
 				return diag.FromErr(err)
@@ -252,13 +254,14 @@ func ResourceVPCGatewayNetworkUpdate(ctx context.Context, d *schema.ResourceData
 		return diag.FromErr(err)
 	}
 
-	if err := updateGWNetwork(ctx, d, api, apiV1, zone, id); err != nil {
+	if err = updateGWNetwork(ctx, d, api, apiV1, zone, id); err != nil {
 		return diag.FromErr(err)
 	}
 
 	_, err = waitForVPCGatewayNetworkV2(ctx, api, zone, id, d.Timeout(schema.TimeoutUpdate))
 	if err != nil {
 		if httperrors.Is412(err) {
+			tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
 			_, err = waitForVPCGatewayNetwork(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
 			if err != nil {
 				return diag.FromErr(err)
@@ -285,6 +288,7 @@ func ResourceVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData
 	gwNetwork, err := waitForVPCGatewayNetworkV2(ctx, api, zone, id, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		if httperrors.Is412(err) {
+			tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
 			_, err = waitForVPCGatewayNetwork(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
 			if err != nil {
 				return diag.FromErr(err)
@@ -311,6 +315,7 @@ func ResourceVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData
 	case httperrors.Is404(err):
 		return nil
 	case httperrors.Is412(err):
+		tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for gateway network stabilization")
 		_, err = waitForVPCGatewayNetwork(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutDelete))
 		if err != nil && !httperrors.Is404(err) {
 			return diag.FromErr(err)
@@ -326,6 +331,7 @@ func ResourceVPCGatewayNetworkDelete(ctx context.Context, d *schema.ResourceData
 	case httperrors.Is404(err):
 		return nil
 	case httperrors.Is412(err):
+		tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
 		_, err = waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutDelete))
 		if err != nil && !httperrors.Is404(err) {
 			return diag.FromErr(err)
diff --git a/internal/services/vpcgw/public_gateway.go b/internal/services/vpcgw/public_gateway.go
@@ -3,6 +3,7 @@ package vpcgw
 import (
 	"context"
 
+	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	v1 "github.com/scaleway/scaleway-sdk-go/api/vpcgw/v1"
@@ -200,6 +201,7 @@ func ResourceVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData, m
 	if err != nil {
 		if httperrors.Is412(err) {
 			// Fallback to v1 API.
+			tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
 			gatewayV1, err := waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
 			if err != nil {
 				return diag.FromErr(err)
@@ -237,20 +239,23 @@ func ResourceVPCPublicGatewayUpdate(ctx context.Context, d *schema.ResourceData,
 		if err != nil {
 			return diag.FromErr(err)
 		}
-	}
 
-	_, err = waitForVPCPublicGatewayV2(ctx, api, zone, id, d.Timeout(schema.TimeoutCreate))
-	if err != nil {
-		return diag.FromErr(err)
+		_, err = waitForVPCPublicGatewayV2(ctx, api, zone, id, d.Timeout(schema.TimeoutCreate))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		tflog.Info(ctx, "Public Gateway successfully moved to IPAM mode")
 	}
 
-	if err := updateGateway(ctx, d, api, apiV1, zone, id); err != nil {
+	if err = updateGateway(ctx, d, api, apiV1, zone, id); err != nil {
 		return diag.FromErr(err)
 	}
 
 	_, err = waitForVPCPublicGatewayV2(ctx, api, zone, id, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		if httperrors.Is412(err) {
+			tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
 			_, err = waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
 			if err != nil {
 				return diag.FromErr(err)
@@ -277,6 +282,7 @@ func ResourceVPCPublicGatewayDelete(ctx context.Context, d *schema.ResourceData,
 	_, err = waitForVPCPublicGatewayV2(ctx, api, zone, id, d.Timeout(schema.TimeoutCreate))
 	if err != nil {
 		if httperrors.Is412(err) {
+			tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
 			_, err = waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutCreate))
 			if err != nil {
 				return diag.FromErr(err)
@@ -301,6 +307,7 @@ func ResourceVPCPublicGatewayDelete(ctx context.Context, d *schema.ResourceData,
 	case httperrors.Is404(err):
 		return nil
 	case httperrors.Is412(err):
+		tflog.Warn(ctx, "v2 API returned 412, falling back to v1 API to wait for public gateway stabilization")
 		_, err = waitForVPCPublicGateway(ctx, apiV1, zone, id, d.Timeout(schema.TimeoutDelete))
 		if err != nil && !httperrors.Is404(err) {
 			return diag.FromErr(err)

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func ResourceDHCP() *schema.Resource {`
`127`	`127`	`Description: "The date and time of the last update of the public gateway.",`
`128`	`128`	`},`
`129`	`129`	`},`
`130`		`- DeprecationMessage: "The 'dhcp' resource is deprecated. In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed.",`
	`130`	`+ DeprecationMessage: "The 'dhcp' resource is deprecated. In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed. For more information, please refer to the dedicated guide: https://github.com/scaleway/terraform-provider-scaleway/blob/master/docs/guides/migration_guide_vpcgw_v2.md",`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func ResourceDHCPReservation() *schema.Resource {`
`75`	`75`	`"zone": zonal.Schema(),`
`76`	`76`	`},`
`77`	`77`	`CustomizeDiff: cdf.LocalityCheck("gateway_network_id"),`
`78`		`- DeprecationMessage: "The 'dhcp_reservation' resource is deprecated. In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed. You can use IPAM to manage your IPs",`
	`78`	`+ DeprecationMessage: "The 'dhcp_reservation' resource is deprecated. In 2023, DHCP functionality was moved from Public Gateways to Private Networks, DHCP resources are now no longer needed. You can use IPAM to manage your IPs. For more information, please refer to the dedicated guide: https://github.com/scaleway/terraform-provider-scaleway/blob/master/docs/guides/migration_guide_vpcgw_v2.md",`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`