Skip to content

Commit 539ebb8

Browse files
Update database host fields from "secondary" to "standby" (#855)
* Update database host fields from "secondary" to "standby" * fix test
1 parent 2c92c1e commit 539ebb8

13 files changed

+9519
-5008
lines changed

databases.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ type Database struct {
101101

102102
// DatabaseHost for Primary/Secondary of Database
103103
type DatabaseHost struct {
104-
Primary string `json:"primary"`
105-
Secondary string `json:"secondary,omitempty"`
104+
Primary string `json:"primary"`
105+
Standby string `json:"standby"`
106106
}
107107

108108
type DatabasePrivateNetwork struct {

test/integration/fixtures/TestDatabaseACLP_List.yaml

Lines changed: 0 additions & 4996 deletions
This file was deleted.

test/integration/fixtures/TestMonitorServicesTokenCreation_Get.yaml

Lines changed: 9507 additions & 0 deletions
Large diffs are not rendered by default.

test/integration/monitor_services_token_creation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
func TestMonitorServicesTokenCreation_Get_smoke(t *testing.T) {
13-
client, _, teardown, err := setupPostgresDatabase(t, nil, "fixtures/TestDatabaseACLP_List")
13+
client, _, teardown, err := setupPostgresDatabase(t, nil, "fixtures/TestMonitorServicesTokenCreation_Get")
1414
if err != nil {
1515
t.Error(err)
1616
}

test/integration/postgres_db_config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ func assertPostgresDatabaseBasics(t *testing.T, db *linodego.PostgresDatabase) {
498498

499499
// Assert Hosts structure
500500
assert.NotEmpty(t, db.Hosts.Primary)
501-
assert.Empty(t, db.Hosts.Secondary)
501+
assert.NotEmpty(t, db.Hosts.Standby)
502502

503503
// Assert EngineConfig structure
504504
assert.NotNil(t, db.EngineConfig.PG)

test/unit/fixtures/mysql_database_create.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"hosts": {
1515
"primary": "lin-123-456-mysql-mysql-primary.servers.linodedb.net",
16-
"secondary": "lin-123-456-mysql-primary-private.servers.linodedb.net"
16+
"standby": "lin-123-456-mysql-primary-private.servers.linodedb.net"
1717
},
1818
"id": 123,
1919
"label": "example-db-created",

test/unit/fixtures/mysql_database_get.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"hosts": {
1515
"primary": "lin-123-456-mysql-mysql-primary.servers.linodedb.net",
16-
"secondary": "lin-123-456-mysql-primary-private.servers.linodedb.net"
16+
"standby": "lin-123-456-mysql-primary-private.servers.linodedb.net"
1717
},
1818
"id": 123,
1919
"label": "example-db",

test/unit/fixtures/mysql_database_update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"hosts": {
1515
"primary": "lin-123-456-mysql-mysql-primary.servers.linodedb.net",
16-
"secondary": "lin-123-456-mysql-primary-private.servers.linodedb.net"
16+
"standby": "lin-123-456-mysql-primary-private.servers.linodedb.net"
1717
},
1818
"id": 123,
1919
"label": "example-db-updated",

test/unit/fixtures/mysql_databases_list.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"hosts": {
1717
"primary": "lin-123-456-mysql-mysql-primary.servers.linodedb.net",
18-
"secondary": "lin-123-456-mysql-primary-private.servers.linodedb.net"
18+
"standby": "lin-123-456-mysql-primary-private.servers.linodedb.net"
1919
},
2020
"id": 123,
2121
"label": "example-db",

test/unit/fixtures/postgresql_database_create.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"hosts": {
1515
"primary": "lin-0000-000-pgsql-primary.servers.linodedb.net",
16-
"secondary": "lin-0000-000-pgsql-primary-private.servers.linodedb.net"
16+
"standby": "lin-0000-000-pgsql-primary-private.servers.linodedb.net"
1717
},
1818
"id": 123,
1919
"label": "example-db-created",

0 commit comments

Comments
 (0)