OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-05-04 22:17:59 +08:00
Code Issues Projects Releases Wiki Activity

MF-1115 - Improve the SDK error encoding (#1118)

Browse Source 
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
This commit is contained in:
Manuel Imperiale 2020-04-15 23:41:31 +02:00 committed by GitHub
parent 4c970a8079
commit 6bd74575ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/go/bootstrap.go
View File

@ -61,7 +61,7 @@ func (sdk mfSDK) AddBootstrap(key string, cfg BoostrapConfig) (string, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return "", err return "", err
} }
return "", ErrFailedCreation return "", errors.Wrap(ErrFailedCreation, errors.New(resp.Status))
} }
id := strings.TrimPrefix(resp.Header.Get("Location"), "/things/configs/") id := strings.TrimPrefix(resp.Header.Get("Location"), "/things/configs/")
@ -92,7 +92,7 @@ func (sdk mfSDK) ViewBoostrap(key, id string) (BoostrapConfig, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return BoostrapConfig{}, err return BoostrapConfig{}, err
} }
return BoostrapConfig{}, ErrFetchFailed return BoostrapConfig{}, errors.Wrap(ErrFetchFailed, errors.New(resp.Status))
} }
var bc BoostrapConfig var bc BoostrapConfig
@ -126,7 +126,7 @@ func (sdk mfSDK) UpdateBoostrap(key string, cfg BoostrapConfig) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedUpdate return errors.Wrap(ErrFailedUpdate, errors.New(resp.Status))
} }
return nil return nil
@ -150,7 +150,7 @@ func (sdk mfSDK) RemoveBoostrap(key, id string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedRemoval return errors.Wrap(ErrFailedRemoval, errors.New(resp.Status))
} }
return nil return nil
@ -180,7 +180,7 @@ func (sdk mfSDK) Boostrap(key, id string) (BoostrapConfig, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return BoostrapConfig{}, err return BoostrapConfig{}, err
} }
return BoostrapConfig{}, ErrFetchFailed return BoostrapConfig{}, errors.Wrap(ErrFetchFailed, errors.New(resp.Status))
} }
var bc BoostrapConfig var bc BoostrapConfig

14
sdk/go/channels.go
View File

@ -10,6 +10,8 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings" "strings"
"github.com/mainflux/mainflux/errors"
) )
const channelsEndpoint = "channels" const channelsEndpoint = "channels"
@ -35,7 +37,7 @@ func (sdk mfSDK) CreateChannel(channel Channel, token string) (string, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return "", err return "", err
} }
return "", ErrFailedCreation return "", errors.Wrap(ErrFailedCreation, errors.New(resp.Status))
} }
id := strings.TrimPrefix(resp.Header.Get("Location"), fmt.Sprintf("/%s/", channelsEndpoint)) id := strings.TrimPrefix(resp.Header.Get("Location"), fmt.Sprintf("/%s/", channelsEndpoint))
@ -106,7 +108,7 @@ func (sdk mfSDK) Channels(token string, offset, limit uint64, name string) (Chan
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return ChannelsPage{}, err return ChannelsPage{}, err
} }
return ChannelsPage{}, ErrFetchFailed return ChannelsPage{}, errors.Wrap(ErrFetchFailed, errors.New(resp.Status))
} }
var cp ChannelsPage var cp ChannelsPage
@ -141,7 +143,7 @@ func (sdk mfSDK) ChannelsByThing(token, thingID string, offset, limit uint64) (C
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return ChannelsPage{}, err return ChannelsPage{}, err
} }
return ChannelsPage{}, ErrFetchFailed return ChannelsPage{}, errors.Wrap(ErrFetchFailed, errors.New(resp.Status))
} }
var cp ChannelsPage var cp ChannelsPage
@ -176,7 +178,7 @@ func (sdk mfSDK) Channel(id, token string) (Channel, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return Channel{}, err return Channel{}, err
} }
return Channel{}, ErrFetchFailed return Channel{}, errors.Wrap(ErrFetchFailed, errors.New(resp.Status))
} }
var c Channel var c Channel
@ -210,7 +212,7 @@ func (sdk mfSDK) UpdateChannel(channel Channel, token string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedUpdate return errors.Wrap(ErrFailedUpdate, errors.New(resp.Status))
} }
return nil return nil
@ -234,7 +236,7 @@ func (sdk mfSDK) DeleteChannel(id, token string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedUpdate return errors.Wrap(ErrFailedRemoval, errors.New(resp.Status))
} }
return nil return nil

7
sdk/go/message.go
View File

@ -9,10 +9,11 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings" "strings"
"github.com/mainflux/mainflux/errors"
) )
func (sdk mfSDK) SendMessage(chanName, msg, token string) error { func (sdk mfSDK) SendMessage(chanName, msg, token string) error {
chanNameParts := strings.SplitN(chanName, ".", 2) chanNameParts := strings.SplitN(chanName, ".", 2)
chanID := chanNameParts[0] chanID := chanNameParts[0]
subtopicPart := "" subtopicPart := ""
@ -37,7 +38,7 @@ func (sdk mfSDK) SendMessage(chanName, msg, token string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedPublish return errors.Wrap(ErrFailedPublish, errors.New(resp.Status))
} }
return nil return nil
@ -73,7 +74,7 @@ func (sdk mfSDK) ReadMessages(chanName, token string) (MessagesPage, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return MessagesPage{}, err return MessagesPage{}, err
} }
return MessagesPage{}, ErrFailedRead return MessagesPage{}, errors.Wrap(ErrFailedRead, errors.New(resp.Status))
} }
var mp MessagesPage var mp MessagesPage

3
sdk/go/message_test.go
View File

@ -9,6 +9,7 @@ import (
"testing" "testing"
"github.com/mainflux/mainflux" "github.com/mainflux/mainflux"
"github.com/mainflux/mainflux/errors"
adapter "github.com/mainflux/mainflux/http" adapter "github.com/mainflux/mainflux/http"
"github.com/mainflux/mainflux/http/api" "github.com/mainflux/mainflux/http/api"
"github.com/mainflux/mainflux/http/mocks" "github.com/mainflux/mainflux/http/mocks"
@ -87,7 +88,7 @@ func TestSendMessage(t *testing.T) {
chanID: chanID, chanID: chanID,
msg: msg, msg: msg,
auth: mocks.ServiceErrToken, auth: mocks.ServiceErrToken,
err: sdk.ErrFailedPublish, err: errors.Wrap(sdk.ErrFailedPublish, errors.New("503 Service Unavailable")),
}, },
} }
for desc, tc := range cases { for desc, tc := range cases {

3
sdk/go/sdk.go
View File

@ -67,6 +67,9 @@ var (
// ErrInvalidContentType indicates that nonexistent message content type // ErrInvalidContentType indicates that nonexistent message content type
// was passed. // was passed.
ErrInvalidContentType = errors.New("Unknown Content Type") ErrInvalidContentType = errors.New("Unknown Content Type")
// ErrFetchVersion indicates that fetching of version failed.
ErrFetchVersion = errors.New("failed to fetch version")
) )
// ContentType represents all possible content types. // ContentType represents all possible content types.

14
sdk/go/things.go
View File

@ -10,6 +10,8 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings" "strings"
"github.com/mainflux/mainflux/errors"
) )
const thingsEndpoint = "things" const thingsEndpoint = "things"
@ -38,7 +40,7 @@ func (sdk mfSDK) CreateThing(thing Thing, token string) (string, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return "", err return "", err
} }
return "", ErrFailedCreation return "", errors.Wrap(ErrFailedCreation, errors.New(resp.Status))
} }
id := strings.TrimPrefix(resp.Header.Get("Location"), fmt.Sprintf("/%s/", thingsEndpoint)) id := strings.TrimPrefix(resp.Header.Get("Location"), fmt.Sprintf("/%s/", thingsEndpoint))
@ -179,7 +181,7 @@ func (sdk mfSDK) Thing(id, token string) (Thing, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return Thing{}, err return Thing{}, err
} }
return Thing{}, ErrFetchFailed return Thing{}, errors.Wrap(ErrFetchFailed, errors.New(resp.Status))
} }
var t Thing var t Thing
@ -213,7 +215,7 @@ func (sdk mfSDK) UpdateThing(thing Thing, token string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedUpdate return errors.Wrap(ErrFailedUpdate, errors.New(resp.Status))
} }
return nil return nil
@ -237,7 +239,7 @@ func (sdk mfSDK) DeleteThing(id, token string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedRemoval return errors.Wrap(ErrFailedRemoval, errors.New(resp.Status))
} }
return nil return nil
@ -264,7 +266,7 @@ func (sdk mfSDK) Connect(connIDs ConnectionIDs, token string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedConnection return errors.Wrap(ErrFailedConnection, errors.New(resp.Status))
} }
return nil return nil
@ -288,7 +290,7 @@ func (sdk mfSDK) DisconnectThing(thingID, chanID, token string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedDisconnect return errors.Wrap(ErrFailedDisconnect, errors.New(resp.Status))
} }
return nil return nil

10
sdk/go/users.go
View File

@ -8,6 +8,8 @@ import (
"encoding/json" "encoding/json"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"github.com/mainflux/mainflux/errors"
) )
func (sdk mfSDK) CreateUser(user User) error { func (sdk mfSDK) CreateUser(user User) error {
@ -60,7 +62,7 @@ func (sdk mfSDK) User(token string) (User, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return User{}, err return User{}, err
} }
return User{}, ErrFetchFailed return User{}, errors.Wrap(ErrFetchFailed, errors.New(resp.Status))
} }
var u User var u User
@ -94,7 +96,7 @@ func (sdk mfSDK) CreateToken(user User) (string, error) {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return "", err return "", err
} }
return "", ErrFailedCreation return "", errors.Wrap(ErrFailedCreation, errors.New(resp.Status))
} }
var tr tokenRes var tr tokenRes
@ -127,7 +129,7 @@ func (sdk mfSDK) UpdateUser(user User, token string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedUpdate return errors.Wrap(ErrFailedUpdate, errors.New(resp.Status))
} }
return nil return nil
@ -159,7 +161,7 @@ func (sdk mfSDK) UpdatePassword(oldPass, newPass, token string) error {
if err := encodeError(resp.StatusCode); err != nil { if err := encodeError(resp.StatusCode); err != nil {
return err return err
} }
return ErrFailedUpdate return errors.Wrap(ErrFailedUpdate, errors.New(resp.Status))
} }
return nil return nil

7
sdk/go/version.go
View File

@ -8,6 +8,8 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"github.com/mainflux/mainflux/errors"
) )
type version struct { type version struct {
@ -29,7 +31,10 @@ func (sdk mfSDK) Version() (string, error) {
} }
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return "", fmt.Errorf("%d", resp.StatusCode) if err := encodeError(resp.StatusCode); err != nil {
return "", err
}
return "", errors.Wrap(ErrFetchVersion, errors.New(resp.Status))
} }
var ver version var ver version