Skip to content

Commit

Permalink
Merge pull request #3155 from thatInfrastructureGuy/redis/aof
Browse files Browse the repository at this point in the history 
Enabled AOF data persistence on Redis Cache
  • Loading branch information
@tombuildsstuff
tombuildsstuff authored Apr 4, 2019
2 parents be49769 + 1c79838 commit 1233665
Show file tree
Hide file tree
Showing 2 changed files with 168 additions and 1 deletion.
51 changes: 50 additions & 1 deletion azurerm/resource_arm_redis_cache.go
View file
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
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

0 comments on commit 1233665

Please sign in to comment.