Implement errors properly, all types except of PerRowErrorPB

radekg · Dec 12, 2021 · 1e2797e · 1e2797e
1 parent f96abbb
commit 1e2797e
Show file tree

Hide file tree

Showing 42 changed files with 729 additions and 80 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-0.0.1-alpha.10
+0.0.1-alpha.9.1
diff --git a/client/implementation/op_check_exists.go b/client/implementation/op_check_exists.go
@@ -2,6 +2,7 @@ package implementation
 
 import (
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
@@ -23,5 +24,5 @@ func (c *defaultYBCliClient) CheckExists(opConfig *configs.OpGetTableSchemaConfi
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_get_is_load_balancer_idle.go b/client/implementation/op_get_is_load_balancer_idle.go
@@ -1,6 +1,7 @@
 package implementation
 
 import (
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -11,5 +12,5 @@ func (c *defaultYBCliClient) GetIsLoadBalancerIdle() (*ybApi.IsLoadBalancerIdleR
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_get_leader_blacklist_completion.go b/client/implementation/op_get_leader_blacklist_completion.go
@@ -1,6 +1,7 @@
 package implementation
 
 import (
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -11,5 +12,5 @@ func (c *defaultYBCliClient) GetLeaderBlacklistCompletion() (*ybApi.GetLoadMoveP
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_get_load_move_completion.go b/client/implementation/op_get_load_move_completion.go
@@ -1,6 +1,7 @@
 package implementation
 
 import (
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -11,5 +12,5 @@ func (c *defaultYBCliClient) GetLoadMoveCompletion() (*ybApi.GetLoadMovePercentR
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_get_master_registration.go b/client/implementation/op_get_master_registration.go
@@ -1,6 +1,7 @@
 package implementation
 
 import (
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -11,5 +12,5 @@ func (c *defaultYBCliClient) GetMasterRegistration() (*ybApi.GetMasterRegistrati
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_get_tablets_for_table.go b/client/implementation/op_get_tablets_for_table.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -23,8 +24,8 @@ func (c *defaultYBCliClient) GetTabletsForTable(opConfig *configs.OpGetTableLoca
 	if err := c.connectedClient.Execute(payloadListTables, responseListTablesPayload); err != nil {
 		return nil, err
 	}
-	if err := responseListTablesPayload.GetError(); err != nil {
-		return nil, fmt.Errorf(err.String())
+	if responseListTablesPayload.Error != nil {
+		return nil, clientErrors.NewMasterError(responseListTablesPayload.Error)
 	}
 
 	for _, tableInfo := range responseListTablesPayload.Tables {

diff --git a/client/implementation/op_get_universe_config.go b/client/implementation/op_get_universe_config.go
@@ -1,6 +1,7 @@
 package implementation
 
 import (
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -11,5 +12,5 @@ func (c *defaultYBCliClient) GetUniverseConfig() (*ybApi.GetMasterClusterConfigR
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_is_load_balanced.go b/client/implementation/op_is_load_balanced.go
@@ -2,6 +2,7 @@ package implementation
 
 import (
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
@@ -20,5 +21,5 @@ func (c *defaultYBCliClient) IsLoadBalanced(opConfig *configs.OpIsLoadBalancedCo
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_is_tablet_server_ready.go b/client/implementation/op_is_tablet_server_ready.go
@@ -1,6 +1,9 @@
 package implementation
 
-import ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
+import (
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
+	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
+)
 
 // IsTabletServerReady checks if a given tablet server is ready or returns an error.
 func (c *defaultYBCliClient) IsTabletServerReady() (*ybApi.IsTabletServerReadyResponsePB, error) {
@@ -9,5 +12,5 @@ func (c *defaultYBCliClient) IsTabletServerReady() (*ybApi.IsTabletServerReadyRe
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewTabletServerError(responsePayload.Error)
 }
diff --git a/client/implementation/op_leader_stepdown.go b/client/implementation/op_leader_stepdown.go
@@ -2,6 +2,7 @@ package implementation
 
 import (
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
@@ -19,5 +20,5 @@ func (c *defaultYBCliClient) LeaderStepDown(opConfig *configs.OpLeaderStepDownCo
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewTabletServerError(responsePayload.Error)
 }
diff --git a/client/implementation/op_list_masters.go b/client/implementation/op_list_masters.go
@@ -1,6 +1,7 @@
 package implementation
 
 import (
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -11,5 +12,5 @@ func (c *defaultYBCliClient) ListMasters() (*ybApi.ListMastersResponsePB, error)
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_list_tables.go b/client/implementation/op_list_tables.go
@@ -2,6 +2,7 @@ package implementation
 
 import (
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -33,5 +34,5 @@ func (c *defaultYBCliClient) ListTables(opConfig *configs.OpListTablesConfig) (*
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_list_tablet_servers.go b/client/implementation/op_list_tablet_servers.go
@@ -2,6 +2,7 @@ package implementation
 
 import (
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
@@ -15,5 +16,5 @@ func (c *defaultYBCliClient) ListTabletServers(opConfig *configs.OpListTabletSer
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_master_leader_stepdown.go b/client/implementation/op_master_leader_stepdown.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -33,9 +34,11 @@ func (c *defaultYBCliClient) MasterLeaderStepDown(opConfig *configs.OpMMasterLea
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	if err := responsePayload.GetError(); err != nil {
-		return nil, fmt.Errorf(err.String())
+	if responsePayload.Error != nil {
+		return nil, clientErrors.NewTabletServerError(responsePayload.Error)
 	}
+
+	// TODO: this does not belong here...
 	continuousErrors := 0
 	var registration *ybApi.GetMasterRegistrationResponsePB
 topExit:

diff --git a/client/implementation/op_modify_placement_info.go b/client/implementation/op_modify_placement_info.go
@@ -2,6 +2,7 @@ package implementation
 
 import (
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	"github.com/radekg/yugabyte-db-go-client/utils/ybdbid"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
@@ -16,6 +17,9 @@ func (c *defaultYBCliClient) ModifyPlacementInfo(opConfig *configs.OpModifyPlace
 	if err := c.connectedClient.Execute(payloadCurrent, responseCurrent); err != nil {
 		return nil, err
 	}
+	if responseCurrent.Error != nil {
+		return nil, clientErrors.NewMasterError(responseCurrent.Error)
+	}
 
 	sysClusterConfigEntry := responseCurrent.ClusterConfig
 
@@ -65,5 +69,5 @@ func (c *defaultYBCliClient) ModifyPlacementInfo(opConfig *configs.OpModifyPlace
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responseCurrent.Error)
 }
diff --git a/client/implementation/op_set_load_balancer_state.go b/client/implementation/op_set_load_balancer_state.go
@@ -1,6 +1,7 @@
 package implementation
 
 import (
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
@@ -14,5 +15,5 @@ func (c *defaultYBCliClient) SetLoadBalancerState(enable bool) (*ybApi.ChangeLoa
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_set_preferred_zones.go b/client/implementation/op_set_preferred_zones.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
 
@@ -26,7 +27,7 @@ func (c *defaultYBCliClient) SetPreferredZones(opConfig *configs.OpSetPreferredZ
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
 
 func zoneInfoToCloudPB(input string) (*ybApi.CloudInfoPB, error) {

diff --git a/client/implementation/op_snapshots_create.go b/client/implementation/op_snapshots_create.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	"github.com/radekg/yugabyte-db-go-client/utils/ybdbid"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
@@ -90,7 +91,7 @@ func createSnapshotYCQL(c *defaultYBCliClient, opConfig *configs.OpSnapshotCreat
 		return nil, err
 	}
 
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
 
 func createSnapshotYSQL(c *defaultYBCliClient, opConfig *configs.OpSnapshotCreateConfig, ns *parsedKeyspace) (*ybApi.CreateSnapshotResponsePB, error) {
@@ -127,5 +128,5 @@ func createSnapshotYSQL(c *defaultYBCliClient, opConfig *configs.OpSnapshotCreat
 		return nil, err
 	}
 
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_snapshots_create_schedule.go b/client/implementation/op_snapshots_create_schedule.go
@@ -2,6 +2,7 @@ package implementation
 
 import (
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	"github.com/radekg/yugabyte-db-go-client/utils/relativetime"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
@@ -61,5 +62,5 @@ func (c *defaultYBCliClient) SnapshotsCreateSchedule(opConfig *configs.OpSnapsho
 		return nil, err
 	}
 
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_snapshots_delete.go b/client/implementation/op_snapshots_delete.go
@@ -2,6 +2,7 @@ package implementation
 
 import (
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils/ybdbid"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
@@ -24,5 +25,5 @@ func (c *defaultYBCliClient) SnapshotsDelete(opConfig *configs.OpSnapshotDeleteC
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_snapshots_delete_schedule.go b/client/implementation/op_snapshots_delete_schedule.go
@@ -2,6 +2,7 @@ package implementation
 
 import (
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils/ybdbid"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
@@ -24,5 +25,5 @@ func (c *defaultYBCliClient) SnapshotsDeleteSchedule(opConfig *configs.OpSnapsho
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }
diff --git a/client/implementation/op_snapshots_export.go b/client/implementation/op_snapshots_export.go
@@ -7,6 +7,7 @@ import (
 	"os"
 
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	"github.com/radekg/yugabyte-db-go-client/utils/ybdbid"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
@@ -37,6 +38,9 @@ func (c *defaultYBCliClient) SnapshotsExport(opConfig *configs.OpSnapshotExportC
 	if err := c.connectedClient.Execute(payload, responsePayload); err != nil {
 		return nil, err
 	}
+	if responsePayload.Error != nil {
+		return nil, clientErrors.NewMasterError(responsePayload.Error)
+	}
 
 	if len(responsePayload.Snapshots) > 1 {
 		c.logger.Warn("too many snapshots returned, expected at  most 1",

diff --git a/client/implementation/op_snapshots_import.go b/client/implementation/op_snapshots_import.go
@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/radekg/yugabyte-db-go-client/configs"
+	clientErrors "github.com/radekg/yugabyte-db-go-client/errors"
 	"github.com/radekg/yugabyte-db-go-client/utils"
 	ybApi "github.com/radekg/yugabyte-db-go-proto/v2/yb/api"
 )
@@ -186,5 +187,5 @@ func (c *defaultYBCliClient) SnapshotsImport(opConfig *configs.OpSnapshotImportC
 		return nil, err
 	}
 
-	return responsePayload, nil
+	return responsePayload, clientErrors.NewMasterError(responsePayload.Error)
 }