Skip to content

Commit

Permalink
Pull request #1220: MDB: replace ru-central-1c with ru-central-1d
Browse files Browse the repository at this point in the history 
Merge in CLOUD/terraform-provider-yandex-mirror from replace-ru-central-1c to master

Squashed commit of the following:

commit 105a761d4f4a7961e9f5a3df67ad99a5fc0d2440
Author: denchick <denchick@yandex-team.ru>
Date:   Mon Apr 22 11:28:21 2024 +0200

    fix redis flavour

commit 59d480177546901cd46d75f5edf3daef2374a7aa
Author: denchick <denchick@yandex-team.ru>
Date:   Fri Apr 19 12:59:26 2024 +0200

    replace ru-central-1c with ru-central-1d
  • Loading branch information
@Denchick
Denchick committed Apr 24, 2024
1 parent 029e1e8 commit 5a15d67
Show file tree
Hide file tree
Showing 13 changed files with 67 additions and 67 deletions.
2 changes: 1 addition & 1 deletion yandex/data_source_yandex_mdb_mysql_database_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ resource "yandex_mdb_mysql_cluster" "foo" {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
}
}
Expand Down
2 changes: 1 addition & 1 deletion yandex/data_source_yandex_mdb_mysql_user_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ resource "yandex_mdb_mysql_cluster" "foo" {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
}
}
Expand Down
12 changes: 6 additions & 6 deletions yandex/mdb_clickhouse_structures_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ func Test_clickHouseHostsDiff(t *testing.T) {

{
Type: clickhouse.Host_ZOOKEEPER,
ZoneId: "ru-central1-c",
ZoneId: "ru-central1-d",
ShardName: "zk",
SubnetId: "subnet-c",
},
Expand Down Expand Up @@ -489,7 +489,7 @@ func Test_clickHouseHostsDiff(t *testing.T) {

{
Type: clickhouse.Host_ZOOKEEPER,
ZoneId: "ru-central1-c",
ZoneId: "ru-central1-d",
ShardName: "zk",
SubnetId: "subnet-c",
},
Expand Down Expand Up @@ -530,7 +530,7 @@ func Test_clickHouseHostsDiff(t *testing.T) {

{
Type: clickhouse.Host_ZOOKEEPER,
ZoneId: "ru-central1-c",
ZoneId: "ru-central1-d",
ShardName: "zk",
SubnetId: "subnet-c",
},
Expand Down Expand Up @@ -570,12 +570,12 @@ func Test_clickHouseHostsDiff(t *testing.T) {
},
[]*clickhouse.HostSpec{
{ZoneId: "ru-central1-a", Type: clickhouse.Host_CLICKHOUSE, SubnetId: "sub-a", AssignPublicIp: true, ShardName: "shard1"},
{ZoneId: "ru-central1-c", Type: clickhouse.Host_CLICKHOUSE, SubnetId: "sub-c", AssignPublicIp: true, ShardName: "shard3"},
{ZoneId: "ru-central1-d", Type: clickhouse.Host_CLICKHOUSE, SubnetId: "sub-d", AssignPublicIp: true, ShardName: "shard3"},
},
},
toDelete: map[string][]string{"shard2": {"host_b"}},
toAdd: map[string][]*clickhouse.HostSpec{
"shard3": {{ZoneId: "ru-central1-c", Type: clickhouse.Host_CLICKHOUSE, SubnetId: "sub-c", AssignPublicIp: true, ShardName: "shard3"}}},
"shard3": {{ZoneId: "ru-central1-d", Type: clickhouse.Host_CLICKHOUSE, SubnetId: "sub-d", AssignPublicIp: true, ShardName: "shard3"}}},
toUpdate: map[string]*clickhouse.UpdateHostSpec{
"host_a": {HostName: "host_a", AssignPublicIp: &wrapperspb.BoolValue{Value: true}, UpdateMask: &field_mask.FieldMask{Paths: []string{"assign_public_ip"}}},
},
Expand Down Expand Up @@ -689,7 +689,7 @@ var targetHostsHA = []*clickhouse.HostSpec{

{
Type: clickhouse.Host_ZOOKEEPER,
ZoneId: "ru-central1-c",
ZoneId: "ru-central1-d",
ShardName: "zk",
SubnetId: "subnet-c",
},
Expand Down
2 changes: 1 addition & 1 deletion yandex/mdb_redis_structures_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestGetSentinelHosts(t *testing.T) {
replicaPriorities := []*int{nil}
expected := `
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = "${yandex_vpc_subnet.foo.id}"
Expand Down
6 changes: 3 additions & 3 deletions yandex/resource_yandex_mdb_clickhouse_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1702,7 +1702,7 @@ resource "yandex_vpc_subnet" "mdb-ch-test-subnet-b" {
}
resource "yandex_vpc_subnet" "mdb-ch-test-subnet-c" {
zone = "ru-central1-c"
zone = "ru-central1-d"
network_id = "${yandex_vpc_network.mdb-ch-test-net.id}"
v4_cidr_blocks = ["10.3.0.0/24"]
}
Expand Down Expand Up @@ -2601,7 +2601,7 @@ resource "yandex_mdb_clickhouse_cluster" "foo" {
host {
type = "ZOOKEEPER"
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = "${yandex_vpc_subnet.mdb-ch-test-subnet-c.id}"
}
Expand Down Expand Up @@ -2742,7 +2742,7 @@ resource "yandex_mdb_clickhouse_cluster" "bar" {
host {
type = "CLICKHOUSE"
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.mdb-ch-test-subnet-c.id
shard_name = "shard3"
assign_public_ip = true
Expand Down
6 changes: 3 additions & 3 deletions yandex/resource_yandex_mdb_elasticsearch_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ locals {
zones = [
"ru-central1-a",
"ru-central1-b",
"ru-central1-c",
"ru-central1-d",
]
}
Expand Down Expand Up @@ -396,7 +396,7 @@ locals {
zones = [
"ru-central1-a",
"ru-central1-b",
"ru-central1-c",
"ru-central1-d",
]
}
Expand Down Expand Up @@ -520,7 +520,7 @@ resource "yandex_vpc_subnet" "mdb-elasticsearch-test-subnet-b" {
}
resource "yandex_vpc_subnet" "mdb-elasticsearch-test-subnet-c" {
zone = "ru-central1-c"
zone = "ru-central1-d"
network_id = "${yandex_vpc_network.mdb-elasticsearch-test-net.id}"
v4_cidr_blocks = ["10.3.0.0/24"]
}
Expand Down
4 changes: 2 additions & 2 deletions yandex/resource_yandex_mdb_mongodb_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ resource "yandex_vpc_subnet" "bar" {
}
resource "yandex_vpc_subnet" "baz" {
zone = "ru-central1-c"
zone = "ru-central1-d"
network_id = "${yandex_vpc_network.foo.id}"
v4_cidr_blocks = ["10.3.0.0/24"]
}
Expand Down Expand Up @@ -764,7 +764,7 @@ func TestAccMDBMongoDBCluster_6_0(t *testing.T) {
DiskTypeId: s2Small26hdd.DiskTypeId,
},
"Hosts": []map[string]interface{}{
{"ZoneId": "ru-central1-c", "SubnetId": "${yandex_vpc_subnet.baz.id}"},
{"ZoneId": "ru-central1-d", "SubnetId": "${yandex_vpc_subnet.baz.id}"},
{"ZoneId": "ru-central1-b", "SubnetId": "${yandex_vpc_subnet.bar.id}"},
},
"SecurityGroupIds": []string{"${yandex_vpc_security_group.sg-y.id}"},
Expand Down
34 changes: 17 additions & 17 deletions yandex/resource_yandex_mdb_mysql_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ func TestAccMDBMySQLClusterHA_update(t *testing.T) {
testAccCheckMDBMysqlClusterHasHosts(mysqlResource, 4),
resource.TestCheckResourceAttr(mysqlResource, "host.0.zone", "ru-central1-a"),
resource.TestCheckResourceAttr(mysqlResource, "host.1.zone", "ru-central1-b"),
resource.TestCheckResourceAttr(mysqlResource, "host.2.zone", "ru-central1-c"),
resource.TestCheckResourceAttr(mysqlResource, "host.3.zone", "ru-central1-c"),
resource.TestCheckResourceAttr(mysqlResource, "host.2.zone", "ru-central1-d"),
resource.TestCheckResourceAttr(mysqlResource, "host.3.zone", "ru-central1-d"),
resource.TestCheckResourceAttr(mysqlResource, "host.0.assign_public_ip", "false"),
resource.TestCheckResourceAttr(mysqlResource, "host.1.assign_public_ip", "true"),
resource.TestCheckResourceAttr(mysqlResource, "host.2.assign_public_ip", "false"),
Expand Down Expand Up @@ -700,7 +700,7 @@ const mysqlVPCDependencies = `
resource "yandex_vpc_network" "foo" {}
resource "yandex_vpc_subnet" "foo_c" {
zone = "ru-central1-c"
zone = "ru-central1-d"
network_id = yandex_vpc_network.foo.id
v4_cidr_blocks = ["10.3.0.0/24"]
}
Expand Down Expand Up @@ -803,7 +803,7 @@ resource "yandex_mdb_mysql_cluster" "foo" {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
}
Expand Down Expand Up @@ -858,7 +858,7 @@ resource "yandex_mdb_mysql_cluster" "foo" {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
}
Expand Down Expand Up @@ -953,7 +953,7 @@ resource "yandex_mdb_mysql_cluster" "foo" {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
assign_public_ip = true
}
Expand Down Expand Up @@ -998,7 +998,7 @@ func testAccMDBMysqlClusterHA(name string) string {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
}
`)
Expand All @@ -1018,12 +1018,12 @@ func testAccMDBMysqlClusterHA2(name string) string {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
}
`)
Expand All @@ -1048,14 +1048,14 @@ func testAccMDBMysqlClusterHANamedWithCascade(name string) string {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
name = "na"
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
name = "nb"
}
Expand All @@ -1080,13 +1080,13 @@ func testAccMDBMysqlClusterHANamedChangePublicIP(name string) string {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
name = "na"
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
name = "nb"
}
Expand All @@ -1113,13 +1113,13 @@ func testAccMDBMysqlClusterWithBackupPriorities(name string) string {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
name = "na"
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
name = "nb"
}
Expand All @@ -1146,13 +1146,13 @@ func testAccMDBMysqlClusterWithPriorities(name string) string {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
name = "na"
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
name = "nb"
}
Expand Down
2 changes: 1 addition & 1 deletion yandex/resource_yandex_mdb_mysql_database_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ resource "yandex_mdb_mysql_cluster" "foo" {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
}
}
Expand Down
2 changes: 1 addition & 1 deletion yandex/resource_yandex_mdb_mysql_user_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ resource "yandex_mdb_mysql_cluster" "foo" {
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.foo_c.id
}
}
Expand Down
18 changes: 9 additions & 9 deletions yandex/resource_yandex_mdb_postgresql_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ func TestAccMDBPostgreSQLCluster_HAWithoutNames_update(t *testing.T) {
resource.TestCheckResourceAttrSet(clusterResource, "host.2.fqdn"),
resource.TestCheckResourceAttr(clusterResource, "host.0.zone", "ru-central1-a"),
resource.TestCheckResourceAttr(clusterResource, "host.1.zone", "ru-central1-b"),
resource.TestCheckResourceAttr(clusterResource, "host.2.zone", "ru-central1-c"),
resource.TestCheckResourceAttr(clusterResource, "host.2.zone", "ru-central1-d"),
resource.TestCheckResourceAttr(clusterResource, "host.0.assign_public_ip", "false"),
resource.TestCheckResourceAttr(clusterResource, "host.1.assign_public_ip", "false"),
resource.TestCheckResourceAttr(clusterResource, "host.2.assign_public_ip", "true"),
Expand Down Expand Up @@ -1027,7 +1027,7 @@ resource "yandex_vpc_subnet" "mdb-pg-test-subnet-b" {
}
resource "yandex_vpc_subnet" "mdb-pg-test-subnet-c" {
zone = "ru-central1-c"
zone = "ru-central1-d"
network_id = yandex_vpc_network.mdb-pg-test-net.id
v4_cidr_blocks = ["10.3.0.0/24"]
}
Expand Down Expand Up @@ -1385,7 +1385,7 @@ func testAccMDBPGClusterConfigHA(name, version string) string {
subnet_id = yandex_vpc_subnet.mdb-pg-test-subnet-b.id
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.mdb-pg-test-subnet-c.id
assign_public_ip = true
}
Expand All @@ -1404,7 +1404,7 @@ func testAccMDBPGClusterConfigHAChangePublicIP(name, version string) string {
subnet_id = yandex_vpc_subnet.mdb-pg-test-subnet-b.id
}
host {
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.mdb-pg-test-subnet-c.id
}
`, version)
Expand Down Expand Up @@ -1462,7 +1462,7 @@ func testAccMDBPGClusterConfigHANamed(name, version string) string {
host {
name = "nc"
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.mdb-pg-test-subnet-c.id
}
`, version)
Expand All @@ -1488,7 +1488,7 @@ func testAccMDBPGClusterConfigHANamedSwitchMaster(name, version string) string {
host {
name = "nc"
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.mdb-pg-test-subnet-c.id
}
`, version)
Expand All @@ -1512,7 +1512,7 @@ func testAccMDBPGClusterConfigHANamedChangePublicIP(name, version string) string
host {
name = "nc"
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.mdb-pg-test-subnet-c.id
assign_public_ip = true
Expand Down Expand Up @@ -1542,7 +1542,7 @@ func testAccMDBPGClusterConfigHANamedWithCascade(name, version string) string {
host {
name = "nc"
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.mdb-pg-test-subnet-c.id
assign_public_ip = true
}
Expand Down Expand Up @@ -1572,7 +1572,7 @@ func testAccMDBPGClusterConfigHANamedWithPriorities(name, version string) string
host {
name = "nc"
zone = "ru-central1-c"
zone = "ru-central1-d"
subnet_id = yandex_vpc_subnet.mdb-pg-test-subnet-c.id
assign_public_ip = true
Expand Down
Loading

0 comments on commit 5a15d67

Please sign in to comment.