feat(rdb): private_network test

Author: scaleway-bot

docs/resources/lb.md

@@ -21,6 +21,7 @@ resource "scaleway_lb" "base" {
   ip_id  = scaleway_lb_ip.ip.id
   zone = "fr-par-1"
   type   = "LB-S"
+  release_ip = true
 }
 ```
 
@@ -40,6 +41,8 @@ The following arguments are supported:
 
 - `tags` - (Optional) The tags associated with the load-balancers.
 
+- `release_ip` - (Defaults to false) The release_ip allow release the ip address associated with the load-balancers.
+
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the IP should be reserved.
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the load-balancer is associated with.
@@ -77,6 +80,7 @@ resource "scaleway_lb" "base" {
   ip_id  = scaleway_lb_ip.ip.id
   zone = "fr-par-1"
   type   = "LB-S"
+  release_ip = true
 }
 ```
 

docs/resources/lb_backend.md

@@ -50,7 +50,7 @@ The following arguments are supported:
 - `forward_port`                - (Required) User sessions will be forwarded to this port of backend servers.
 - `forward_port_algorithm`      - (Default: `roundrobin`) Load balancing algorithm. Possible values are: `roundrobin`, `leastconn` and `first`.
 - `sticky_sessions`             - (Default: `none`) Load balancing algorithm. Possible values are: `none`, `cookie` and `table`.
-- `sticky_sessions_cookie_name` - (Optional) Cookie name for for sticky sessions. Only applicable when sticky_sessions is set to `cookie`.
+- `sticky_sessions_cookie_name` - (Optional) Cookie name for sticky sessions. Only applicable when sticky_sessions is set to `cookie`.
 - `server_ips`                  - (Optional) List of backend server IP addresses. Addresses can be either IPv4 or IPv6.
 - `send_proxy_v2`               - DEPRECATED please use `proxy_protocol` instead - (Default: `false`) Enables PROXY protocol version 2.
 - `proxy_protocol`              - (Default: `none`) Choose the type of PROXY protocol to enable (`none`, `v1`, `v2`, `v2_ssl`, `v2_ssl_cn`)

docs/resources/lb_private_network.md

@@ -0,0 +1,69 @@
+---
+page_title: "Scaleway: scaleway_lb_private_network"
+description: |-
+Manages Scaleway Load-Balancers private networks
+---
+
+# scaleway_lb_private_network
+
+Creates and manages Scaleway attach/detach private networks to Load-Balancers.
+For more information, see [the documentation](https://developers.scaleway.com/en/products/lb/zoned_api/#post-d4b30).
+
+## Examples
+
+### Basic
+
+```hcl
+resource scaleway_vpc_private_network pn01 {
+  name = "test-lb-pn"
+}
+
+resource scaleway_lb_ip ip01 {}
+
+resource scaleway_lb lb01 {
+  ip_id = scaleway_lb_ip.ip01.id
+  name = "test-lb"
+  type = "lb-s"
+  release_ip = true
+}
+
+resource scaleway_lb_private_network lb01pn01 {
+  lb_id = scaleway_lb.lb01.id
+  private_network_id = scaleway_vpc_private_network.pn01.id
+  static_config = ["172.16.0.100", "172.16.0.101"]
+}
+```
+
+## Arguments Reference
+
+The following arguments are supported:
+
+- `lb_id` - (Required) The ID of the load-balancer to associate.
+
+- `private_network_id` - (Required) The ID of the Private Network to associate.
+
+- `static_config` - (Required) Define two local ip address of your choice for each load balancer instance. See below.
+
+- `dhcp_config` - (Required) Set to true if you want to let DHCP assign IP addresses. See below.
+
+~> **Important:**  Only one of static_config and dhcp_config may be set.
+
+- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the IP should be reserved.
+
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the load-balancer is associated with.
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+- `status` -  The Private Network attachment status
+
+## Import
+
+Load-Balancer private network can be imported using the `{zone}/{id}`, e.g.
+
+```bash
+$ terraform import scaleway_lb_private_network.lb01pn01 fr-par/11111111-1111-1111-1111-111111111111
+```
+
+The attachments can either be found in the console

docs/resources/rdb_instance.md

@@ -23,6 +23,20 @@ resource "scaleway_rdb_instance" "main" {
   user_name      = "my_initial_user"
   password       = "thiZ_is_v&ry_s3cret"
 }
+
+# with backup schedule
+resource "scaleway_rdb_instance" "main" {
+  name          = "test-rdb"
+  node_type     = "DB-DEV-S"
+  engine        = "PostgreSQL-11"
+  is_ha_cluster = true
+  user_name     = "my_initial_user"
+  password      = "thiZ_is_v&ry_s3cret"
+  
+  disable_backup = true
+  backup_schedule_frequency = 24 # every day
+  backup_schedule_retention = 7  # keep it one week
+}
 ```
 
 ## Arguments Reference
@@ -55,11 +69,21 @@ The following arguments are supported:
 
 - `disable_backup` - (Optional) Disable automated backup for the database instance.
 
+- `backup_schedule_frequency` - (Optional) Backup schedule frequency in hours.
+
+- `backup_schedule_retention` - (Optional) Backup schedule retention in days.
+
 - `settings` - Map of engine settings to be set.
 
 - `tags` - (Optional) The tags associated with the Database Instance.
 
-- `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions) in which the Database Instance should be created.
+- `private_network` - (Optional) The private_network associated with the Database Instance.
+
+The `private_network` block supports:
+
+- `ip` - (Required) The ip range to assign to my instance in [CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation)
+- `pn_id` - (Required) The private_network ID in which the Database Instance should be connected.
+    - The private network should be created in the same region and locality.
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the Database Instance is associated with.
 

docs/resources/vpc_gateway_network.md

@@ -44,8 +44,9 @@ The following arguments are supported:
 - `gateway_id` - (Required) The ID of the public gateway.
 - `private_network_id` - (Required) The ID of the private network.
 - `dhcp_id` - (Required) The ID of the public gateway DHCP config.
-- `enable_masquerade` - (Defaults to false) Enable masquerade on this network
+- `enable_masquerade` - (Defaults to true) Enable masquerade on this network
 - `enable_dhcp` - (Defaults to true) Enable DHCP config on this network. It requires DHCP id.
+- `cleanup_dhcp` - (Defaults to false) Remove DHCP config on this network on destroy. It requires DHCP id.
 - `static_address` - Enable DHCP config on this network
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the gateway network should be created.
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the gateway network is associated with.

docs/resources/vpc_public_gateway_pat_rule.md

@@ -0,0 +1,70 @@
+---
+page_title: "Scaleway: scaleway_vpc_public_gateway_pat_rule"
+description: |-
+Manages Scaleway VPC Public Gateways PAT rules.
+---
+
+# scaleway_vpc_public_gateway_pat_rule
+
+Creates and manages Scaleway VPC Public Gateway PAT (Port Address Translation).
+For more information, see [the documentation](https://developers.scaleway.com/en/products/vpc-gw/api/#pat-rules-e75d10).
+
+## Example
+
+```hcl
+resource scaleway_vpc_public_gateway pg01 {
+  type = "VPC-GW-S"
+}
+
+resource scaleway_vpc_public_gateway_dhcp dhcp01 {
+  subnet = "192.168.1.0/24"
+}
+
+resource scaleway_vpc_private_network pn01 {
+  name = "pn_test_network"
+}
+
+resource scaleway_vpc_gateway_network gn01 {
+  gateway_id = scaleway_vpc_public_gateway.pg01.id
+  private_network_id = scaleway_vpc_private_network.pn01.id
+  dhcp_id = scaleway_vpc_public_gateway_dhcp.dhcp01.id
+  cleanup_dhcp = true
+}
+
+resource scaleway_vpc_public_gateway_pat_rule main {
+  gateway_id = scaleway_vpc_public_gateway.pg01.id
+  private_ip = scaleway_vpc_public_gateway_dhcp.dhcp01.address
+  private_port = 42
+  public_port = 42
+  protocol = "both"
+  depends_on = [scaleway_vpc_gateway_network.gn01, scaleway_vpc_private_network.pn01]
+}
+```
+
+## Arguments Reference
+
+The following arguments are supported:
+
+- `gateway_id` - (Required) The ID of the public gateway.
+- `private_ip` - (Required) The Private IP to forward data to (IP address).
+- `public_port` - (Required) The Public port to listen on.
+- `private_port` - (Required) The Private port to translate to.
+- `protocol` - (Defaults to both) The Protocol the rule should apply to. Possible values are both, tcp and udp.
+- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the public gateway DHCP config should be created.
+
+## Attributes Reference
+
+In addition to all above arguments, the following attributes are exported:
+
+- `id` - The ID of the public gateway DHCP config.
+- `organization_id` - The organization ID the pat rule config is associated with.
+- `created_at` - The date and time of the creation of the pat rule config.
+- `updated_at` - The date and time of the last update of the pat rule config.
+
+## Import
+
+Public gateway PAT rules config can be imported using the `{zone}/{id}`, e.g.
+
+```bash
+$ terraform import scaleway_vpc_public_gateway_pat_rule.main fr-par-1/11111111-1111-1111-1111-111111111111
+```

go.mod

@@ -1,14 +1,14 @@
 module github.com/scaleway/terraform-provider-scaleway
 
 require (
-	github.com/aws/aws-sdk-go v1.41.1
+	github.com/aws/aws-sdk-go v1.41.8
 	github.com/dnaeon/go-vcr v1.2.0
 	github.com/dustin/go-humanize v1.0.0
 	github.com/google/go-cmp v0.5.6
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20211005125957-db499d89a262
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20211012131628-5b68cc2973b3
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 

go.sum

@@ -62,8 +62,8 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
 github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.41.1 h1:TR9j7i73tzV8ELPMc0LkImSRLljRJ+gQeArKBC7IfVE=
-github.com/aws/aws-sdk-go v1.41.1/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
+github.com/aws/aws-sdk-go v1.41.8 h1:j6imzwVyWQYuQxbkPmg2MdMmLB+Zw+U3Ewi59YF8Rwk=
+github.com/aws/aws-sdk-go v1.41.8/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
@@ -286,6 +286,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20211005125957-db499d89a262 h1:ioN4zmp/4AoCJ/BbuwmkpH+bnSSntgWMUN1PkQ46/nI=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20211005125957-db499d89a262/go.mod h1:NnxccdAsg2lS0ng/kfLVLemUQR50FCM/cdZv2gqKDhw=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20211012131628-5b68cc2973b3 h1:PhWAnBbS6rWqa4A4KVCAda5ry9o2Tk3kOVjBw3DvW9s=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20211012131628-5b68cc2973b3/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
 github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=

scaleway/data_source_lb.go

@@ -25,6 +25,12 @@ func dataSourceScalewayLb() *schema.Resource {
 		ValidateFunc:  validationUUIDorUUIDWithLocality(),
 		ConflictsWith: []string{"name"},
 	}
+	dsSchema["release_ip"] = &schema.Schema{
+		Type:        schema.TypeBool,
+		Optional:    true,
+		Default:     false,
+		Description: "Release the IPs related to this load-balancer",
+	}
 
 	return &schema.Resource{
 		ReadContext: dataSourceScalewayLbRead,
@@ -57,6 +63,16 @@ func dataSourceScalewayLbRead(ctx context.Context, d *schema.ResourceData, meta
 		lbID = res.LBs[0].ID
 	}
 
+	var relaseIPValue bool
+	releaseIPAddress, releaseIPExist := d.GetOk("release_ip")
+	if releaseIPExist {
+		relaseIPValue = *expandBoolPtr(releaseIPAddress)
+	}
+
+	err = d.Set("release_ip", relaseIPValue)
+	if err != nil {
+		return diag.FromErr(err)
+	}
 	zonedID := datasourceNewZonedID(lbID, zone)
 	d.SetId(zonedID)
 	err = d.Set("lb_id", zonedID)

scaleway/helpers.go

@@ -229,6 +229,11 @@ func is404Error(err error) bool {
 	return isHTTPCodeError(err, http.StatusNotFound) || xerrors.As(err, &notFoundError)
 }
 
+func is412Error(err error) bool {
+	preConditionFailedError := &scw.PreconditionFailedError{}
+	return isHTTPCodeError(err, http.StatusPreconditionFailed) || xerrors.As(err, &preConditionFailedError)
+}
+
 // is403Error returns true if err is an HTTP 403 error
 func is403Error(err error) bool {
 	permissionsDeniedError := &scw.PermissionsDeniedError{}

scaleway/helpers_domain.go

@@ -34,15 +34,15 @@ func flattenDomainData(data string, recordType domain.RecordType) interface{} {
 }
 
 func flattenDomainGeoIP(config *domain.RecordGeoIPConfig) interface{} {
-	flattened := []map[string]interface{}{}
+	var flattened []map[string]interface{}
 
 	if config == nil {
 		return flattened
 	}
 
 	flattened = []map[string]interface{}{{}}
 	if config.Matches != nil && len(config.Matches) > 0 {
-		matches := []map[string]interface{}{}
+		var matches []map[string]interface{}
 		for _, match := range config.Matches {
 			rawMatch := map[string]interface{}{
 				"data": match.Data,
@@ -78,7 +78,8 @@ func expandDomainGeoIPConfig(defaultData string, i interface{}, ok bool) *domain
 		return &config
 	}
 
-	matches := []*domain.RecordGeoIPConfigMatch{}
+	var matches []*domain.RecordGeoIPConfigMatch
+
 	for _, rawMatch := range rawMatches {
 		rawMatchMap := rawMatch.(map[string]interface{})
 
@@ -109,13 +110,13 @@ func expandDomainGeoIPConfig(defaultData string, i interface{}, ok bool) *domain
 }
 
 func flattenDomainHTTPService(config *domain.RecordHTTPServiceConfig) interface{} {
-	flattened := []map[string]interface{}{}
+	var flattened []map[string]interface{}
 
 	if config == nil {
 		return flattened
 	}
 
-	ips := []interface{}{}
+	var ips []interface{}
 	if config.IPs != nil && len(config.IPs) > 0 {
 		for _, ip := range config.IPs {
 			ips = append(ips, ip.String())
@@ -139,7 +140,7 @@ func expandDomainHTTPService(i interface{}, ok bool) *domain.RecordHTTPServiceCo
 
 	rawMap := i.([]interface{})[0].(map[string]interface{})
 
-	ips := []net.IP{}
+	var ips []net.IP
 	rawIPs, ok := rawMap["ips"].([]interface{})
 	if ok {
 		for _, rawIP := range rawIPs {
@@ -157,7 +158,7 @@ func expandDomainHTTPService(i interface{}, ok bool) *domain.RecordHTTPServiceCo
 }
 
 func flattenDomainWeighted(config *domain.RecordWeightedConfig) interface{} {
-	flattened := []map[string]interface{}{}
+	var flattened []map[string]interface{}
 
 	if config == nil {
 		return flattened
@@ -182,7 +183,7 @@ func expandDomainWeighted(i interface{}, ok bool) *domain.RecordWeightedConfig {
 
 	raw := i.([]interface{})
 
-	weightedIPs := []*domain.RecordWeightedConfigWeightedIP{}
+	var weightedIPs []*domain.RecordWeightedConfigWeightedIP
 	if len(raw) > 0 {
 		for _, rawWeighted := range raw {
 			rawMap := rawWeighted.(map[string]interface{})
@@ -198,7 +199,7 @@ func expandDomainWeighted(i interface{}, ok bool) *domain.RecordWeightedConfig {
 }
 
 func flattenDomainView(config *domain.RecordViewConfig) interface{} {
-	flattened := []map[string]interface{}{}
+	var flattened []map[string]interface{}
 
 	if config == nil {
 		return flattened
@@ -223,7 +224,7 @@ func expandDomainView(i interface{}, ok bool) *domain.RecordViewConfig {
 
 	raw := i.([]interface{})
 
-	views := []*domain.RecordViewConfigView{}
+	var views []*domain.RecordViewConfigView
 	if len(raw) > 0 {
 		for _, rawWeighted := range raw {
 			rawMap := rawWeighted.(map[string]interface{})