@@ -2091,24 +2091,19 @@ func checkShardedNewSchema(isAcc bool, diskSizeGB int, firstInstanceSize, lastIn
20912091 []string {"results.#" , "results.0.replication_specs.#" , "results.0.replication_specs.0.region_configs.#" , "results.0.name" , "results.0.termination_protection_enabled" , "results.0.global_cluster_self_managed_sharding" }... )
20922092
20932093 pluralChecks = acc .AddAttrChecksPrefixSchemaV2 (isAcc , dataSourcePluralName , pluralChecks , clusterChecks , "results.0" )
2094-
2095- if ! config .AdvancedClusterV2Schema () { // TODDO: id is not filled yet in
2096- // expected id attribute only if cluster is symmetric
2097- if isAsymmetricCluster {
2098- pluralChecks = append (pluralChecks , checkAggr (isAcc , []string {}, map [string ]string {
2099- "replication_specs.0.id" : "" ,
2100- "replication_specs.1.id" : "" ,
2101- }))
2102- pluralChecks = acc .AddAttrChecksSchemaV2 (isAcc , dataSourcePluralName , pluralChecks , map [string ]string {
2103- "results.0.replication_specs.0.id" : "" ,
2104- "results.0.replication_specs.1.id" : "" ,
2105- })
2106- } else {
2107- pluralChecks = append (pluralChecks , checkAggr (isAcc , []string {"replication_specs.0.id" , "replication_specs.1.id" }, map [string ]string {}))
2108- pluralChecks = acc .AddAttrSetChecksSchemaV2 (isAcc , dataSourcePluralName , pluralChecks , "results.0.replication_specs.0.id" , "results.0.replication_specs.1.id" )
2109- }
2094+ if isAsymmetricCluster {
2095+ pluralChecks = append (pluralChecks , checkAggr (isAcc , []string {}, map [string ]string {
2096+ "replication_specs.0.id" : "" ,
2097+ "replication_specs.1.id" : "" ,
2098+ }))
2099+ pluralChecks = acc .AddAttrChecksSchemaV2 (isAcc , dataSourcePluralName , pluralChecks , map [string ]string {
2100+ "results.0.replication_specs.0.id" : "" ,
2101+ "results.0.replication_specs.1.id" : "" ,
2102+ })
2103+ } else {
2104+ pluralChecks = append (pluralChecks , checkAggr (isAcc , []string {"replication_specs.0.id" , "replication_specs.1.id" }, map [string ]string {}))
2105+ pluralChecks = acc .AddAttrSetChecksSchemaV2 (isAcc , dataSourcePluralName , pluralChecks , "results.0.replication_specs.0.id" , "results.0.replication_specs.1.id" )
21102106 }
2111-
21122107 return checkAggr (isAcc ,
21132108 []string {"replication_specs.0.external_id" , "replication_specs.0.zone_id" , "replication_specs.1.external_id" , "replication_specs.1.zone_id" },
21142109 clusterChecks ,
0 commit comments