Implement AOS-47 & AOS-51

error.go

@@ -1,9 +1,9 @@
 package azblob
 
-import "errors"
+import "github.com/aos-dev/go-storage/v3/services"
 
 var (
-	// ErrInvalidEncryptionKey will be returned while encryption key is invalid.
+	// ErrEncryptionKeyInvalid will be returned while encryption key is invalid.
 	// Encryption key must be a 32-byte AES-256 key.
-	ErrInvalidEncryptionKey = errors.New("invalid encryption key")
+	ErrEncryptionKeyInvalid = services.NewErrorCode("invalid encryption key")
 )

go.mod

@@ -6,6 +6,6 @@ require (
 	github.com/Azure/azure-pipeline-go v0.2.3
 	github.com/Azure/azure-storage-blob-go v0.13.0
 	github.com/aos-dev/go-integration-test/v3 v3.0.1-0.20210506085629-1ace601e00c6
-	github.com/aos-dev/go-storage/v3 v3.6.1-0.20210427074731-1b3b4e86c950
+	github.com/aos-dev/go-storage/v3 v3.6.1-0.20210510125045-f79d0505cb2b
 	github.com/google/uuid v1.2.0
 )

go.sum

@@ -16,10 +16,12 @@ github.com/Xuanwo/templateutils v0.1.0 h1:WpkWOqQtIQ2vAIpJLa727DdN8WtxhUkkbDGa6U
 github.com/Xuanwo/templateutils v0.1.0/go.mod h1:OdE0DJ+CJxDBq6psX5DPV+gOZi8bhuHuVUpPCG++Wb8=
 github.com/aos-dev/go-integration-test/v3 v3.0.1-0.20210506085629-1ace601e00c6 h1:/GrJCqznHBjWWj3x2K5KU6hKG6BfR211bRJAFGdH7bc=
 github.com/aos-dev/go-integration-test/v3 v3.0.1-0.20210506085629-1ace601e00c6/go.mod h1:D05/hz2AbZFBucYlzvpYBb62v17SgKUNhi3lxuUQLj4=
-github.com/aos-dev/go-storage/v3 v3.6.1-0.20210427074731-1b3b4e86c950 h1:3ZsfgDAUF171rIrFdYjhr8P3WyxzR4IwxWGbGxkCRkA=
 github.com/aos-dev/go-storage/v3 v3.6.1-0.20210427074731-1b3b4e86c950/go.mod h1:wzxhpUa73aCdTDRG0sHjNnnmXa9rC/ahJnk7hKOV6Pw=
-github.com/aos-dev/specs/go v0.0.0-20210427074008-93183332d504 h1:vHxnQOXlz/X8/Co1ep57yc34Xso+f2+xt4Q2dMJVHA4=
+github.com/aos-dev/go-storage/v3 v3.6.1-0.20210510125045-f79d0505cb2b h1:3XpTC+Q+bm2zVoEI67AUf52o28Loq8YcZ0L45F/2H4I=
+github.com/aos-dev/go-storage/v3 v3.6.1-0.20210510125045-f79d0505cb2b/go.mod h1:ho7Z5P8fj+Q+9pCBng5s+d0XjH06I4hslaht9aiUjaA=
 github.com/aos-dev/specs/go v0.0.0-20210427074008-93183332d504/go.mod h1:gNah3KaPJEfysh7uCCX+sYjQC3g2yx2VgBkFlT945Ws=
+github.com/aos-dev/specs/go v0.0.0-20210510065836-ba70d7b05cda h1:D9DV8kz38iPT6mCHSCTlxYN4Zg9DUfHmWKJKVBvZmfY=
+github.com/aos-dev/specs/go v0.0.0-20210510065836-ba70d7b05cda/go.mod h1:gNah3KaPJEfysh7uCCX+sYjQC3g2yx2VgBkFlT945Ws=
 github.com/dave/dst v0.26.2 h1:lnxLAKI3tx7MgLNVDirFCsDTlTG9nKTk7GcptKcWSwY=
 github.com/dave/dst v0.26.2/go.mod h1:UMDJuIRPfyUCC78eFuB+SV/WI8oDeyFDvM/JR6NI3IU=
 github.com/dave/gopackages v0.0.0-20170318123100-46e7023ec56e/go.mod h1:i00+b/gKdIDIxuLDFob7ustLAVqhsZRk2qVZrArELGQ=

storage.go

@@ -3,13 +3,13 @@ package azblob
 import (
 	"context"
 	"encoding/base64"
-	"fmt"
 	"io"
 	"strconv"
 
 	"github.com/Azure/azure-storage-blob-go/azblob"
 
 	"github.com/aos-dev/go-storage/v3/pkg/iowrap"
+	"github.com/aos-dev/go-storage/v3/services"
 	. "github.com/aos-dev/go-storage/v3/types"
 )
 
@@ -87,7 +87,7 @@ func (s *Storage) list(ctx context.Context, path string, opt pairStorageList) (o
 	case opt.ListMode.IsPrefix():
 		nextFn = s.nextObjectPageByPrefix
 	default:
-		return nil, fmt.Errorf("invalid list mode")
+		return nil, services.ListModeInvalidError{Actual: opt.ListMode}
 	}
 
 	return NewObjectIterator(ctx, nextFn, input), nil
@@ -300,17 +300,13 @@ func (s *Storage) write(ctx context.Context, path string, r io.Reader, size int6
 
 func (s *Storage) writeAppend(ctx context.Context, o *Object, r io.Reader, size int64, opt pairStorageWriteAppend) (n int64, err error) {
 	if !o.Mode.IsAppend() {
-		err = fmt.Errorf("object not appendable")
+		err = services.ObjectModeInvalidError{Expected: ModeAppend, Actual: o.Mode}
 		return
 	}
 
 	rp := o.GetID()
 
-	offset, ok := o.GetAppendOffset()
-	if !ok {
-		err = fmt.Errorf("append offset is not set")
-		return
-	}
+	offset, _ := o.GetAppendOffset()
 
 	var cpk azblob.ClientProvidedKeyOptions
 	if opt.HasEncryptionKey {

utils.go

@@ -87,7 +87,7 @@ func NewStorager(pairs ...typ.Pair) (typ.Storager, error) {
 func newServicer(pairs ...typ.Pair) (srv *Service, err error) {
 	defer func() {
 		if err != nil {
-			err = &services.InitError{Op: "new_servicer", Type: Type, Err: err, Pairs: pairs}
+			err = services.InitError{Op: "new_servicer", Type: Type, Err: formatError(err), Pairs: pairs}
 		}
 	}()
 
@@ -110,7 +110,7 @@ func newServicer(pairs ...typ.Pair) (srv *Service, err error) {
 		return nil, err
 	}
 	if cred.Protocol() != credential.ProtocolHmac {
-		return nil, services.NewPairUnsupportedError(ps.WithCredential(opt.Credential))
+		return nil, services.PairUnsupportedError{Pair: ps.WithCredential(opt.Credential)}
 	}
 
 	credValue, err := azblob.NewSharedKeyCredential(cred.Hmac())
@@ -150,19 +150,14 @@ func newServicer(pairs ...typ.Pair) (srv *Service, err error) {
 }
 
 func newServicerAndStorager(pairs ...typ.Pair) (srv *Service, store *Storage, err error) {
-	defer func() {
-		if err != nil {
-			err = &services.InitError{Op: "new_storager", Type: Type, Err: err, Pairs: pairs}
-		}
-	}()
-
 	srv, err = newServicer(pairs...)
 	if err != nil {
 		return
 	}
 
 	store, err = srv.newStorage(pairs...)
 	if err != nil {
+		err = services.InitError{Op: "new_storager", Type: Type, Err: formatError(err), Pairs: pairs}
 		return
 	}
 	return
@@ -181,10 +176,14 @@ const (
 
 // ref: https://docs.microsoft.com/en-us/rest/api/storageservices/status-and-error-codes2
 func formatError(err error) error {
+	if _, ok := err.(services.AosError); ok {
+		return err
+	}
+
 	// Handle errors returned by azblob.
 	e, ok := err.(azblob.StorageError)
 	if !ok {
-		return err
+		return fmt.Errorf("%w, %v", services.ErrUnexpected, err)
 	}
 
 	switch azblob.StorageErrorCodeType(e.ServiceCode()) {
@@ -193,14 +192,14 @@ func formatError(err error) error {
 		case 404:
 			return fmt.Errorf("%w: %v", services.ErrObjectNotExist, err)
 		default:
-			return err
+			return fmt.Errorf("%w, %v", services.ErrUnexpected, err)
 		}
 	case azblob.StorageErrorCodeBlobNotFound:
 		return fmt.Errorf("%w: %v", services.ErrObjectNotExist, err)
 	case azblob.StorageErrorCodeInsufficientAccountPermissions:
 		return fmt.Errorf("%w: %v", services.ErrPermissionDenied, err)
 	default:
-		return err
+		return fmt.Errorf("%w, %v", services.ErrUnexpected, err)
 	}
 }
 
@@ -239,7 +238,7 @@ func (s *Service) formatError(op string, err error, name string) error {
 		return nil
 	}
 
-	return &services.ServiceError{
+	return services.ServiceError{
 		Op:       op,
 		Err:      formatError(err),
 		Servicer: s,
@@ -264,7 +263,7 @@ func (s *Storage) formatError(op string, err error, path ...string) error {
 		return nil
 	}
 
-	return &services.StorageError{
+	return services.StorageError{
 		Op:       op,
 		Err:      formatError(err),
 		Storager: s,
@@ -315,7 +314,7 @@ func (s *Storage) newObject(done bool) *typ.Object {
 
 func calculateEncryptionHeaders(key []byte, scope string) (cpk azblob.ClientProvidedKeyOptions, err error) {
 	if len(key) != 32 {
-		err = ErrInvalidEncryptionKey
+		err = ErrEncryptionKeyInvalid
 		return
 	}
 	keyBase64 := base64.StdEncoding.EncodeToString(key)