fixed creating and checking errors

cpraehaus · Mar 16, 2022 · 2278312 · 2278312
1 parent ece987e
commit 2278312
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/provider/esendex/esendex.go b/provider/esendex/esendex.go
@@ -41,7 +41,7 @@ func (e *Esendex) Send(message sachet.Message) (err error) {
 		err = e.sendOne(message, phoneNumber)
 
 		if err != nil {
-			return fmt.Errorf("failed to make API call to Esendex: %s", err)
+			return fmt.Errorf("failed to make API call to Esendex: %w", err)
 		}
 	}
 

diff --git a/provider/smsc/smsc.go b/provider/smsc/smsc.go
@@ -30,7 +30,7 @@ func (c *Smsc) Send(message sachet.Message) (err error) {
 	for _, number := range message.To {
 		err = c.SendOne(message, number)
 		if err != nil {
-			return fmt.Errorf("Failed to make API call to smsc:%s", err)
+			return fmt.Errorf("Failed to make API call to smsc: %w", err)
 		}
 	}
 	return

diff --git a/provider/tencentcloud/tencentcloud.go b/provider/tencentcloud/tencentcloud.go
@@ -2,12 +2,13 @@ package tencentcloud
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 
 	"github.com/messagebird/sachet"
 
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
-	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
+	tcError "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
 	sms "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms/v20190711"
 )
@@ -70,10 +71,13 @@ func (tencentcloud *TencentCloud) Send(message sachet.Message) error {
 		request.TemplateID = common.StringPtr(tencentcloud.config.TemplateCode)
 		request.PhoneNumberSet = common.StringPtrs(message.To)
 		response, err := tencentcloud.client.SendSms(request)
-		if _, ok := err.(*errors.TencentCloudSDKError); ok {
+
+		var errTencentCloudSDKError *tcError.TencentCloudSDKError
+		if errors.As(err, &errTencentCloudSDKError) {
 			fmt.Printf("An API error has returned: %s", err)
 			return err
 		}
+
 		b, err := json.Marshal(response.Response)
 		if err != nil {
 			return err