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.

Sign up for GitHub

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

Jump to bottom

Enabled AOF data persistence on Redis Cache #3155

Merged
merged 4 commits into from
Apr 4, 2019
Merged

Enabled AOF data persistence on Redis Cache #3155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f59e637
added aof backup for redis cache
thatInfrastructureGuy Apr 1, 2019
5f4aa83
formatted code. Call AOF backup instead of RDB in acceptance test.
thatInfrastructureGuy Apr 1, 2019
57ee32f
added secondary connection string for aof redis backups
thatInfrastructureGuy Apr 2, 2019
1c79838
testing with Premium P1. Formatted code.
thatInfrastructureGuy Apr 2, 2019
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
51 changes: 50 additions & 1 deletion azurerm/resource_arm_redis_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,24 +147,45 @@ func resourceArmRedisCache() *schema.Resource {
Type: schema.TypeBool,
Optional: true,
},

"rdb_backup_frequency": {
Type: schema.TypeInt,
Optional: true,
ValidateFunc: validateRedisBackupFrequency,
},

"rdb_backup_max_snapshot_count": {
Type: schema.TypeInt,
Optional: true,
},

"rdb_storage_connection_string": {
Type: schema.TypeString,
Optional: true,
Sensitive: true,
},

"notify_keyspace_events": {
Type: schema.TypeString,
Optional: true,
},

"aof_backup_enabled": {
Type: schema.TypeBool,
Optional: true,
},

"aof_storage_connection_string_0": {
Type: schema.TypeString,
Optional: true,
Sensitive: true,
},

"aof_storage_connection_string_1": {
Type: schema.TypeString,
Optional: true,
Sensitive: true,
},
},
},
},
Expand Down Expand Up @@ -601,7 +622,7 @@ func expandRedisConfiguration(d *schema.ResourceData) map[string]*string {
output["maxfragmentationmemory-reserved"] = utils.String(delta)
}

// Backup
// RDB Backup
if v, ok := d.GetOk("redis_configuration.0.rdb_backup_enabled"); ok {
delta := strconv.FormatBool(v.(bool))
output["rdb-backup-enabled"] = utils.String(delta)
Expand All @@ -625,6 +646,20 @@ func expandRedisConfiguration(d *schema.ResourceData) map[string]*string {
output["notify-keyspace-events"] = utils.String(v.(string))
}

// AOF Backup
if v, ok := d.GetOk("redis_configuration.0.aof_backup_enabled"); ok {
delta := strconv.FormatBool(v.(bool))
output["aof-backup-enabled"] = utils.String(delta)
}

if v, ok := d.GetOk("redis_configuration.0.aof_storage_connection_string_0"); ok {
output["aof-storage-connection-string-0"] = utils.String(v.(string))
}

if v, ok := d.GetOk("redis_configuration.0.aof_storage_connection_string_1"); ok {
output["aof-storage-connection-string-1"] = utils.String(v.(string))
}

return output
}

Expand Down Expand Up @@ -721,6 +756,20 @@ func flattenRedisConfiguration(input map[string]*string) ([]interface{}, error)
outputs["notify_keyspace_events"] = *v
}

if v := input["aof-backup-enabled"]; v != nil {
b, err := strconv.ParseBool(*v)
if err != nil {
return nil, fmt.Errorf("Error parsing `aof-backup-enabled` %q: %+v", *v, err)
}
outputs["aof_backup_enabled"] = b
}
if v := input["aof-storage-connection-string-0"]; v != nil {
outputs["aof_storage_connection_string_0"] = *v
}
if v := input["aof-storage-connection-string-1"]; v != nil {
outputs["aof_storage_connection_string_1"] = *v
}

return []interface{}{outputs}, nil
}

Expand Down
118 changes: 118 additions & 0 deletions azurerm/resource_arm_redis_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,64 @@ func TestAccAzureRMRedisCache_BackupEnabledDisabled(t *testing.T) {
})
}

func TestAccAzureRMRedisCache_AOFBackupEnabled(t *testing.T) {
resourceName := "azurerm_redis_cache.test"
ri := tf.AccRandTimeInt()
rs := acctest.RandString(4)
config := testAccAzureRMRedisCacheAOFBackupEnabled(ri, rs, testLocation())

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMRedisCacheDestroy,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMRedisCacheExists(resourceName),
),
ExpectNonEmptyPlan: true,
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"redis_configuration.0.aof_storage_connection_string_0", "redis_configuration.0.aof_storage_connection_string_1"},
},
},
})
}

func TestAccAzureRMRedisCache_AOFBackupEnabledDisabled(t *testing.T) {
resourceName := "azurerm_redis_cache.test"
ri := tf.AccRandTimeInt()
rs := acctest.RandString(4)
location := testLocation()
config := testAccAzureRMRedisCacheAOFBackupEnabled(ri, rs, location)
updatedConfig := testAccAzureRMRedisCacheAOFBackupDisabled(ri, location)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMRedisCacheDestroy,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMRedisCacheExists(resourceName),
),
ExpectNonEmptyPlan: true,
},
{
Config: updatedConfig,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMRedisCacheExists(resourceName),
),
ExpectNonEmptyPlan: true,
},
},
})
}
func TestAccAzureRMRedisCache_PatchSchedule(t *testing.T) {
resourceName := "azurerm_redis_cache.test"
ri := tf.AccRandTimeInt()
Expand Down Expand Up @@ -807,6 +865,66 @@ resource "azurerm_redis_cache" "test" {
`, rInt, location, rString, rInt)
}

func testAccAzureRMRedisCacheAOFBackupDisabled(ri int, location string) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "%s"
}

resource "azurerm_redis_cache" "test" {
name = "acctestRedis-%d"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
capacity = 3
family = "P"
sku_name = "Premium"
enable_non_ssl_port = false

redis_configuration {
aof_backup_enabled = false
}
}
`, ri, location, ri)
}

func testAccAzureRMRedisCacheAOFBackupEnabled(rInt int, rString string, location string) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "%s"
}

resource "azurerm_storage_account" "test" {
name = "unlikely23exst2acct%s"
resource_group_name = "${azurerm_resource_group.test.name}"
location = "${azurerm_resource_group.test.location}"
account_tier = "Standard"
account_replication_type = "GRS"

tags = {
environment = "staging"
}
}

resource "azurerm_redis_cache" "test" {
name = "acctestRedis-%d"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
capacity = 1
family = "P"
sku_name = "Premium"
enable_non_ssl_port = false

redis_configuration {
aof_backup_enabled = true
aof_storage_connection_string_0 = "DefaultEndpointsProtocol=https;BlobEndpoint=${azurerm_storage_account.test.primary_blob_endpoint};AccountName=${azurerm_storage_account.test.name};AccountKey=${azurerm_storage_account.test.primary_access_key}"
aof_storage_connection_string_1 = "DefaultEndpointsProtocol=https;BlobEndpoint=${azurerm_storage_account.test.primary_blob_endpoint};AccountName=${azurerm_storage_account.test.name};AccountKey=${azurerm_storage_account.test.secondary_access_key}"
}
}
`, rInt, location, rString, rInt)
}

func testAccAzureRMRedisCachePatchSchedule(rInt int, location string) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
Expand Down