Skip to content

chore: Unify lifecycle ingore path syntax in test so same utility function can be used #3145

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

Merged
merged 1 commit into from
Mar 11, 2025
Merged

chore: Unify lifecycle ingore path syntax in test so same utility function can be used #3145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions internal/service/advancedcluster/resource_advanced_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2066,8 +2066,8 @@ func configReplicationSpecsAutoScaling(t *testing.T, isAcc bool, projectID, clus
lifecycleIgnoreChanges = `
lifecycle {
ignore_changes = [
replication_specs[0].region_configs[0].electable_specs[0].instance_size,
replication_specs[0].region_configs[0].electable_specs[0].disk_size_gb
replication_specs.0.region_configs.0.electable_specs.0.instance_size,
replication_specs.0.region_configs.0.electable_specs.0.disk_size_gb
]
}`
}
Expand Down
9 changes: 1 addition & 8 deletions internal/testutil/acc/advanced_cluster_preview_provider_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,6 @@ func AttrNameToPreviewProviderV2(isAcc bool, name string) string {
return name
}

func attrReferenceToPreviewProviderV2(name string) string {
for _, singleAttrName := range tpfSingleNestedAttrs {
name = strings.ReplaceAll(name, singleAttrName+"[0]", singleAttrName)
}
return name
}

func ConvertAdvancedClusterToPreviewProviderV2(t *testing.T, isAcc bool, def string) string {
t.Helper()
if skipPreviewProviderV2Work(isAcc) {
Expand All @@ -122,7 +115,7 @@ func ConvertAdvancedClusterToPreviewProviderV2(t *testing.T, isAcc bool, def str
convertKeyValueAttrs(t, "tags", writeBody)
}
result := string(parse.Bytes())
result = attrReferenceToPreviewProviderV2(result) // useful for lifecycle ingore definitions
result = AttrNameToPreviewProviderV2(isAcc, result) // useful for lifecycle ingore definitions
return result
}

Expand Down
Loading