Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add support for DBaaS VPC networks #255

Merged
merged 2 commits into from
Jul 19, 2023
Merged

Add support for DBaaS VPC networks #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f90b44d
Add support for DBaaS VPC networks
christhemorse Jul 18, 2023
9f9e05a
Update tests for DBaaS VPC structure changes
christhemorse Jul 18, 2023
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
7 changes: 5 additions & 2 deletions database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,12 @@ type Database struct {
PlanVCPUs int `json:"plan_vcpus"`
PlanReplicas int `json:"plan_replicas"`
Region string `json:"region"`
DatabaseEngine string `json:"database_engine"`
DatabaseEngineVersion string `json:"database_engine_version"`
VPCID string `json:"vpc_id"`
Status string `json:"status"`
Label string `json:"label"`
Tag string `json:"tag"`
DatabaseEngine string `json:"database_engine"`
DatabaseEngineVersion string `json:"database_engine_version"`
DBName string `json:"dbname,omitempty"`
Host string `json:"host"`
User string `json:"user"`
Expand Down Expand Up @@ -171,6 +172,7 @@ type DatabaseCreateReq struct {
Plan string `json:"plan,omitempty"`
Label string `json:"label,omitempty"`
Tag string `json:"tag,omitempty"`
VPCID string `json:"vpc_id,omitempty"`
MaintenanceDOW string `json:"maintenance_dow,omitempty"`
MaintenanceTime string `json:"maintenance_time,omitempty"`
TrustedIPs []string `json:"trusted_ips,omitempty"`
Expand All @@ -187,6 +189,7 @@ type DatabaseUpdateReq struct {
Plan string `json:"plan,omitempty"`
Label string `json:"label,omitempty"`
Tag string `json:"tag,omitempty"`
VPCID string `json:"vpc_id,omitempty"`
MaintenanceDOW string `json:"maintenance_dow,omitempty"`
MaintenanceTime string `json:"maintenance_time,omitempty"`
ClusterTimeZone string `json:"cluster_time_zone,omitempty"`
Expand Down
70 changes: 42 additions & 28 deletions database_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ func TestDatabaseServiceHandler_List(t *testing.T) {
"plan_vcpus": 2,
"plan_replicas": 1,
"region": "EWR",
"database_engine": "mysql",
"database_engine_version": "8",
"vpc_id": "d39bf0bf-e050-47d4-a291-5d6fc736f250",
"status": "Running",
"label": "testy-mc-testerton-the-8th",
"tag": "bing bong",
"database_engine": "mysql",
"database_engine_version": "8",
"dbname": "defaultdb",
"host": "vultr-prod-2db1ff4d-9d78-4baa-b52e-ec2b166107bb-vultr-prod-85e0.vultrdb.com",
"user": "vultradmin",
Expand Down Expand Up @@ -58,11 +59,12 @@ func TestDatabaseServiceHandler_List(t *testing.T) {
"plan_vcpus": 2,
"plan_replicas": 0,
"region": "EWR",
"database_engine": "mysql",
"database_engine_version": "8",
"vpc_id": "d39bf0bf-e050-47d4-a291-5d6fc736f250",
"status": "Running",
"label": "testy-mc-testerton-the-7th",
"tag": "",
"database_engine": "mysql",
"database_engine_version": "8",
"dbname": "defaultdb",
"host": "vultr-prod-87086a7d-4bc8-47ca-aa88-f88138d82772-vultr-prod-85e0.vultrdb.com",
"user": "vultradmin",
Expand Down Expand Up @@ -118,11 +120,12 @@ func TestDatabaseServiceHandler_List(t *testing.T) {
PlanVCPUs: 2,
PlanReplicas: 0,
Region: "EWR",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
VPCID: "d39bf0bf-e050-47d4-a291-5d6fc736f250",
Status: "Running",
Label: "testy-mc-testerton-the-7th",
Tag: "",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
DBName: "defaultdb",
Host: "vultr-prod-87086a7d-4bc8-47ca-aa88-f88138d82772-vultr-prod-85e0.vultrdb.com",
User: "vultradmin",
Expand All @@ -149,11 +152,12 @@ func TestDatabaseServiceHandler_List(t *testing.T) {
PlanVCPUs: 2,
PlanReplicas: 1,
Region: "EWR",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
VPCID: "d39bf0bf-e050-47d4-a291-5d6fc736f250",
Status: "Running",
Label: "testy-mc-testerton-the-8th",
Tag: "bing bong",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
DBName: "defaultdb",
Host: "vultr-prod-2db1ff4d-9d78-4baa-b52e-ec2b166107bb-vultr-prod-85e0.vultrdb.com",
User: "vultradmin",
Expand Down Expand Up @@ -199,11 +203,12 @@ func TestDatabaseServiceHandler_Create(t *testing.T) {
"plan_vcpus": 2,
"plan_replicas": 1,
"region": "EWR",
"database_engine": "mysql",
"database_engine_version": "8",
"vpc_id": "",
"status": "Running",
"label": "testy-mc-testerton-the-8th",
"tag": "",
"database_engine": "mysql",
"database_engine_version": "8",
"dbname": "defaultdb",
"host": "vultr-prod-2db1ff4d-9d78-4baa-b52e-ec2b166107bb-vultr-prod-85e0.vultrdb.com",
"user": "vultradmin",
Expand Down Expand Up @@ -261,11 +266,12 @@ func TestDatabaseServiceHandler_Create(t *testing.T) {
PlanVCPUs: 2,
PlanReplicas: 1,
Region: "EWR",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
VPCID: "",
Status: "Running",
Label: "testy-mc-testerton-the-8th",
Tag: "",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
DBName: "defaultdb",
Host: "vultr-prod-2db1ff4d-9d78-4baa-b52e-ec2b166107bb-vultr-prod-85e0.vultrdb.com",
User: "vultradmin",
Expand Down Expand Up @@ -302,11 +308,12 @@ func TestDatabaseServiceHandler_Get(t *testing.T) {
"plan_vcpus": 2,
"plan_replicas": 1,
"region": "EWR",
"database_engine": "mysql",
"database_engine_version": "8",
"vpc_id": "d39bf0bf-e050-47d4-a291-5d6fc736f250",
"status": "Running",
"label": "testy-mc-testerton-the-8th",
"tag": "bing bong",
"database_engine": "mysql",
"database_engine_version": "8",
"dbname": "defaultdb",
"host": "vultr-prod-2db1ff4d-9d78-4baa-b52e-ec2b166107bb-vultr-prod-85e0.vultrdb.com",
"user": "vultradmin",
Expand Down Expand Up @@ -337,11 +344,12 @@ func TestDatabaseServiceHandler_Get(t *testing.T) {
"plan_vcpus": 2,
"plan_replicas": 0,
"region": "EWR",
"database_engine": "mysql",
"database_engine_version": "8",
"vpc_id": "d39bf0bf-e050-47d4-a291-5d6fc736f250",
"status": "Running",
"label": "testy-mc-testerton-the-7th",
"tag": "",
"database_engine": "mysql",
"database_engine_version": "8",
"dbname": "defaultdb",
"host": "vultr-prod-87086a7d-4bc8-47ca-aa88-f88138d82772-vultr-prod-85e0.vultrdb.com",
"user": "vultradmin",
Expand Down Expand Up @@ -393,11 +401,12 @@ func TestDatabaseServiceHandler_Get(t *testing.T) {
PlanVCPUs: 2,
PlanReplicas: 0,
Region: "EWR",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
VPCID: "d39bf0bf-e050-47d4-a291-5d6fc736f250",
Status: "Running",
Label: "testy-mc-testerton-the-7th",
Tag: "",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
DBName: "defaultdb",
Host: "vultr-prod-87086a7d-4bc8-47ca-aa88-f88138d82772-vultr-prod-85e0.vultrdb.com",
User: "vultradmin",
Expand All @@ -423,11 +432,12 @@ func TestDatabaseServiceHandler_Get(t *testing.T) {
PlanVCPUs: 2,
PlanReplicas: 1,
Region: "EWR",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
VPCID: "d39bf0bf-e050-47d4-a291-5d6fc736f250",
Status: "Running",
Label: "testy-mc-testerton-the-8th",
Tag: "bing bong",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
DBName: "defaultdb",
Host: "vultr-prod-2db1ff4d-9d78-4baa-b52e-ec2b166107bb-vultr-prod-85e0.vultrdb.com",
User: "vultradmin",
Expand Down Expand Up @@ -464,11 +474,12 @@ func TestDatabaseServiceHandler_Update(t *testing.T) {
"plan_vcpus": 2,
"plan_replicas": 1,
"region": "EWR",
"database_engine": "mysql",
"database_engine_version": "8",
"vpc_id": "d39bf0bf-e050-47d4-a291-5d6fc736f250",
"status": "Running",
"label": "testy-mc-testerton-the-8th-part-2",
"tag": "bing bong updated",
"database_engine": "mysql",
"database_engine_version": "8",
"dbname": "defaultdb",
"host": "vultr-prod-2db1ff4d-9d78-4baa-b52e-ec2b166107bb-vultr-prod-85e0.vultrdb.com",
"user": "vultradmin",
Expand Down Expand Up @@ -500,11 +511,12 @@ func TestDatabaseServiceHandler_Update(t *testing.T) {
"plan_vcpus": 2,
"plan_replicas": 0,
"region": "EWR",
"database_engine": "mysql",
"database_engine_version": "8",
"vpc_id": "d39bf0bf-e050-47d4-a291-5d6fc736f250",
"status": "Running",
"label": "testy-mc-testerton-the-7th",
"tag": "",
"database_engine": "mysql",
"database_engine_version": "8",
"dbname": "defaultdb",
"host": "vultr-prod-87086a7d-4bc8-47ca-aa88-f88138d82772-vultr-prod-85e0.vultrdb.com",
"user": "vultradmin",
Expand Down Expand Up @@ -564,11 +576,12 @@ func TestDatabaseServiceHandler_Update(t *testing.T) {
PlanVCPUs: 2,
PlanReplicas: 0,
Region: "EWR",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
VPCID: "d39bf0bf-e050-47d4-a291-5d6fc736f250",
Status: "Running",
Label: "testy-mc-testerton-the-7th",
Tag: "",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
DBName: "defaultdb",
Host: "vultr-prod-87086a7d-4bc8-47ca-aa88-f88138d82772-vultr-prod-85e0.vultrdb.com",
User: "vultradmin",
Expand All @@ -595,11 +608,12 @@ func TestDatabaseServiceHandler_Update(t *testing.T) {
PlanVCPUs: 2,
PlanReplicas: 1,
Region: "EWR",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
VPCID: "d39bf0bf-e050-47d4-a291-5d6fc736f250",
Status: "Running",
Label: "testy-mc-testerton-the-8th-part-2",
Tag: "bing bong updated",
DatabaseEngine: "mysql",
DatabaseEngineVersion: "8",
DBName: "defaultdb",
Host: "vultr-prod-2db1ff4d-9d78-4baa-b52e-ec2b166107bb-vultr-prod-85e0.vultrdb.com",
User: "vultradmin",
Expand Down