fix(dbaas): redis access control properties to pointers

UpCloudLtd · Jan 25, 2024 · 94c7b0a · 94c7b0a
1 parent 59b0f32
commit 94c7b0a
Show file tree

Hide file tree

Showing 10 changed files with 421 additions and 235 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Changed
+- **Breaking**, Managed Database: `ManagedDatabaseUserRedisAccessControl` `[]string` properties changed to `*[]string`
+
 ### Removed
 - **Breaking**, Managed Database: connection related methods in favor of session
 

diff --git a/upcloud/managed_database.go b/upcloud/managed_database.go
@@ -622,10 +622,10 @@ type ManagedDatabaseUserPGAccessControl struct {
 }
 
 type ManagedDatabaseUserRedisAccessControl struct {
-	Categories []string `json:"categories,omitempty"`
-	Channels   []string `json:"channels,omitempty"`
-	Commands   []string `json:"commands,omitempty"`
-	Keys       []string `json:"keys,omitempty"`
+	Categories *[]string `json:"categories,omitempty"`
+	Channels   *[]string `json:"channels,omitempty"`
+	Commands   *[]string `json:"commands,omitempty"`
+	Keys       *[]string `json:"keys,omitempty"`
 }
 
 type ManagedDatabaseUserOpenSearchAccessControl struct {

diff --git a/upcloud/managed_database_test.go b/upcloud/managed_database_test.go
@@ -779,10 +779,10 @@ func TestManagedDatabaseUser(t *testing.T) {
 			AllowReplication: false,
 		},
 		RedisAccessControl: &ManagedDatabaseUserRedisAccessControl{
-			Categories: []string{"+@set"},
-			Channels:   []string{"*"},
-			Commands:   []string{"+set"},
-			Keys:       []string{"key_*"},
+			Categories: &[]string{"+@set"},
+			Channels:   &[]string{"*"},
+			Commands:   &[]string{"+set"},
+			Keys:       &[]string{"key_*"},
 		},
 	}
 	assert.Equal(t, want, got)

diff --git a/upcloud/request/managed_database_test.go b/upcloud/request/managed_database_test.go
@@ -432,10 +432,10 @@ func TestCreateManagedDatabaseUserRequest(t *testing.T) {
 			AllowReplication: true,
 		},
 		RedisAccessControl: &upcloud.ManagedDatabaseUserRedisAccessControl{
-			Categories: []string{"+@set"},
-			Channels:   []string{"*"},
-			Commands:   []string{"+set"},
-			Keys:       []string{"key_*"},
+			Categories: &[]string{"+@set"},
+			Channels:   &[]string{"*"},
+			Commands:   &[]string{"+set"},
+			Keys:       &[]string{"key_*"},
 		},
 	}
 	got, err := json.Marshal(&r)
@@ -478,10 +478,10 @@ func TestModifyManagedDatabaseUserAccessControlRequest(t *testing.T) {
 			AllowReplication: true,
 		},
 		RedisAccessControl: &upcloud.ManagedDatabaseUserRedisAccessControl{
-			Categories: []string{"+@set"},
-			Channels:   []string{"*"},
-			Commands:   []string{"+set"},
-			Keys:       []string{"key_*"},
+			Categories: &[]string{"+@set"},
+			Channels:   &[]string{"*"},
+			Commands:   &[]string{"+set"},
+			Keys:       &[]string{"key_*"},
 		},
 	}
 	got, err := json.Marshal(&r)

diff --git a/upcloud/service/fixtures/modifymanageddatabaseuseraccesscontrol.yaml b/upcloud/service/fixtures/modifymanageddatabaseuseraccesscontrol.yaml
diff --git a/upcloud/service/fixtures/modifymanageddatabaseuseraccesscontrolos.yaml b/upcloud/service/fixtures/modifymanageddatabaseuseraccesscontrolos.yaml