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

resource/aws_elasticache_replication_group: Fix error incorrectly forcing recreation when changing version from 6.x to 6.2 #33954

Merged
merged 4 commits into from
Oct 19, 2023
Merged

resource/aws_elasticache_replication_group: Fix error incorrectly forcing recreation when changing version from 6.x to 6.2 #33954

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
eb80a17
Fixes downgrade check with ElastiCache version `6.x`
gdavison Oct 16, 2023
c834c08
Removes tests referencing retired ElastiCache versions
gdavison Oct 16, 2023
d174bfb
Adds CHANGELOG entry
gdavison Oct 16, 2023
70c87cc
Corrects spelling in CHANGELOG
gdavison Oct 17, 2023
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
3 changes: 3 additions & 0 deletions .changelog/33954.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_elasticache_replication_group: Fix error when switching `engine_version` from `6.x` to a specific `6.<digit>` version number
```
46 changes: 14 additions & 32 deletions internal/service/elasticache/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ func TestAccElastiCacheCluster_EngineVersion_redis(t *testing.T) {
t.Skip("skipping long-running test in short mode")
}

var v1, v2, v3, v4, v5, v6, v7, v8 elasticache.CacheCluster
var v1, v2, v3, v4, v5, v6 elasticache.CacheCluster
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_elasticache_cluster.test"

Expand All @@ -647,72 +647,54 @@ func TestAccElastiCacheCluster_EngineVersion_redis(t *testing.T) {
CheckDestroy: testAccCheckClusterDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccClusterConfig_engineVersionRedis(rName, "3.2.6"),
Config: testAccClusterConfig_engineVersionRedis(rName, "4.0.10"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName, &v1),
resource.TestCheckResourceAttr(resourceName, "engine_version", "3.2.6"),
resource.TestCheckResourceAttr(resourceName, "engine_version_actual", "3.2.6"),
),
},
{
Config: testAccClusterConfig_engineVersionRedis(rName, "3.2.4"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName, &v2),
testAccCheckClusterRecreated(&v1, &v2),
resource.TestCheckResourceAttr(resourceName, "engine_version", "3.2.4"),
resource.TestCheckResourceAttr(resourceName, "engine_version_actual", "3.2.4"),
),
},
{
Config: testAccClusterConfig_engineVersionRedis(rName, "3.2.10"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName, &v3),
testAccCheckClusterNotRecreated(&v2, &v3),
resource.TestCheckResourceAttr(resourceName, "engine_version", "3.2.10"),
resource.TestCheckResourceAttr(resourceName, "engine_version_actual", "3.2.10"),
resource.TestCheckResourceAttr(resourceName, "engine_version", "4.0.10"),
resource.TestCheckResourceAttr(resourceName, "engine_version_actual", "4.0.10"),
),
},
{
Config: testAccClusterConfig_engineVersionRedis(rName, "6.0"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName, &v4),
testAccCheckClusterNotRecreated(&v3, &v4),
testAccCheckClusterExists(ctx, resourceName, &v2),
testAccCheckClusterNotRecreated(&v1, &v2),
resource.TestCheckResourceAttr(resourceName, "engine_version", "6.0"),
resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^6\.0\.[[:digit:]]+$`)),
),
},
{
Config: testAccClusterConfig_engineVersionRedis(rName, "6.2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName, &v5),
testAccCheckClusterNotRecreated(&v4, &v5),
testAccCheckClusterExists(ctx, resourceName, &v3),
testAccCheckClusterNotRecreated(&v2, &v3),
resource.TestCheckResourceAttr(resourceName, "engine_version", "6.2"),
resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^6\.2\.[[:digit:]]+$`)),
),
},
{
Config: testAccClusterConfig_engineVersionRedis(rName, "5.0.6"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName, &v6),
testAccCheckClusterRecreated(&v5, &v6),
testAccCheckClusterExists(ctx, resourceName, &v4),
testAccCheckClusterRecreated(&v3, &v4),
resource.TestCheckResourceAttr(resourceName, "engine_version", "5.0.6"),
resource.TestCheckResourceAttr(resourceName, "engine_version_actual", "5.0.6"),
),
},
{
Config: testAccClusterConfig_engineVersionRedis(rName, "6.x"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName, &v7),
testAccCheckClusterNotRecreated(&v6, &v7),
testAccCheckClusterExists(ctx, resourceName, &v5),
testAccCheckClusterNotRecreated(&v4, &v5),
resource.TestCheckResourceAttr(resourceName, "engine_version", "6.x"),
resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^6\.[[:digit:]]+\.[[:digit:]]+$`)),
),
},
{
Config: testAccClusterConfig_engineVersionRedis(rName, "6.0"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName, &v8),
testAccCheckClusterRecreated(&v7, &v8),
testAccCheckClusterExists(ctx, resourceName, &v6),
testAccCheckClusterRecreated(&v5, &v6),
resource.TestCheckResourceAttr(resourceName, "engine_version", "6.0"),
resource.TestMatchResourceAttr(resourceName, "engine_version_actual", regexache.MustCompile(`^6\.0\.[[:digit:]]+$`)),
),
Expand Down
34 changes: 28 additions & 6 deletions internal/service/elasticache/engine_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const (

var versionStringRegexp = regexache.MustCompile(versionStringRegexpPattern)

func validMemcachedVersionString(v interface{}, k string) (ws []string, errors []error) {
func validMemcachedVersionString(v any, k string) (ws []string, errors []error) {
value := v.(string)

if !versionStringRegexp.MatchString(value) {
Expand All @@ -45,7 +45,7 @@ var (
redisVersionPostV6Regexp = regexache.MustCompile(redisVersionPostV6RegexpPattern)
)

func validRedisVersionString(v interface{}, k string) (ws []string, errors []error) {
func validRedisVersionString(v any, k string) (ws []string, errors []error) {
value := v.(string)

if !redisVersionRegexp.MatchString(value) {
Expand All @@ -56,7 +56,7 @@ func validRedisVersionString(v interface{}, k string) (ws []string, errors []err
}

// CustomizeDiffValidateClusterEngineVersion validates the correct format for `engine_version`, based on `engine`
func CustomizeDiffValidateClusterEngineVersion(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error {
func CustomizeDiffValidateClusterEngineVersion(_ context.Context, diff *schema.ResourceDiff, _ any) error {
engineVersion, ok := diff.GetOk("engine_version")
if !ok {
return nil
Expand Down Expand Up @@ -84,16 +84,37 @@ func validateClusterEngineVersion(engine, engineVersion string) error {
}

// customizeDiffEngineVersionForceNewOnDowngrade causes re-creation of the resource if the version is being downgraded
func customizeDiffEngineVersionForceNewOnDowngrade(_ context.Context, diff *schema.ResourceDiff, _ interface{}) error {
func customizeDiffEngineVersionForceNewOnDowngrade(_ context.Context, diff *schema.ResourceDiff, _ any) error {
return engineVersionForceNewOnDowngrade(diff)
}

type getChangeDiffer interface {
GetChange(key string) (interface{}, interface{})
Get(key string) any
GetChange(key string) (any, any)
}

func engineVersionIsDowngrade(diff getChangeDiffer) (bool, error) {
o, n := diff.GetChange("engine_version")
if o == "6.x" {
actual := diff.Get("engine_version_actual")
aVersion, err := gversion.NewVersion(actual.(string))
if err != nil {
return false, fmt.Errorf("parsing current engine_version: %w", err)
}
nVersion, err := normalizeEngineVersion(n.(string))
if err != nil {
return false, fmt.Errorf("parsing new engine_version: %w", err)
}

aSegments := aVersion.Segments()
nSegments := nVersion.Segments()

if nSegments[0] != aSegments[0] {
return nSegments[0] < aSegments[0], nil
}
return nSegments[1] < aSegments[1], nil
}

oVersion, err := normalizeEngineVersion(o.(string))
if err != nil {
return false, fmt.Errorf("parsing old engine_version: %w", err)
Expand All @@ -108,7 +129,8 @@ func engineVersionIsDowngrade(diff getChangeDiffer) (bool, error) {

type forceNewDiffer interface {
Id() string
GetChange(key string) (interface{}, interface{})
Get(key string) any
GetChange(key string) (any, any)
HasChange(key string) bool
ForceNew(key string) error
}
Expand Down
Loading
Loading