Skip to content

Commit

Permalink
Consolidates setting auto_minor_version_upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
gdavison committed Apr 1, 2022
1 parent fec912a commit e59480e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion internal/service/elasticache/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,6 @@ func resourceClusterRead(d *schema.ResourceData, meta interface{}) error {
if err := setFromCacheCluster(d, c); err != nil {
return err
}
d.Set("auto_minor_version_upgrade", strconv.FormatBool(aws.BoolValue(c.AutoMinorVersionUpgrade)))

d.Set("log_delivery_configuration", flattenLogDeliveryConfigurations(c.LogDeliveryConfigurations))
d.Set("snapshot_window", c.SnapshotWindow)
Expand Down Expand Up @@ -539,6 +538,7 @@ func setFromCacheCluster(d *schema.ResourceData, c *elasticache.CacheCluster) er
if err := setEngineVersionFromCacheCluster(d, c); err != nil {
return err
}
d.Set("auto_minor_version_upgrade", strconv.FormatBool(aws.BoolValue(c.AutoMinorVersionUpgrade)))

d.Set("subnet_group_name", c.CacheSubnetGroupName)
if err := d.Set("security_group_names", flattenSecurityGroupNames(c.CacheSecurityGroups)); err != nil {
Expand Down
2 changes: 0 additions & 2 deletions internal/service/elasticache/replication_group.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"fmt"
"log"
"regexp"
"strconv"
"strings"
"time"

Expand Down Expand Up @@ -744,7 +743,6 @@ func resourceReplicationGroupRead(d *schema.ResourceData, meta interface{}) erro
if err := setFromCacheCluster(d, c); err != nil {
return err
}
d.Set("auto_minor_version_upgrade", strconv.FormatBool(aws.BoolValue(c.AutoMinorVersionUpgrade)))

d.Set("at_rest_encryption_enabled", c.AtRestEncryptionEnabled)
d.Set("transit_encryption_enabled", c.TransitEncryptionEnabled)
Expand Down

0 comments on commit e59480e

Please sign in to comment.