chore(dbaas): remove connection related methods (#290)

Author: villevsv-upcloud

CHANGELOG.md

@@ -5,6 +5,9 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Removed
+- **Breaking**, Managed Database: connection related methods in favor of session
+
 ## [6.12.0]
 
 ### Added

upcloud/managed_database.go

@@ -200,32 +200,6 @@ type ManagedDatabaseComponent struct {
 	Usage ManagedDatabaseComponentUsage `json:"usage"`
 }
 
-// ManagedDatabaseConnection represents a connection to the managed database instance. The available fields
-// vary between database types.
-type ManagedDatabaseConnection struct {
-	ApplicationName string        `json:"application_name"`
-	BackendStart    time.Time     `json:"backend_start"`
-	BackendType     string        `json:"backend_type"`
-	BackendXid      string        `json:"backend_xid"`
-	BackendXmin     string        `json:"backend_xmin"`
-	ClientAddr      string        `json:"client_addr"`
-	ClientHostname  string        `json:"client_hostname"`
-	ClientPort      int           `json:"client_port"`
-	DatId           int           `json:"datid"`
-	DatName         string        `json:"datname"`
-	Pid             int           `json:"pid"`
-	Query           string        `json:"query"`
-	QueryDuration   time.Duration `json:"query_duration"`
-	QueryStart      time.Time     `json:"query_start"`
-	State           string        `json:"state"`
-	StateChange     time.Time     `json:"state_change"`
-	Username        string        `json:"usename"`
-	UseSysId        int           `json:"usesysid"`
-	WaitEvent       string        `json:"wait_event"`
-	WaitEventType   string        `json:"wait_event_type"`
-	XactStart       time.Time     `json:"xact_start"`
-}
-
 // ManagedDatabaseSessions represents sessions in the managed database instance by database instance type.
 type ManagedDatabaseSessions struct {
 	MySQL      []ManagedDatabaseSessionMySQL      `json:"mysql,omitempty"`

upcloud/managed_database_test.go

@@ -552,56 +552,6 @@ func TestUnmarshalManagedDatabaseQueryStatisticsMySQL(t *testing.T) {
 	assert.Equal(t, expect, c)
 }
 
-func TestUnmarshalManagedDatabaseConnection(t *testing.T) {
-	const d = `{
-		"application_name":"upcloudGoTestSuite",
-		"backend_start":"2021-09-14T13:41:29.369748Z",
-		"backend_type":"client backend",
-		"backend_xid":null,
-		"backend_xmin":null,
-		"client_addr":"85.7.82.158",
-		"client_hostname":null,
-		"client_port":62028,
-		"datid":16401,
-		"datname":"defaultdb",
-		"pid":257,
-		"query":"SELECT 1",
-		"query_duration":291591000,
-		"query_start":"2021-09-14T13:41:29.575568Z",
-		"state":"idle",
-		"state_change":"2021-09-14T13:41:29.575916Z",
-		"usename":"upadmin",
-		"usesysid":16400,
-		"wait_event":"ClientRead",
-		"wait_event_type":"Client",
-		"xact_start":null
-	}`
-
-	var c ManagedDatabaseConnection
-	assert.NoError(t, json.Unmarshal([]byte(d), &c))
-
-	expect := ManagedDatabaseConnection{
-		ApplicationName: "upcloudGoTestSuite",
-		BackendStart:    timeParse("2021-09-14T13:41:29.369748Z"),
-		BackendType:     "client backend",
-		ClientAddr:      "85.7.82.158",
-		ClientPort:      62028,
-		DatId:           16401,
-		DatName:         "defaultdb",
-		Pid:             257,
-		Query:           "SELECT 1",
-		QueryDuration:   291591000,
-		QueryStart:      timeParse("2021-09-14T13:41:29.575568Z"),
-		State:           "idle",
-		StateChange:     timeParse("2021-09-14T13:41:29.575916Z"),
-		Username:        "upadmin",
-		UseSysId:        16400,
-		WaitEvent:       "ClientRead",
-		WaitEventType:   "Client",
-	}
-	assert.Equal(t, expect, c)
-}
-
 func TestUnmarshalManagedDatabaseSessions(t *testing.T) {
 	const d = `{
 	"mysql": [

upcloud/request/managed_database.go

@@ -12,26 +12,6 @@ import (
 
 /* Service Management */
 
-// CancelManagedDatabaseConnection represents a request to cancel the current query of a connection or terminate
-// the entire connection.
-type CancelManagedDatabaseConnection struct {
-	// UUID selects a managed database instance to manage queries of
-	UUID string
-	// Pid selects a connection pid to cancel or terminate
-	Pid int
-	// Terminate selects whether the connection will be forcefully terminated
-	Terminate bool
-}
-
-// RequestURL implements the request.Request interface
-func (c *CancelManagedDatabaseConnection) RequestURL() string {
-	qv := url.Values{}
-	if c.Terminate {
-		qv.Set("terminate", "true")
-	}
-	return fmt.Sprintf("/database/%s/connections/%d?%s", c.UUID, c.Pid, qv.Encode())
-}
-
 // CancelManagedDatabaseSession represents a request to cancel the current query of a connection or terminate
 // the entire connection.
 type CancelManagedDatabaseSession struct {
@@ -162,28 +142,6 @@ func (g *GetManagedDatabaseAccessControlRequest) RequestURL() string {
 	return fmt.Sprintf("/database/%s/access-control", g.ServiceUUID)
 }
 
-// GetManagedDatabaseConnectionsRequest represents a request to get managed database instance's current connections
-type GetManagedDatabaseConnectionsRequest struct {
-	// UUID selects a managed database instance to query connections from
-	UUID string
-	// Limit sets the upper bound how many connections to fetch
-	Limit int
-	// Offset skips n connections before returning them. It can be used to iteratively fetch connections.
-	Offset int
-}
-
-// RequestURL implements the request.Request interface
-func (g *GetManagedDatabaseConnectionsRequest) RequestURL() string {
-	qv := url.Values{}
-	if g.Limit != 0 {
-		qv.Set("limit", strconv.Itoa(g.Limit))
-	}
-	if g.Offset != 0 {
-		qv.Set("offset", strconv.Itoa(g.Offset))
-	}
-	return fmt.Sprintf("/database/%s/connections?%s", g.UUID, qv.Encode())
-}
-
 // GetManagedDatabaseMetricsRequest represents a request to get managed database instance performance metrics
 type GetManagedDatabaseMetricsRequest struct {
 	// UUID selects a managed database instance to query metrics from

upcloud/request/managed_database_test.go

@@ -11,15 +11,6 @@ import (
 
 /* Service Management */
 
-func TestCancelManagedDatabaseConnection_RequestURL(t *testing.T) {
-	req := &CancelManagedDatabaseConnection{
-		UUID:      "fake",
-		Pid:       42,
-		Terminate: true,
-	}
-	assert.Equal(t, "/database/fake/connections/42?terminate=true", req.RequestURL())
-}
-
 func TestCancelManagedDatabaseSession_RequestURL(t *testing.T) {
 	req := &CancelManagedDatabaseSession{
 		UUID:      "fake",
@@ -161,15 +152,6 @@ func TestGetManagedDatabaseAccessControlRequest_RequestURL(t *testing.T) {
 	assert.Equal(t, "/database/fake/access-control", req.RequestURL())
 }
 
-func TestGetManagedDatabaseConnectionsRequest_RequestURL(t *testing.T) {
-	req := &GetManagedDatabaseConnectionsRequest{
-		UUID:   "fake",
-		Limit:  1000,
-		Offset: 42,
-	}
-	assert.Equal(t, "/database/fake/connections?limit=1000&offset=42", req.RequestURL())
-}
-
 func TestGetManagedDatabaseMetricsRequest_RequestURL(t *testing.T) {
 	req := &GetManagedDatabaseMetricsRequest{
 		UUID:   "fake",

upcloud/service/fixtures/getmanageddatabaseconnections.yaml

@@ -11,22 +11,15 @@ import (
 	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request"
 )
 
-var (
-	ErrCancelManagedDatabaseConnection = errors.New("managed database connection cancellation failed")
-	ErrCancelManagedDatabaseSession    = errors.New("managed database session cancellation failed")
-)
+var ErrCancelManagedDatabaseSession = errors.New("managed database session cancellation failed")
 
 type ManagedDatabaseServiceManager interface {
-	// Deprecated: CancelManagedDatabaseConnection is deprecated in favor or CancelManagedDatabaseSession.
-	CancelManagedDatabaseConnection(ctx context.Context, r *request.CancelManagedDatabaseConnection) error
 	CancelManagedDatabaseSession(ctx context.Context, r *request.CancelManagedDatabaseSession) error
 	CloneManagedDatabase(ctx context.Context, r *request.CloneManagedDatabaseRequest) (*upcloud.ManagedDatabase, error)
 	CreateManagedDatabase(ctx context.Context, r *request.CreateManagedDatabaseRequest) (*upcloud.ManagedDatabase, error)
 	GetManagedDatabase(ctx context.Context, r *request.GetManagedDatabaseRequest) (*upcloud.ManagedDatabase, error)
 	GetManagedDatabases(ctx context.Context, r *request.GetManagedDatabasesRequest) ([]upcloud.ManagedDatabase, error)
 	GetManagedDatabaseAccessControl(ctx context.Context, r *request.GetManagedDatabaseAccessControlRequest) (*upcloud.ManagedDatabaseAccessControl, error)
-	// Deprecated: GetManagedDatabaseConnections is deprecated in favor or GetManagedDatabaseSessions.
-	GetManagedDatabaseConnections(ctx context.Context, r *request.GetManagedDatabaseConnectionsRequest) ([]upcloud.ManagedDatabaseConnection, error)
 	GetManagedDatabaseSessions(ctx context.Context, r *request.GetManagedDatabaseSessionsRequest) (upcloud.ManagedDatabaseSessions, error)
 	GetManagedDatabaseIndices(ctx context.Context, r *request.GetManagedDatabaseIndicesRequest) ([]upcloud.ManagedDatabaseIndex, error)
 	GetManagedDatabaseMetrics(ctx context.Context, r *request.GetManagedDatabaseMetricsRequest) (*upcloud.ManagedDatabaseMetrics, error)
@@ -63,29 +56,6 @@ type ManagedDatabaseLogicalDatabaseManager interface {
 
 /* Service Management */
 
-// Deprecated: CancelManagedDatabaseConnection is deprecated in favor of CancelManagedDatabaseSession.
-// Cancels a current query of a database connection or terminates it entirely.
-// In case of the server is unable to cancel the query or terminate the connection ErrCancelManagedDatabaseConnection
-// is returned.
-func (s *Service) CancelManagedDatabaseConnection(ctx context.Context, r *request.CancelManagedDatabaseConnection) error {
-	res := struct {
-		Success bool `json:"success"`
-	}{}
-	response, err := s.client.Delete(ctx, r.RequestURL())
-	if err != nil {
-		return parseJSONServiceError(err)
-	}
-
-	err = json.Unmarshal(response, &res)
-	if err != nil {
-		return fmt.Errorf("unable to unmarshal JSON: %w", err)
-	}
-	if !res.Success {
-		return ErrCancelManagedDatabaseConnection
-	}
-	return nil
-}
-
 // CancelManagedDatabaseSession cancels a current query of a database session or terminates it entirely.
 // In case of the server is unable to cancel the query or terminate the session ErrCancelManagedDatabaseSession
 // is returned.
@@ -132,13 +102,6 @@ func (s *Service) GetManagedDatabases(ctx context.Context, r *request.GetManaged
 	return services, s.get(ctx, r.RequestURL(), &services)
 }
 
-// Deprecated: GetManagedDatabaseConnections is deprecated in favor or GetManagedDatabaseSessions.
-// Returns a slice of connections from an existing managed database instance
-func (s *Service) GetManagedDatabaseConnections(ctx context.Context, r *request.GetManagedDatabaseConnectionsRequest) ([]upcloud.ManagedDatabaseConnection, error) {
-	conns := make([]upcloud.ManagedDatabaseConnection, 0)
-	return conns, s.get(ctx, r.RequestURL(), &conns)
-}
-
 // GetManagedDatabaseMetrics returns metrics collection for the selected period
 func (s *Service) GetManagedDatabaseMetrics(ctx context.Context, r *request.GetManagedDatabaseMetricsRequest) (*upcloud.ManagedDatabaseMetrics, error) {
 	metrics := upcloud.ManagedDatabaseMetrics{}