Skip to content

Commit ba63107

Browse files
chore: Unify lifecycle ingore path syntax in test so same utility function can be used (#3145)
1 parent 35a339d commit ba63107

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

internal/service/advancedcluster/resource_advanced_cluster_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,8 +2066,8 @@ func configReplicationSpecsAutoScaling(t *testing.T, isAcc bool, projectID, clus
20662066
lifecycleIgnoreChanges = `
20672067
lifecycle {
20682068
ignore_changes = [
2069-
replication_specs[0].region_configs[0].electable_specs[0].instance_size,
2070-
replication_specs[0].region_configs[0].electable_specs[0].disk_size_gb
2069+
replication_specs.0.region_configs.0.electable_specs.0.instance_size,
2070+
replication_specs.0.region_configs.0.electable_specs.0.disk_size_gb
20712071
]
20722072
}`
20732073
}

internal/testutil/acc/advanced_cluster_preview_provider_v2.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,6 @@ func AttrNameToPreviewProviderV2(isAcc bool, name string) string {
9393
return name
9494
}
9595

96-
func attrReferenceToPreviewProviderV2(name string) string {
97-
for _, singleAttrName := range tpfSingleNestedAttrs {
98-
name = strings.ReplaceAll(name, singleAttrName+"[0]", singleAttrName)
99-
}
100-
return name
101-
}
102-
10396
func ConvertAdvancedClusterToPreviewProviderV2(t *testing.T, isAcc bool, def string) string {
10497
t.Helper()
10598
if skipPreviewProviderV2Work(isAcc) {
@@ -122,7 +115,7 @@ func ConvertAdvancedClusterToPreviewProviderV2(t *testing.T, isAcc bool, def str
122115
convertKeyValueAttrs(t, "tags", writeBody)
123116
}
124117
result := string(parse.Bytes())
125-
result = attrReferenceToPreviewProviderV2(result) // useful for lifecycle ingore definitions
118+
result = AttrNameToPreviewProviderV2(isAcc, result) // useful for lifecycle ingore definitions
126119
return result
127120
}
128121

0 commit comments

Comments
 (0)