Merge branch 'master' into feat/support-resource-identity

Author: yfodil

docs/resources/rdb_acl.md

@@ -32,6 +32,55 @@ resource "scaleway_rdb_acl" "main" {
 }
 ```
 
+### Multiple ACL Rules
+
+```terraform
+resource "scaleway_rdb_acl" "main" {
+  instance_id = scaleway_rdb_instance.main.id
+  
+  acl_rules {
+    ip          = "1.2.3.4/32"
+    description = "Office IP"
+  }
+  
+  acl_rules {
+    ip          = "5.6.7.8/32"
+    description = "Home IP"
+  }
+  
+  acl_rules {
+    ip          = "10.0.0.0/24"
+    description = "Internal network"
+  }
+}
+```
+
+### Dynamic ACL Rules with Variables
+
+```terraform
+variable "allowed_ips" {
+  description = "Map of allowed IPs with descriptions"
+  type        = map(string)
+  default = {
+    "1.2.3.4/32"   = "Office IP"
+    "5.6.7.8/32"   = "Home IP"
+    "10.0.0.0/24"  = "Internal network"
+  }
+}
+
+resource "scaleway_rdb_acl" "main" {
+  instance_id = scaleway_rdb_instance.main.id
+  
+  dynamic "acl_rules" {
+    for_each = var.allowed_ips
+    content {
+      ip          = acl_rules.key
+      description = acl_rules.value
+    }
+  }
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
@@ -42,6 +91,8 @@ The following arguments are supported:
 
 - `acl_rules` - A list of ACLs (structure is described below)
 
+~> **Important:** The `scaleway_rdb_acl` resource replaces **all** ACL rules for the given instance. Multiple `scaleway_rdb_acl` resources targeting the same `instance_id` will conflict with each other. Use multiple `acl_rules` blocks within a single resource instead.
+
 - `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions) in which the Database Instance should be created.
 
 The `acl_rules` block supports:

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.18.12
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1
 	github.com/aws/aws-sdk-go-v2/service/sns v1.38.3
-	github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5
+	github.com/aws/aws-sdk-go-v2/service/sqs v1.42.6
 	github.com/aws/smithy-go v1.23.0
 	github.com/docker/docker v28.4.0+incompatible
 	github.com/dustin/go-humanize v1.0.1
@@ -24,7 +24,7 @@ require (
 	github.com/hashicorp/terraform-plugin-go v0.29.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-mux v0.21.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1
 	github.com/hashicorp/terraform-plugin-testing v1.13.3
 	github.com/nats-io/jwt/v2 v2.8.0
 	github.com/nats-io/nats.go v1.45.0

go.sum

@@ -101,8 +101,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1 h1:+RpGuaQ72qnU83qBKVwxkznewEdAG
 github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po=
 github.com/aws/aws-sdk-go-v2/service/sns v1.38.3 h1:4T0EjsLqUANqnBWafst2+Nr3Uw44MPdrPgysNbxDqBs=
 github.com/aws/aws-sdk-go-v2/service/sns v1.38.3/go.mod h1:kHMCS+JDWKuKSDP9J/v3dlV2S9zNBKbXzaLy/kHSdEE=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5 h1:HbaHWaTkGec2pMa/UQa3+WNWtUaFFF1ZLfwCeVFtBns=
-github.com/aws/aws-sdk-go-v2/service/sqs v1.42.5/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.42.6 h1:TxOBDZKQGhO2Q2Z3HiaqXjw582f6IFue+z9sM/RgXkk=
+github.com/aws/aws-sdk-go-v2/service/sqs v1.42.6/go.mod h1:wCAPjT7bNg5+4HSNefwNEC2hM3d+NSD5w5DU/8jrPrI=
 github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 h1:7PKX3VYsZ8LUWceVRuv0+PU+E7OtQb1lgmi5vmUE9CM=
 github.com/aws/aws-sdk-go-v2/service/sso v1.29.3/go.mod h1:Ql6jE9kyyWI5JHn+61UT/Y5Z0oyVJGmgmJbZD5g4unY=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 h1:e0XBRn3AptQotkyBFrHAxFB8mDhAIOfsG+7KyJ0dg98=
@@ -329,8 +329,8 @@ github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9T
 github.com/hashicorp/terraform-plugin-log v0.9.0/go.mod h1:rKL8egZQ/eXSyDqzLUuwUYLVdlYeamldAHSxjUFADow=
 github.com/hashicorp/terraform-plugin-mux v0.21.0 h1:QsEYnzSD2c3zT8zUrUGqaFGhV/Z8zRUlU7FY3ZPJFfw=
 github.com/hashicorp/terraform-plugin-mux v0.21.0/go.mod h1:Qpt8+6AD7NmL0DS7ASkN0EXpDQ2J/FnnIgeUr1tzr5A=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.0 h1:PQP7Crrc7t/ozj+P9x0/lsTzGNy3lVppH8zAJylofaE=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.0/go.mod h1:GQhpKVvvuwzD79e8/NZ+xzj+ZpWovdPAe8nfV/skwNU=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1 h1:mlAq/OrMlg04IuJT7NpefI1wwtdpWudnEmjuQs04t/4=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.38.1/go.mod h1:GQhpKVvvuwzD79e8/NZ+xzj+ZpWovdPAe8nfV/skwNU=
 github.com/hashicorp/terraform-plugin-testing v1.13.3 h1:QLi/khB8Z0a5L54AfPrHukFpnwsGL8cwwswj4RZduCo=
 github.com/hashicorp/terraform-plugin-testing v1.13.3/go.mod h1:WHQ9FDdiLoneey2/QHpGM/6SAYf4A7AZazVg7230pLE=
 github.com/hashicorp/terraform-registry-address v0.4.0 h1:S1yCGomj30Sao4l5BMPjTGZmCNzuv7/GDTDX99E9gTk=

templates/resources/rdb_acl.md.tmpl

@@ -32,6 +32,55 @@ resource "scaleway_rdb_acl" "main" {
 }
 ```
 
+### Multiple ACL Rules
+
+```terraform
+resource "scaleway_rdb_acl" "main" {
+  instance_id = scaleway_rdb_instance.main.id
+  
+  acl_rules {
+    ip          = "1.2.3.4/32"
+    description = "Office IP"
+  }
+  
+  acl_rules {
+    ip          = "5.6.7.8/32"
+    description = "Home IP"
+  }
+  
+  acl_rules {
+    ip          = "10.0.0.0/24"
+    description = "Internal network"
+  }
+}
+```
+
+### Dynamic ACL Rules with Variables
+
+```terraform
+variable "allowed_ips" {
+  description = "Map of allowed IPs with descriptions"
+  type        = map(string)
+  default = {
+    "1.2.3.4/32"   = "Office IP"
+    "5.6.7.8/32"   = "Home IP"
+    "10.0.0.0/24"  = "Internal network"
+  }
+}
+
+resource "scaleway_rdb_acl" "main" {
+  instance_id = scaleway_rdb_instance.main.id
+  
+  dynamic "acl_rules" {
+    for_each = var.allowed_ips
+    content {
+      ip          = acl_rules.key
+      description = acl_rules.value
+    }
+  }
+}
+```
+
 ## Argument Reference
 
 The following arguments are supported:
@@ -42,6 +91,8 @@ The following arguments are supported:
 
 - `acl_rules` - A list of ACLs (structure is described below)
 
+~> **Important:** The `scaleway_rdb_acl` resource replaces **all** ACL rules for the given instance. Multiple `scaleway_rdb_acl` resources targeting the same `instance_id` will conflict with each other. Use multiple `acl_rules` blocks within a single resource instead.
+
 - `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#regions) in which the Database Instance should be created.
 
 The `acl_rules` block supports: