Skip to content

Commit 7c7f6ca

Browse files
villevsv-upcloudvillevsv-upcloud
authored
chore(dbaas): remove Type from clone & modify database reqs (#294)
1 parent 6d789dd commit 7c7f6ca

28 files changed

+3053
-1841
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
1616
### Removed
1717
- **Breaking**, Managed Database: connection related methods in favor of session
1818
- **Breaking**: remove `Timeout` option from `WaitFor*` methods. Use `context.WithTimeout` to define a timeout for these functions.
19+
- **Breaking**: Managed Database: `Type` field from `CloneManagedDatabaseRequest` and `ModifyManagedDatabaseRequest`
1920

2021
## [6.12.0]
2122

‎upcloud/request/managed_database.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ type CloneManagedDatabaseRequest struct {
4747
Plan string `json:"plan"`
4848
Properties ManagedDatabasePropertiesRequest `json:"properties,omitempty"`
4949
Title string `json:"title,omitempty"`
50-
Type upcloud.ManagedDatabaseServiceType `json:"type"`
5150
Zone string `json:"zone"`
5251
}
5352

@@ -415,7 +414,6 @@ type ModifyManagedDatabaseRequest struct {
415414
Plan string `json:"plan,omitempty"`
416415
Properties ManagedDatabasePropertiesRequest `json:"properties,omitempty"`
417416
Title string `json:"title,omitempty"`
418-
Type upcloud.ManagedDatabaseServiceType `json:"type,omitempty"`
419417
UUID string `json:"-"`
420418
Zone string `json:"zone,omitempty"`
421419
}

‎upcloud/request/managed_database_test.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestCloneManagedDatabaseRequest_MarshalJSON(t *testing.T) {
2525
req := CloneManagedDatabaseRequest{}
2626
d, err := json.Marshal(&req)
2727
assert.NoError(t, err)
28-
assert.Equal(t, `{"hostname_prefix":"","plan":"","type":"","zone":""}`, string(d))
28+
assert.Equal(t, `{"hostname_prefix":"","plan":"","zone":""}`, string(d))
2929
})
3030

3131
req := CloneManagedDatabaseRequest{
@@ -39,7 +39,6 @@ func TestCloneManagedDatabaseRequest_MarshalJSON(t *testing.T) {
3939
},
4040
Plan: "fakeplan",
4141
Title: "faketitle",
42-
Type: "faketype",
4342
Zone: "fakezone",
4443
}
4544
req.Properties.Set("fakeprop", "fakevalue")
@@ -54,7 +53,6 @@ func TestCloneManagedDatabaseRequest_MarshalJSON(t *testing.T) {
5453
"fakeprop": "fakevalue"
5554
},
5655
"title": "faketitle",
57-
"type": "faketype",
5856
"zone": "fakezone",
5957
"clone_time": "2021-01-01T00:00:00Z",
6058
"maintenance": {
@@ -218,7 +216,6 @@ func TestModifyManagedDatabaseRequest_MarshalJSON(t *testing.T) {
218216
},
219217
Plan: "fakeplan",
220218
Title: "faketitle",
221-
Type: "faketype",
222219
UUID: "fakeuuid",
223220
Zone: "fakezone",
224221
}
@@ -232,7 +229,6 @@ func TestModifyManagedDatabaseRequest_MarshalJSON(t *testing.T) {
232229
"fakeprop": "fakevalue"
233230
},
234231
"title": "faketitle",
235-
"type": "faketype",
236232
"zone": "fakezone",
237233
"maintenance": {
238234
"dow": "monday",

‎upcloud/service/fixtures/clonemanageddatabase.yaml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ interactions:
1010
Content-Type:
1111
- application/json
1212
User-Agent:
13-
- upcloud-go-api/6.1.1
13+
- upcloud-go-api/6.12.0
1414
url: https://api.upcloud.com/1.3/database
1515
method: POST
1616
response:
17-
body: '{"backups":[],"components":[{"component":"pg","host":"clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"dynamic","usage":"primary"},{"component":"pg","host":"replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"dynamic","usage":"replica"},{"component":"pg","host":"public-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"public","usage":"primary"},{"component":"pg","host":"public-replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"public","usage":"replica"},{"component":"pgbouncer","host":"clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"dynamic","usage":"primary"},{"component":"pgbouncer","host":"replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"dynamic","usage":"replica"},{"component":"pgbouncer","host":"public-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"public","usage":"primary"},{"component":"pgbouncer","host":"public-replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"public","usage":"replica"}],"create_time":"0001-01-01T00:00:00Z","maintenance":{"dow":"monday","time":"12:00:00","pending_updates":[]},"name":"clonemanageddatabase","node_count":2,"node_states":[{"name":"clonemanageddatabase-1","role":"standby","state":"setting_up_vm"}],"plan":"2x2xCPU-4GB-100GB","powered":true,"metadata":{"max_connections":100,"pg_version":"15","write_block_threshold_exceeded":null},"properties":{"automatic_utility_network_ip_filter":true,"backup_hour":10,"backup_minute":50,"ip_filter":["10.0.0.1/32"],"pg_stat_monitor_enable":false,"pglookout":{"max_failover_replication_time_lag":60},"public_access":true,"version":"15"},"uuid":"09cbc273-03e1-4933-97ea-81e05862cee2","state":"rebuilding","title":"clonemanageddatabase","type":"pg","update_time":"0001-01-01T00:00:00Z","service_uri":"postgres://upadmin:AVNS_aFezyYPwJQHuDTkZz66@clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com:11550/defaultdb?sslmode=require","service_uri_params":{"dbname":"defaultdb","host":"clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","password":"AVNS_aFezyYPwJQHuDTkZz66","port":"11550","ssl_mode":"require","user":"upadmin"},"users":[{"username":"upadmin","type":"primary"}],"databases":[{"name":"defaultdb"}],"zone":"fi-hel2"}'
17+
body: '{"uuid":"0905c7cf-2853-469e-93d7-816d0b2bdc49","zone":"fi-hel2","name":"clonemanageddatabase","title":"clonemanageddatabase","type":"pg","plan":"2x2xCPU-4GB-100GB","state":"pending","powered":true,"termination_protection":false,"node_count":2,"create_time":"2024-01-31T11:44:49Z","update_time":"2024-01-31T11:44:49Z","service_uri":"","service_uri_params":{},"maintenance":{"dow":"monday","time":"12:00:00","pending_updates":[]},"metadata":{},"properties":{"automatic_utility_network_ip_filter":true,"ip_filter":["10.0.0.1/32"],"public_access":true},"networks":[],"node_states":[],"backups":[],"components":[],"users":[],"databases":[]}'
1818
headers:
19-
Access-Control-Allow-Origin:
20-
- '*'
19+
Content-Length:
20+
- "635"
2121
Content-Type:
2222
- application/json
2323
Date:
24-
- Wed, 17 May 2023 06:27:42 GMT
24+
- Wed, 31 Jan 2024 11:44:49 GMT
2525
Strict-Transport-Security:
2626
- max-age=63072000
27-
status: 200 OK
28-
code: 200
27+
status: 201 Created
28+
code: 201
2929
duration: ""
3030
- request:
3131
body: ""
@@ -36,46 +36,46 @@ interactions:
3636
Content-Type:
3737
- application/json
3838
User-Agent:
39-
- upcloud-go-api/6.1.1
40-
url: https://api.upcloud.com/1.3/database/09cbc273-03e1-4933-97ea-81e05862cee2
39+
- upcloud-go-api/6.12.0
40+
url: https://api.upcloud.com/1.3/database/0905c7cf-2853-469e-93d7-816d0b2bdc49
4141
method: GET
4242
response:
43-
body: '{"backups":[{"backup_name":"2023-05-17_06-29_0.00000000.pghoard","backup_time":"2023-05-17T06:29:57.866000Z","data_size":33730774}],"components":[{"component":"pg","host":"clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"dynamic","usage":"primary"},{"component":"pg","host":"replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"dynamic","usage":"replica"},{"component":"pg","host":"public-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"public","usage":"primary"},{"component":"pg","host":"public-replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"public","usage":"replica"},{"component":"pgbouncer","host":"clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"dynamic","usage":"primary"},{"component":"pgbouncer","host":"replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"dynamic","usage":"replica"},{"component":"pgbouncer","host":"public-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"public","usage":"primary"},{"component":"pgbouncer","host":"public-replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"public","usage":"replica"}],"create_time":"2023-05-17T06:27:40Z","maintenance":{"dow":"monday","time":"12:00:00","pending_updates":[]},"name":"clonemanageddatabase","node_count":2,"node_states":[{"name":"clonemanageddatabase-1","role":"master","state":"running"},{"name":"clonemanageddatabase-2","role":"standby","state":"running"}],"plan":"2x2xCPU-4GB-100GB","powered":true,"metadata":{"max_connections":100,"pg_version":"15.2","write_block_threshold_exceeded":false},"properties":{"automatic_utility_network_ip_filter":true,"backup_hour":10,"backup_minute":50,"ip_filter":["10.0.0.1/32"],"pg_stat_monitor_enable":false,"pglookout":{"max_failover_replication_time_lag":60},"public_access":true,"version":"15"},"uuid":"09cbc273-03e1-4933-97ea-81e05862cee2","state":"running","title":"clonemanageddatabase","type":"pg","update_time":"2023-05-17T06:27:40Z","service_uri":"postgres://upadmin:AVNS_aFezyYPwJQHuDTkZz66@clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com:11550/defaultdb?sslmode=require","service_uri_params":{"dbname":"defaultdb","host":"clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","password":"AVNS_aFezyYPwJQHuDTkZz66","port":"11550","ssl_mode":"require","user":"upadmin"},"users":[{"username":"upadmin","type":"primary"}],"databases":[{"name":"defaultdb"}],"zone":"fi-hel2"}'
43+
body: '{"uuid":"0905c7cf-2853-469e-93d7-816d0b2bdc49","zone":"fi-hel2","name":"clonemanageddatabase","title":"clonemanageddatabase","type":"pg","plan":"2x2xCPU-4GB-100GB","state":"running","powered":true,"termination_protection":false,"node_count":2,"create_time":"2024-01-31T11:44:49Z","update_time":"2024-01-31T11:45:01Z","service_uri":"postgres://upadmin:AVNS_Uo9BQxkjujUr8hMx6Yb@clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com:11569/defaultdb?sslmode=require","service_uri_params":{"dbname":"defaultdb","host":"clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","password":"AVNS_Uo9BQxkjujUr8hMx6Yb","port":"11569","ssl_mode":"require","user":"upadmin"},"maintenance":{"dow":"monday","time":"12:00:00","pending_updates":[]},"metadata":{"max_connections":100,"pg_version":"15.5","write_block_threshold_exceeded":false},"properties":{"automatic_utility_network_ip_filter":true,"backup_hour":0,"backup_minute":4,"ip_filter":["10.0.0.1/32"],"pg_stat_monitor_enable":false,"pglookout":{"max_failover_replication_time_lag":60},"public_access":true,"version":"15"},"networks":[],"node_states":[{"name":"clonemanageddatabase-1","role":"master","state":"running"},{"name":"clonemanageddatabase-2","role":"standby","state":"running"}],"backups":[{"backup_name":"2024-01-31_11-48_0.00000000.pghoard","backup_time":"2024-01-31T11:48:01.762125Z","data_size":33587414}],"components":[{"component":"pg","host":"clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11569,"route":"dynamic","usage":"primary"},{"component":"pg","host":"replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11569,"route":"dynamic","usage":"replica"},{"component":"pg","host":"public-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11569,"route":"public","usage":"primary"},{"component":"pg","host":"public-replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11569,"route":"public","usage":"replica"},{"component":"pgbouncer","host":"clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11570,"route":"dynamic","usage":"primary"},{"component":"pgbouncer","host":"replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11570,"route":"dynamic","usage":"replica"},{"component":"pgbouncer","host":"public-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11570,"route":"public","usage":"primary"},{"component":"pgbouncer","host":"public-replica-clonemanageddatabase-zhbmidiechch.db.upclouddatabases.com","port":11570,"route":"public","usage":"replica"}],"users":[{"username":"upadmin","type":"primary"}],"databases":[{"name":"defaultdb"}]}'
4444
headers:
4545
Content-Type:
4646
- application/json
4747
Date:
48-
- Wed, 17 May 2023 06:32:21 GMT
48+
- Wed, 31 Jan 2024 11:51:11 GMT
4949
Strict-Transport-Security:
5050
- max-age=63072000
5151
status: 200 OK
5252
code: 200
5353
duration: ""
5454
- request:
55-
body: '{"hostname_prefix":"clonemanageddatabase-clone","plan":"2x2xCPU-4GB-100GB","title":"clonemanageddatabase-clone","type":"","zone":"fi-hel2","clone_time":"2023-05-17T06:29:58.866Z"}'
55+
body: '{"hostname_prefix":"clonemanageddatabase-clone","plan":"2x2xCPU-4GB-100GB","title":"clonemanageddatabase-clone","zone":"fi-hel2","clone_time":"2024-01-31T11:48:02.762125Z"}'
5656
form: {}
5757
headers:
5858
Accept:
5959
- application/json
6060
Content-Type:
6161
- application/json
6262
User-Agent:
63-
- upcloud-go-api/6.1.1
64-
url: https://api.upcloud.com/1.3/database/09cbc273-03e1-4933-97ea-81e05862cee2/clone
63+
- upcloud-go-api/6.12.0
64+
url: https://api.upcloud.com/1.3/database/0905c7cf-2853-469e-93d7-816d0b2bdc49/clone
6565
method: POST
6666
response:
67-
body: '{"backups":[],"components":[{"component":"pg","host":"clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"dynamic","usage":"primary"},{"component":"pg","host":"replica-clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"dynamic","usage":"replica"},{"component":"pg","host":"public-clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"public","usage":"primary"},{"component":"pg","host":"public-replica-clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"public","usage":"replica"},{"component":"pgbouncer","host":"clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"dynamic","usage":"primary"},{"component":"pgbouncer","host":"replica-clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"dynamic","usage":"replica"},{"component":"pgbouncer","host":"public-clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"public","usage":"primary"},{"component":"pgbouncer","host":"public-replica-clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com","port":11551,"route":"public","usage":"replica"}],"create_time":"2023-05-17T06:27:40Z","maintenance":{"dow":"monday","time":"12:00:00","pending_updates":[]},"name":"clonemanageddatabase-clone","node_count":2,"node_states":[],"plan":"2x2xCPU-4GB-100GB","powered":true,"metadata":{"max_connections":100,"pg_version":"15","write_block_threshold_exceeded":null},"properties":{"automatic_utility_network_ip_filter":true,"backup_hour":10,"backup_minute":50,"ip_filter":["10.0.0.1/32"],"pg_stat_monitor_enable":false,"pglookout":{"max_failover_replication_time_lag":60},"public_access":true,"version":"15"},"uuid":"09aa2b3c-b044-4bc9-abe1-ac5afc52a727","state":"rebuilding","title":"clonemanageddatabase-clone","type":"pg","update_time":"2023-05-17T06:27:40Z","service_uri":"postgres://upadmin:AVNS_aFezyYPwJQHuDTkZz66@clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com:11550/defaultdb?sslmode=require","service_uri_params":{"dbname":"defaultdb","host":"clonemanageddatabase-clone-zhbmidiechch.db.upclouddatabases.com","password":"AVNS_aFezyYPwJQHuDTkZz66","port":"11550","ssl_mode":"require","user":"upadmin"},"users":[{"username":"upadmin","type":"primary"}],"databases":[{"name":"defaultdb"}],"zone":"fi-hel2"}'
67+
body: '{"uuid":"09007193-1ca1-4307-88ca-18fbee15bd37","zone":"fi-hel2","name":"clonemanageddatabase-clone","title":"clonemanageddatabase-clone","type":"pg","plan":"2x2xCPU-4GB-100GB","state":"pending","powered":true,"termination_protection":false,"node_count":2,"create_time":"2024-01-31T11:51:12Z","update_time":"2024-01-31T11:51:12Z","service_uri":"","service_uri_params":{},"maintenance":{"dow":"monday","time":"12:00:00","pending_updates":[]},"metadata":{},"properties":{"automatic_utility_network_ip_filter":true,"ip_filter":["10.0.0.1/32"]},"networks":[],"node_states":[],"backups":[],"components":[],"users":[],"databases":[]}'
6868
headers:
69-
Access-Control-Allow-Origin:
70-
- '*'
69+
Content-Length:
70+
- "626"
7171
Content-Type:
7272
- application/json
7373
Date:
74-
- Wed, 17 May 2023 06:32:24 GMT
74+
- Wed, 31 Jan 2024 11:51:12 GMT
7575
Strict-Transport-Security:
7676
- max-age=63072000
77-
status: 200 OK
78-
code: 200
77+
status: 201 Created
78+
code: 201
7979
duration: ""
8080
- request:
8181
body: ""
@@ -86,14 +86,14 @@ interactions:
8686
Content-Type:
8787
- application/json
8888
User-Agent:
89-
- upcloud-go-api/6.1.1
90-
url: https://api.upcloud.com/1.3/database/09cbc273-03e1-4933-97ea-81e05862cee2
89+
- upcloud-go-api/6.12.0
90+
url: https://api.upcloud.com/1.3/database/0905c7cf-2853-469e-93d7-816d0b2bdc49
9191
method: DELETE
9292
response:
9393
body: ""
9494
headers:
9595
Date:
96-
- Wed, 17 May 2023 06:32:25 GMT
96+
- Wed, 31 Jan 2024 11:51:13 GMT
9797
Strict-Transport-Security:
9898
- max-age=63072000
9999
status: 204 No Content
@@ -108,14 +108,14 @@ interactions:
108108
Content-Type:
109109
- application/json
110110
User-Agent:
111-
- upcloud-go-api/6.1.1
112-
url: https://api.upcloud.com/1.3/database/09aa2b3c-b044-4bc9-abe1-ac5afc52a727
111+
- upcloud-go-api/6.12.0
112+
url: https://api.upcloud.com/1.3/database/09007193-1ca1-4307-88ca-18fbee15bd37
113113
method: DELETE
114114
response:
115115
body: ""
116116
headers:
117117
Date:
118-
- Wed, 17 May 2023 06:32:26 GMT
118+
- Wed, 31 Jan 2024 11:51:13 GMT
119119
Strict-Transport-Security:
120120
- max-age=63072000
121121
status: 204 No Content

0 commit comments

Comments
 (0)