fix units and semgrep

twelsh-aw · twelsh-aw · commit 40bbf29c7e38 · 2025-07-04T13:37:07.000-04:00
diff --git a/internal/service/elasticache/engine_version_test.go b/internal/service/elasticache/engine_version_test.go
@@ -514,7 +514,7 @@ func (d *mockForceNewDiffer) Get(key string) any {
 }
 
 func (d *mockForceNewDiffer) GetOk(key string) (any, bool) {
-	return d.old, d.old != ""
+	return "", false
 }
 
 func (d *mockForceNewDiffer) HasChange(key string) bool {
diff --git a/internal/service/elasticache/global_replication_group.go b/internal/service/elasticache/global_replication_group.go
@@ -332,7 +332,7 @@ func resourceGlobalReplicationGroupCreate(ctx context.Context, d *schema.Resourc
 		} else {
 			version := d.Get(names.AttrEngineVersion).(string)
 			p := d.Get(names.AttrParameterGroupName).(string)
-			if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(e.(string), version, p), "engine", d.Timeout(schema.TimeoutUpdate)); err != nil {
+			if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(e.(string), version, p), names.AttrEngine, d.Timeout(schema.TimeoutUpdate)); err != nil {
 				return sdkdiag.AppendFromErr(diags, err)
 			}
 		}
diff --git a/internal/service/elasticache/global_replication_group_test.go b/internal/service/elasticache/global_replication_group_test.go
@@ -1567,7 +1567,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnCreate_ValkeyUpgrade(t
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"),
 					resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"),
-					resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)),
+					resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)),
 					resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"),
 				),
 			},
@@ -1615,7 +1615,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnUpdate_ValkeyUpgrade(t
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "redis"),
 					resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "7.1"),
-					resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)),
+					resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)),
 					resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"),
 				),
 			},
@@ -1640,7 +1640,7 @@ func TestAccElastiCacheGlobalReplicationGroup_SetEngineOnUpdate_ValkeyUpgrade(t
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"),
 					resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "7.2"),
-					resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)),
+					resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)),
 					resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"),
 				),
 			},
@@ -1687,12 +1687,12 @@ func TestAccElastiCacheGlobalReplicationGroup_InheritValkeyEngine_SecondaryRepli
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngine, "valkey"),
 					resource.TestCheckResourceAttr(primaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"),
-					resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)),
+					resource.TestMatchResourceAttr(primaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)),
 					resource.TestCheckResourceAttrPair(primaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"),
 
 					resource.TestCheckResourceAttr(secondaryReplicationGroupResourceName, names.AttrEngine, "valkey"),
 					resource.TestCheckResourceAttr(secondaryReplicationGroupResourceName, names.AttrEngineVersion, "8.0"),
-					resource.TestMatchResourceAttr(secondaryReplicationGroupResourceName, "parameter_group_name", regexache.MustCompile(`^global-datastore-.+$`)),
+					resource.TestMatchResourceAttr(secondaryReplicationGroupResourceName, names.AttrParameterGroupName, regexache.MustCompile(`^global-datastore-.+$`)),
 					resource.TestCheckResourceAttrPair(secondaryReplicationGroupResourceName, "global_replication_group_id", resourceName, "global_replication_group_id"),
 				),
 			},

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@ func (d *mockForceNewDiffer) Get(key string) any {`
`514`	`514`	`}`
`515`	`515`
`516`	`516`	`func (d *mockForceNewDiffer) GetOk(key string) (any, bool) {`
`517`		`- return d.old, d.old != ""`
	`517`	`+ return "", false`
`518`	`518`	`}`
`519`	`519`
`520`	`520`	`func (d *mockForceNewDiffer) HasChange(key string) bool {`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ func resourceGlobalReplicationGroupCreate(ctx context.Context, d *schema.Resourc`
`332`	`332`	`} else {`
`333`	`333`	`version := d.Get(names.AttrEngineVersion).(string)`
`334`	`334`	`p := d.Get(names.AttrParameterGroupName).(string)`
`335`		`- if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(e.(string), version, p), "engine", d.Timeout(schema.TimeoutUpdate)); err != nil {`
	`335`	`+ if err := updateGlobalReplicationGroup(ctx, conn, d.Id(), globalReplicationGroupEngineVersionMajorUpdater(e.(string), version, p), names.AttrEngine, d.Timeout(schema.TimeoutUpdate)); err != nil {`
`336`	`336`	`return sdkdiag.AppendFromErr(diags, err)`
`337`	`337`	`}`
`338`	`338`	`}`