Merge branch 'master' into devcontainer

Author: remyleone

docs/data-sources/baremetal_os.md

@@ -9,13 +9,15 @@ description: |-
 Gets information about a baremetal operating system.
 For more information, see [the documentation](https://developers.scaleway.com/en/products/baremetal/api).
 
+You can also use the [scaleway-cli](https://github.com/scaleway/scaleway-cli) with `scw baremetal os list` to list all available operating systems.
+
 ## Example Usage
 
 ```hcl
 # Get info by os name and version
 data "scaleway_baremetal_os" "by_name" {
   name = "Ubuntu"
-  version = "20.04"
+  version = "20.04 LTS (Focal Fossa)"
 }
 
 # Get info by os id

docs/data-sources/iot_device.md

@@ -0,0 +1,43 @@
+---
+layout: "scaleway"
+page_title: "Scaleway: scaleway_iot_device"
+description: |-
+Gets information about an IOT Device.
+---
+
+# scaleway_iot_device
+
+Gets information about an IOT Device.
+
+## Example Usage
+
+```hcl
+# Get info by name 
+data "scaleway_iot_device" "my_device" {
+  name = "foobar"
+}
+
+# Get info by name and hub_id
+data "scaleway_iot_device" "my_device" {
+  name = "foobar"
+  hub_id = "11111111-1111-1111-1111-111111111111"
+}
+
+# Get info by device ID
+data "scaleway_iot_device" "my_device" {
+  device_id = "11111111-1111-1111-1111-111111111111"
+}
+
+```
+
+## Argument Reference
+
+- `name` - (Optional) The name of the Hub.
+  Only one of the `name` and `device_id` should be specified.
+
+- `hub_id` - (Optional) The hub ID.
+
+- `device_id` - (Optional) The device ID.
+  Only one of the `name` and `device_id` should be specified.
+
+- `region` - (Default to [provider](../index.md) `region`) The [region](../guides/regions_and_zones.md#zones) in which the hub exists.

docs/data-sources/iot_hub.md

@@ -0,0 +1,37 @@
+---
+layout: "scaleway"
+page_title: "Scaleway: scaleway_iot_hub"
+description: |-
+Gets information about an IOT Hub.
+---
+
+# scaleway_iot_hub
+
+Gets information about an IOT Hub.
+
+## Example Usage
+
+```hcl
+# Get info by name
+data "scaleway_iot_hub" "my_hub" {
+  name = "foobar"
+}
+
+# Get info by hub ID
+data "scaleway_iot_hub" "my_hub" {
+  hub_id = "11111111-1111-1111-1111-111111111111"
+}
+
+```
+
+## Argument Reference
+
+- `name` - (Optional) The name of the Hub.
+  Only one of the `name` and `hub_id` should be specified.
+
+- `hub_id` - (Optional) The Hub ID.
+  Only one of the `name` and `hub_id` should be specified.
+
+- `region` - (Default to [provider](../index.md) `region`) The [region](../guides/regions_and_zones.md#zones) in which the hub exists.
+
+- `project_id` - (Default to [provider](../index.md) `project_id`)

docs/resources/redis_cluster.md

@@ -0,0 +1,105 @@
+---
+page_title: "Scaleway: scaleway_redis_cluster"
+description: |-
+Manages Scaleway Redis Clusters.
+---
+
+# scaleway_redis_cluster
+
+Creates and manages Scaleway Redis Clusters.
+For more information, see [the documentation](https://developers.scaleway.com/en/products/redis/api).
+
+## Examples
+
+### Basic
+
+```hcl
+resource "scaleway_redis_cluster" "main" {
+  name = "test_redis_basic"
+  version = "6.2.6"
+  node_type = "MDB-BETA-M"
+  user_name = "my_initial_user"
+  password = "thiZ_is_v&ry_s3cret"
+  tags = [ "test", "redis" ]
+  cluster_size = 1
+  tls_enabled = "true"
+  
+  acl {
+    ip = "0.0.0.0/0"
+    description = "Allow all"
+  }
+}
+```
+
+### With settings
+
+```hcl
+resource "scaleway_redis_cluster" "main" {
+  name = "test_redis_basic"
+  version = "6.2.6"
+  node_type = "MDB-BETA-M"
+  user_name = "my_initial_user"
+  password = "thiZ_is_v&ry_s3cret"
+  
+  settings = {
+    "maxclients" = "1000"
+    "tcp-keepalive" = "120"
+  }
+}
+```
+
+## Arguments Reference
+
+The following arguments are supported:
+
+- `version` - (Required) Redis's Cluster version (e.g. `6.2.6`).
+
+~> **Important:** Updates to `version` will migrate the Redis Cluster to the desired `version`. Keep in mind that you cannot downgrade a Redis Cluster.
+
+- `node_type` - (Required) The type of Redis Cluster you want to create (e.g. `MDB-BETA-M`).
+
+~> **Important:** Updates to `node_type` will migrate the Redis Cluster to the desired `node_type`. Keep in mind that you cannot downgrade a Redis Cluster.
+
+- `user_name` - (Required) Identifier for the first user of the Redis Cluster.
+
+- `password` - (Required) Password for the first user of the Redis Cluster.
+
+- `name` - (Optional) The name of the Redis Cluster.
+
+- `tags` - (Optional) The tags associated with the Redis Cluster.
+
+- `zone` - (Defaults to [provider](../index.md) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the Redis Cluster should be created.
+
+- `cluster_size` - (Optional) The number of nodes in the Redis Cluster.
+
+~> **Important:** You can set a bigger `cluster_size`, it will migrate the Redis Cluster, but keep in mind that you cannot downgrade a Redis Cluster so setting a smaller `cluster_size` will not have any effect.
+
+- `tls_enabled` - (Defaults to false) Whether TLS is enabled or not.
+
+- `project_id` - (Defaults to [provider](../index.md) `project_id`) The ID of the project the Redis Cluster is associated with.
+
+- `acl` - (Optional) List of acl rules, this is cluster's authorized IPs.
+
+The `acl` block supports:
+
+- `ip` - (Required) The ip range to whitelist in [CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation)
+- `description` - (Optional) A text describing this rule. Default description: `Allow IP`
+
+- `settings` - (Optional) Map of settings for redis cluster. Available settings can be found by listing redis versions with scaleway API or CLI
+
+## Attributes Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+- `id` - The ID of the Database Instance.
+- `created_at` - The date and time of creation of the Redis Cluster.
+- `updated_at` - The date and time of the last update of the Redis Cluster.
+
+
+## Import
+
+Redis Cluster can be imported using the `{zone}/{id}`, e.g.
+
+```bash
+$ terraform import scaleway_redis_cluster.redis01 fr-par/11111111-1111-1111-1111-111111111111
+```

docs/resources/vpc_gateway_network.md

@@ -22,6 +22,7 @@ resource "scaleway_vpc_public_gateway_ip" "gw01" {
 
 resource "scaleway_vpc_public_gateway_dhcp" "dhcp01" {
   subnet = "192.168.1.0/24"
+  push_default_route = true
 }
 
 resource "scaleway_vpc_public_gateway" "pg01" {
@@ -34,6 +35,8 @@ resource "scaleway_vpc_gateway_network" "main" {
   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
+  enable_masquerade  = true
 }
 ```
 

go.mod

@@ -1,11 +1,11 @@
 module github.com/scaleway/terraform-provider-scaleway/v2
 
 require (
-	github.com/aws/aws-sdk-go v1.43.39
+	github.com/aws/aws-sdk-go v1.44.4
 	github.com/dnaeon/go-vcr v1.2.0
 	github.com/docker/docker v20.10.14+incompatible
 	github.com/dustin/go-humanize v1.0.0
-	github.com/google/go-cmp v0.5.7
+	github.com/google/go-cmp v0.5.8
 	github.com/hashicorp/aws-sdk-go-base v1.1.0
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
 	github.com/hashicorp/go-retryablehttp v0.7.1

go.sum

@@ -127,8 +127,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.43.39 h1:5W8pton/8OuS5hpbAkzfr7e+meAAFkK7LsUehB39L3I=
-github.com/aws/aws-sdk-go v1.43.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
+github.com/aws/aws-sdk-go v1.44.4 h1:ePN0CVJMdiz2vYUcJH96eyxRrtKGSDMgyhP6rah2OgE=
+github.com/aws/aws-sdk-go v1.44.4/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -481,8 +481,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=

scaleway/data_source_baremetal_os.go

@@ -79,11 +79,8 @@ func dataSourceScalewayBaremetalOsRead(ctx context.Context, d *schema.ResourceDa
 
 	zoneID := datasourceNewZonedID(osID, zone)
 	d.SetId(zoneID)
-	err = d.Set("os_id", zoneID)
-	if err != nil {
-		return diag.FromErr(err)
-	}
 
+	_ = d.Set("os_id", zoneID)
 	_ = d.Set("zone", zone)
 	_ = d.Set("name", osName)
 	_ = d.Set("version", osVersion)

scaleway/data_source_baremetal_os_test.go

@@ -22,7 +22,7 @@ func TestAccScalewayDataSourceBaremetalOS_Basic(t *testing.T) {
 				Config: `
 					data "scaleway_baremetal_os" "by_name" {
 						name = "Ubuntu"
-						version = "20.04"
+						version = "20.04 LTS (Focal Fossa)"
 					}
 					
 					data "scaleway_baremetal_os" "by_id" {

scaleway/data_source_iot_device.go

@@ -0,0 +1,82 @@
+package scaleway
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/scaleway/scaleway-sdk-go/api/iot/v1"
+)
+
+func dataSourceScalewayIotDevice() *schema.Resource {
+	dsSchema := datasourceSchemaFromResourceSchema(resourceScalewayIotDevice().Schema)
+
+	addOptionalFieldsToSchema(dsSchema, "name", "region")
+
+	dsSchema["name"].ConflictsWith = []string{"device_id"}
+	dsSchema["hub_id"].Optional = true
+	dsSchema["device_id"] = &schema.Schema{
+		Type:          schema.TypeString,
+		Optional:      true,
+		Description:   "The ID of the IOT Device",
+		ConflictsWith: []string{"name"},
+		ValidateFunc:  validationUUIDorUUIDWithLocality(),
+	}
+
+	return &schema.Resource{
+		ReadContext: dataSourceScalewayIotDeviceRead,
+		Schema:      dsSchema,
+	}
+}
+
+func dataSourceScalewayIotDeviceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	api, region, err := iotAPIWithRegion(d, meta)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	deviceID, ok := d.GetOk("device_id")
+	if !ok {
+		hubID, hubIDExists := d.GetOk("hub_id")
+		if hubIDExists {
+			_, hubID, err = parseRegionalID(hubID.(string))
+			if err != nil {
+				return diag.FromErr(err)
+			}
+		}
+		res, err := api.ListDevices(&iot.ListDevicesRequest{
+			Region: region,
+			Name:   expandStringPtr(d.Get("name")),
+			HubID:  expandStringPtr(hubID),
+		})
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		for _, device := range res.Devices {
+			if device.Name == d.Get("name").(string) {
+				if deviceID != "" {
+					return diag.Errorf("more than 1 device with the same name %s", d.Get("name"))
+				}
+				deviceID = device.ID
+			}
+		}
+		if deviceID == "" {
+			return diag.Errorf("no device found with the name %s", d.Get("name"))
+		}
+	}
+
+	regionalID := datasourceNewRegionalizedID(deviceID, region)
+	d.SetId(regionalID)
+	err = d.Set("device_id", regionalID)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	diags := resourceScalewayIotDeviceRead(ctx, d, meta)
+	if diags != nil {
+		return diags
+	}
+	if d.Id() == "" {
+		return diag.Errorf("IOT Device not found (%s)", regionalID)
+	}
+	return nil
+}