Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(redis): add cluster settings #1258

Merged
merged 2 commits into from
May 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions docs/resources/redis_cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,23 @@ resource "scaleway_redis_cluster" "main" {
}
```

### 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:
Expand Down Expand Up @@ -68,6 +85,8 @@ 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:
Expand Down
20 changes: 20 additions & 0 deletions scaleway/helpers_redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,23 @@ func flattenRedisACLs(aclRules []*redis.ACLRule) interface{} {
}
return flat
}

func expandRedisSettings(i interface{}) []*redis.ClusterSetting {
rawSettings := i.(map[string]interface{})
settings := []*redis.ClusterSetting(nil)
for key, value := range rawSettings {
settings = append(settings, &redis.ClusterSetting{
Name: key,
Value: value.(string),
})
}
return settings
}

func flattenRedisSettings(settings []*redis.ClusterSetting) interface{} {
rawSettings := make(map[string]string)
for _, setting := range settings {
rawSettings[setting.Name] = setting.Value
}
return rawSettings
}
34 changes: 34 additions & 0 deletions scaleway/resource_redis_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@ func resourceScalewayRedisCluster() *schema.Resource {
},
},
},
"settings": {
Type: schema.TypeMap,
Description: "Map of settings to define for the cluster.",
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
// Common
"zone": zoneSchema(),
"project_id": projectIDSchema(),
Expand Down Expand Up @@ -149,6 +157,10 @@ func resourceScalewayRedisClusterCreate(ctx context.Context, d *schema.ResourceD
}
createReq.ACLRules = rules
}
settings, settingsExist := d.GetOk("settings")
if settingsExist {
createReq.ClusterSettings = expandRedisSettings(settings)
}

res, err := redisAPI.CreateCluster(createReq, scw.WithContext(ctx))
if err != nil {
Expand Down Expand Up @@ -195,6 +207,7 @@ func resourceScalewayRedisClusterRead(ctx context.Context, d *schema.ResourceDat
_ = d.Set("created_at", cluster.CreatedAt.Format(time.RFC3339))
_ = d.Set("updated_at", cluster.UpdatedAt.Format(time.RFC3339))
_ = d.Set("acl", flattenRedisACLs(cluster.ACLRules))
_ = d.Set("settings", flattenRedisSettings(cluster.ClusterSettings))

if len(cluster.Tags) > 0 {
_ = d.Set("tags", cluster.Tags)
Expand Down Expand Up @@ -232,6 +245,12 @@ func resourceScalewayRedisClusterUpdate(ctx context.Context, d *schema.ResourceD
return diagnostics
}
}
if d.HasChange("settings") {
diagnostics := resourceScalewayRedisClusterUpdateSettings(ctx, d, redisAPI, zone, ID)
if diagnostics != nil {
return diagnostics
}
}

_, err = waitForRedisCluster(ctx, redisAPI, zone, ID, d.Timeout(schema.TimeoutUpdate))
if err != nil {
Expand Down Expand Up @@ -307,6 +326,21 @@ func resourceScalewayRedisClusterUpdateACL(ctx context.Context, d *schema.Resour
return nil
}

func resourceScalewayRedisClusterUpdateSettings(ctx context.Context, d *schema.ResourceData, redisAPI *redis.API, zone scw.Zone, clusterID string) diag.Diagnostics {
settings := expandRedisSettings(d.Get("settings"))

_, err := redisAPI.SetClusterSettings(&redis.SetClusterSettingsRequest{
Zone: zone,
ClusterID: clusterID,
Settings: settings,
}, scw.WithContext(ctx))
if err != nil {
return diag.FromErr(err)
}

return nil
}

func resourceScalewayRedisClusterDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
redisAPI, zone, ID, err := redisAPIWithZoneAndID(meta, d.Id())
if err != nil {
Expand Down
60 changes: 60 additions & 0 deletions scaleway/resource_redis_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,66 @@ func TestAccScalewayRedisCluster_ACL(t *testing.T) {
})
}

func TestAccScalewayRedisCluster_Settings(t *testing.T) {
tt := NewTestTools(t)
defer tt.Cleanup()
resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
ProviderFactories: tt.ProviderFactories,
CheckDestroy: testAccCheckScalewayRedisClusterDestroy(tt),
Steps: []resource.TestStep{
{
Config: `
resource "scaleway_redis_cluster" "main" {
name = "test_redis_settings"
version = "6.2.6"
node_type = "MDB-BETA-M"
user_name = "my_initial_user"
password = "thiZ_is_v&ry_s3cret"
settings = {
"tcp-keepalive" = "150"
"maxclients" = "5000"
}
}
`,
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayRedisExists(tt, "scaleway_redis_cluster.main"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "name", "test_redis_settings"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "version", "6.2.6"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "node_type", "MDB-BETA-M"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "user_name", "my_initial_user"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "password", "thiZ_is_v&ry_s3cret"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "settings.tcp-keepalive", "150"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "settings.maxclients", "5000"),
),
},
{
Config: `
resource "scaleway_redis_cluster" "main" {
name = "test_redis_settings"
version = "6.2.6"
node_type = "MDB-BETA-M"
user_name = "my_initial_user"
password = "thiZ_is_v&ry_s3cret"
settings = {
"maxclients" = "2000"
}
}
`,
Check: resource.ComposeTestCheckFunc(
testAccCheckScalewayRedisExists(tt, "scaleway_redis_cluster.main"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "name", "test_redis_settings"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "version", "6.2.6"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "node_type", "MDB-BETA-M"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "user_name", "my_initial_user"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "password", "thiZ_is_v&ry_s3cret"),
resource.TestCheckResourceAttr("scaleway_redis_cluster.main", "settings.maxclients", "2000"),
),
},
},
})
}

func testAccCheckScalewayRedisClusterDestroy(tt *TestTools) resource.TestCheckFunc {
return func(state *terraform.State) error {
for _, rs := range state.RootModule().Resources {
Expand Down
Loading