fix(dbaas): delete obsolete GetManagedDatabaseIndex method (#233)

Author: villevsv-upcloud

upcloud/request/managed_database.go

@@ -437,8 +437,8 @@ func (m *ModifyManagedDatabaseRequest) RequestURL() string {
 type ModifyManagedDatabaseAccessControlRequest struct {
 	// ServiceUUID selects a managed database service to modify
 	ServiceUUID         string `json:"-"`
-	ACLsEnabled         *bool  `json:"access_control"`
-	ExtendedACLsEnabled *bool  `json:"extended_access_control"`
+	ACLsEnabled         *bool  `json:"access_control,omitempty"`
+	ExtendedACLsEnabled *bool  `json:"extended_access_control,omitempty"`
 }
 
 // RequestURL implements the request.Request interface
@@ -658,19 +658,6 @@ func (g *GetManagedDatabaseIndicesRequest) RequestURL() string {
 	return fmt.Sprintf("/database/%s/indices", g.ServiceUUID)
 }
 
-// GetManagedDatabaseIndexRequest represents a request to get details of an index of an existing managed database
-// instance.
-type GetManagedDatabaseIndexRequest struct {
-	// ServiceUUID selects a managed database service to query
-	ServiceUUID string `json:"-"`
-	IndexName   string `json:"-"`
-}
-
-// RequestURL implements the request.Request interface
-func (g *GetManagedDatabaseIndexRequest) RequestURL() string {
-	return fmt.Sprintf("/database/%s/indices/%s", g.ServiceUUID, g.IndexName)
-}
-
 // DeleteManagedDatabaseIndexRequest represents a request to delete an index from an existing managed database instance.
 type DeleteManagedDatabaseIndexRequest struct {
 	// ServiceUUID selects a managed database service to modify

upcloud/service/fixtures/modifymanageddatabaseaccesscontrol.yaml

@@ -10,20 +10,20 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - upcloud-go-api/6.1.1
+      - upcloud-go-api/6.2.0
     url: https://api.upcloud.com/1.3/database
     method: POST
   response:
-    body: '{"backups":[],"components":[{"component":"opensearch","host":"modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"dynamic","usage":"primary"},{"component":"opensearch","host":"public-modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"public","usage":"primary"},{"component":"opensearch_dashboards","host":"modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","port":443,"route":"dynamic","usage":"primary"},{"component":"opensearch_dashboards","host":"public-modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","port":443,"route":"public","usage":"primary"}],"create_time":"0001-01-01T00:00:00Z","maintenance":{"dow":"monday","time":"12:00:00","pending_updates":[]},"name":"modifyaccesscontrol","node_count":1,"node_states":[],"plan":"1x2xCPU-4GB-80GB-1D","powered":true,"metadata":{"opensearch_version":"2","upgrade_version":null},"properties":{"automatic_utility_network_ip_filter":true,"ip_filter":["10.0.0.1/32"],"max_index_count":0,"public_access":true,"version":"2"},"uuid":"09334fc6-86ab-4f19-bc1d-70ba5762ecd9","state":"rebuilding","title":"modifyaccesscontrol","type":"opensearch","update_time":"0001-01-01T00:00:00Z","service_uri":"https://upadmin:AVNS_6x2AqgKRdJj9Qu9mcw2@modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com:11550","service_uri_params":{"host":"modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","password":"AVNS_6x2AqgKRdJj9Qu9mcw2","port":"11550","user":"upadmin"},"users":[{"username":"upadmin","type":"primary"}],"zone":"fi-hel2"}'
+    body: '{"backups":[],"components":[{"component":"opensearch","host":"modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"dynamic","usage":"primary"},{"component":"opensearch","host":"public-modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","port":11550,"route":"public","usage":"primary"},{"component":"opensearch_dashboards","host":"modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","port":443,"route":"dynamic","usage":"primary"},{"component":"opensearch_dashboards","host":"public-modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","port":443,"route":"public","usage":"primary"}],"create_time":"0001-01-01T00:00:00Z","maintenance":{"dow":"monday","time":"12:00:00","pending_updates":[]},"name":"modifyaccesscontrol","node_count":1,"node_states":[{"name":"modifyaccesscontrol-1","role":"","state":"setting_up_vm"}],"plan":"1x2xCPU-4GB-80GB-1D","powered":true,"metadata":{"opensearch_version":"2","upgrade_version":null},"properties":{"automatic_utility_network_ip_filter":true,"ip_filter":["10.0.0.1/32"],"max_index_count":0,"public_access":true,"version":"2"},"uuid":"09b6125c-b2b5-43f2-a9d0-720f72fffbf0","state":"rebuilding","title":"modifyaccesscontrol","type":"opensearch","update_time":"0001-01-01T00:00:00Z","service_uri":"https://upadmin:AVNS_Q5uzb-Npqc2iuAmImY-@modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com:11550","service_uri_params":{"host":"modifyaccesscontrol-zhbmidiechch.db.upclouddatabases.com","password":"AVNS_Q5uzb-Npqc2iuAmImY-","port":"11550","user":"upadmin"},"users":[{"username":"upadmin","type":"primary"}],"zone":"fi-hel2"}'
     headers:
       Access-Control-Allow-Origin:
       - '*'
       Content-Length:
-      - "1541"
+      - "1607"
       Content-Type:
       - application/json
       Date:
-      - Wed, 17 May 2023 07:24:43 GMT
+      - Wed, 31 May 2023 11:00:24 GMT
       Strict-Transport-Security:
       - max-age=63072000
     status: 200 OK
@@ -38,8 +38,8 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - upcloud-go-api/6.1.1
-    url: https://api.upcloud.com/1.3/database/09334fc6-86ab-4f19-bc1d-70ba5762ecd9/access-control
+      - upcloud-go-api/6.2.0
+    url: https://api.upcloud.com/1.3/database/09b6125c-b2b5-43f2-a9d0-720f72fffbf0/access-control
     method: GET
   response:
     body: '{"access_control":false,"extended_access_control":false}'
@@ -49,23 +49,51 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Wed, 17 May 2023 07:27:35 GMT
+      - Wed, 31 May 2023 11:04:15 GMT
       Strict-Transport-Security:
       - max-age=63072000
     status: 200 OK
     code: 200
     duration: ""
 - request:
-    body: '{"access_control":true,"extended_access_control":true}'
+    body: '{"access_control":true}'
+    form: {}
+    headers:
+      Accept:
+      - application/json
+      Content-Type:
+      - application/json
+      User-Agent:
+      - upcloud-go-api/6.2.0
+    url: https://api.upcloud.com/1.3/database/09b6125c-b2b5-43f2-a9d0-720f72fffbf0/access-control
+    method: PATCH
+  response:
+    body: '{"access_control":true,"extended_access_control":false}'
+    headers:
+      Access-Control-Allow-Origin:
+      - '*'
+      Content-Length:
+      - "55"
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 31 May 2023 11:04:15 GMT
+      Strict-Transport-Security:
+      - max-age=63072000
+    status: 200 OK
+    code: 200
+    duration: ""
+- request:
+    body: '{"extended_access_control":true}'
     form: {}
     headers:
       Accept:
       - application/json
       Content-Type:
       - application/json
       User-Agent:
-      - upcloud-go-api/6.1.1
-    url: https://api.upcloud.com/1.3/database/09334fc6-86ab-4f19-bc1d-70ba5762ecd9/access-control
+      - upcloud-go-api/6.2.0
+    url: https://api.upcloud.com/1.3/database/09b6125c-b2b5-43f2-a9d0-720f72fffbf0/access-control
     method: PATCH
   response:
     body: '{"access_control":true,"extended_access_control":true}'
@@ -77,7 +105,7 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Wed, 17 May 2023 07:27:36 GMT
+      - Wed, 31 May 2023 11:04:16 GMT
       Strict-Transport-Security:
       - max-age=63072000
     status: 200 OK
@@ -92,14 +120,14 @@ interactions:
       Content-Type:
       - application/json
       User-Agent:
-      - upcloud-go-api/6.1.1
-    url: https://api.upcloud.com/1.3/database/09334fc6-86ab-4f19-bc1d-70ba5762ecd9
+      - upcloud-go-api/6.2.0
+    url: https://api.upcloud.com/1.3/database/09b6125c-b2b5-43f2-a9d0-720f72fffbf0
     method: DELETE
   response:
     body: ""
     headers:
       Date:
-      - Wed, 17 May 2023 07:27:37 GMT
+      - Wed, 31 May 2023 11:04:17 GMT
       Strict-Transport-Security:
       - max-age=63072000
     status: 204 No Content

upcloud/service/managed_database.go

@@ -21,7 +21,6 @@ type ManagedDatabaseServiceManager interface {
 	GetManagedDatabases(ctx context.Context, r *request.GetManagedDatabasesRequest) ([]upcloud.ManagedDatabase, error)
 	GetManagedDatabaseAccessControl(ctx context.Context, r *request.GetManagedDatabaseAccessControlRequest) (*upcloud.ManagedDatabaseAccessControl, error)
 	GetManagedDatabaseConnections(ctx context.Context, r *request.GetManagedDatabaseConnectionsRequest) ([]upcloud.ManagedDatabaseConnection, error)
-	GetManagedDatabaseIndex(ctx context.Context, r *request.GetManagedDatabaseIndexRequest) (*upcloud.ManagedDatabaseIndex, error)
 	GetManagedDatabaseIndices(ctx context.Context, r *request.GetManagedDatabaseIndicesRequest) ([]upcloud.ManagedDatabaseIndex, error)
 	GetManagedDatabaseMetrics(ctx context.Context, r *request.GetManagedDatabaseMetricsRequest) (*upcloud.ManagedDatabaseMetrics, error)
 	GetManagedDatabaseLogs(ctx context.Context, r *request.GetManagedDatabaseLogsRequest) (*upcloud.ManagedDatabaseLogs, error)
@@ -295,12 +294,6 @@ func (s *Service) GetManagedDatabaseIndices(ctx context.Context, r *request.GetM
 	return indices, s.get(ctx, r.RequestURL(), &indices)
 }
 
-// GetManagedDatabaseIndex returns details of an index existing OpenSearch Managed Database service
-func (s *Service) GetManagedDatabaseIndex(ctx context.Context, r *request.GetManagedDatabaseIndexRequest) (*upcloud.ManagedDatabaseIndex, error) {
-	index := upcloud.ManagedDatabaseIndex{}
-	return &index, s.get(ctx, r.RequestURL(), &index)
-}
-
 // DeleteManagedDatabaseIndex returns details of an index existing OpenSearch Managed Database service
 func (s *Service) DeleteManagedDatabaseIndex(ctx context.Context, r *request.DeleteManagedDatabaseIndexRequest) error {
 	return s.delete(ctx, r)

upcloud/service/managed_database_test.go

@@ -839,9 +839,18 @@ func TestService_ModifyManagedDatabaseAccessControl(t *testing.T) {
 		assert.False(t, *ac.ACLsEnabled)
 		assert.False(t, *ac.ExtendedACLsEnabled)
 
+		ac, err = svc.ModifyManagedDatabaseAccessControl(ctx, &request.ModifyManagedDatabaseAccessControlRequest{
+			ServiceUUID: db.UUID,
+			ACLsEnabled: upcloud.BoolPtr(true),
+		})
+		if !assert.NoError(t, err) {
+			return
+		}
+		assert.True(t, *ac.ACLsEnabled)
+		assert.False(t, *ac.ExtendedACLsEnabled)
+
 		ac, err = svc.ModifyManagedDatabaseAccessControl(ctx, &request.ModifyManagedDatabaseAccessControlRequest{
 			ServiceUUID:         db.UUID,
-			ACLsEnabled:         upcloud.BoolPtr(true),
 			ExtendedACLsEnabled: upcloud.BoolPtr(true),
 		})
 		if !assert.NoError(t, err) {