Skip to content

Commit c0e3876

Browse files
authored
fix(dbaas): remove MaxItems: 1 from Valkey access control arrays (#774)
1 parent 7091175 commit c0e3876

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
99

1010
- Go version bump to 1.24
1111

12+
### Fixed
13+
14+
- upcloud_managed_database_user: allow adding multiple categories, channels, commands, and keys in `valkey_access_control`.
15+
1216
## [5.22.0] - 2025-05-12
1317

1418
### Added

internal/service/database/user.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ func schemaValkeyUserAccessControl() map[string]*schema.Schema {
163163
Description: "Set access control to all commands in specified categories.",
164164
Type: schema.TypeList,
165165
Optional: true,
166-
MaxItems: 1,
167166
Elem: &schema.Schema{
168167
Type: schema.TypeString,
169168
},
@@ -172,7 +171,6 @@ func schemaValkeyUserAccessControl() map[string]*schema.Schema {
172171
Description: "Set access control to Pub/Sub channels.",
173172
Type: schema.TypeList,
174173
Optional: true,
175-
MaxItems: 1,
176174
Elem: &schema.Schema{
177175
Type: schema.TypeString,
178176
},
@@ -181,7 +179,6 @@ func schemaValkeyUserAccessControl() map[string]*schema.Schema {
181179
Description: "Set access control to commands.",
182180
Type: schema.TypeList,
183181
Optional: true,
184-
MaxItems: 1,
185182
Elem: &schema.Schema{
186183
Type: schema.TypeString,
187184
},
@@ -190,7 +187,6 @@ func schemaValkeyUserAccessControl() map[string]*schema.Schema {
190187
Description: "Set access control to keys.",
191188
Type: schema.TypeList,
192189
Optional: true,
193-
MaxItems: 1,
194190
Elem: &schema.Schema{
195191
Type: schema.TypeString,
196192
},

upcloud/resource_upcloud_managed_database_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ func TestAccUpcloudManagedDatabase(t *testing.T) {
8484

8585
resource.TestCheckResourceAttr(userName2, "pg_access_control.0.allow_replication", "false"),
8686

87-
resource.TestCheckResourceAttr(userName5, "valkey_access_control.0.categories.0", "+@set"),
87+
resource.TestCheckResourceAttr(userName5, "valkey_access_control.0.categories.0", "+@all"),
8888
resource.TestCheckResourceAttr(userName5, "valkey_access_control.0.channels.0", "*"),
89-
resource.TestCheckResourceAttr(userName5, "valkey_access_control.0.commands.0", "+set"),
89+
resource.TestCheckResourceAttr(userName5, "valkey_access_control.0.commands.#", "3"),
9090
resource.TestCheckResourceAttr(userName5, "valkey_access_control.0.keys.0", "key_*"),
9191

9292
resource.TestCheckResourceAttr(userName4, "opensearch_access_control.0.rules.0.index", ".opensearch-observability"),

upcloud/testdata/upcloud_managed_database/managed_database_s1.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ resource "upcloud_managed_database_user" "db_user_5" {
175175
username = "somename"
176176
password = "Superpass123"
177177
valkey_access_control {
178-
categories = ["+@set"]
178+
categories = ["+@all"]
179179
channels = ["*"]
180-
commands = ["+set"]
180+
commands = ["+set", "+get", "+del"]
181181
keys = ["key_*"]
182182
}
183183
}

0 commit comments

Comments
 (0)