Skip to content
This repository was archived by the owner on Oct 18, 2021. It is now read-only.

Implement GSP-73 Organization rename #23

Merged
merged 2 commits into from
May 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
- *: Add UnimplementedStub (#11)
- tests: Introduce STORAGE_AZBLOB_INTEGRATION_TEST (#12)
- storage: Implement SSE support (#13)
- storage: Implement AOS-40 (#15)
- storage: Implement GSP-40 (#15)

### Changed

Expand All @@ -27,4 +27,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/).

- Implement azblob services.

[v1.1.0]: https://github.com/aos-dev/go-service-azblob/compare/v1.0.0...v1.1.0
[v1.1.0]: https://github.com/beyondstorage/go-service-azblob/compare/v1.0.0...v1.1.0
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# go-services-azblob

[![Build Status](https://github.com/aos-dev/go-service-azblob/workflows/Unit%20Test/badge.svg?branch=master)](https://github.com/aos-dev/go-service-azblob/actions?query=workflow%3A%22Unit+Test%22)
[![Build Status](https://github.com/beyondstorage/go-service-azblob/workflows/Unit%20Test/badge.svg?branch=master)](https://github.com/beyondstorage/go-service-azblob/actions?query=workflow%3A%22Unit+Test%22)
[![License](https://img.shields.io/badge/license-apache%20v2-blue.svg)](https://github.com/Xuanwo/storage/blob/master/LICENSE)
[![go storage dev](https://img.shields.io/matrix/go-service-azblob:aos.dev.svg?server_fqdn=chat.aos.dev&label=%23go-service-azblob%3Aaos.dev&logo=matrix)](https://matrix.to/#/#go-service-azblob:aos.dev)

azblob services support for [go-storage](https://github.com/aos-dev/go-storage)
azblob services support for [go-storage](https://github.com/beyondstorage/go-storage)
2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Package azblob provided support for Azure Storage containers and blobs objects (
*/
package azblob

//go:generate go run -tags tools github.com/aos-dev/go-storage/v3/cmd/definitions service.toml
//go:generate go run -tags tools github.com/beyondstorage/go-storage/v4/cmd/definitions service.toml
2 changes: 1 addition & 1 deletion error.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package azblob

import "github.com/aos-dev/go-storage/v3/services"
import "github.com/beyondstorage/go-storage/v4/services"

var (
// ErrEncryptionKeyInvalid will be returned while encryption key is invalid.
Expand Down
30 changes: 9 additions & 21 deletions generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/aos-dev/go-service-azblob
module github.com/beyondstorage/go-service-azblob/v2

go 1.15

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.20210512065058-b6c8caf13bc6
github.com/aos-dev/go-storage/v3 v3.6.1-0.20210513125055-cb9106d884d5
github.com/beyondstorage/go-integration-test/v4 v4.0.0-20210521062555-83f8f166943f
github.com/beyondstorage/go-storage/v4 v4.0.0-20210521045436-248353dfc077
github.com/google/uuid v1.2.0
)
15 changes: 6 additions & 9 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUM
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
github.com/Xuanwo/templateutils v0.1.0 h1:WpkWOqQtIQ2vAIpJLa727DdN8WtxhUkkbDGa6UhntJY=
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.20210512065058-b6c8caf13bc6 h1:73QZDkTGFyWpkWVrjs0GEM1VREyEmM7RtzddWtBYXho=
github.com/aos-dev/go-integration-test/v3 v3.0.1-0.20210512065058-b6c8caf13bc6/go.mod h1:iMlF4lL4WavgZezGscajjSNcUdFnacX8Dek6lhE0oJA=
github.com/aos-dev/go-storage/v3 v3.6.1-0.20210512033924-5adf27cfdf96/go.mod h1:6arAU5t7CXEsxDPs87xqgHmvEj8/GQfHlV61CxxC0Ww=
github.com/aos-dev/go-storage/v3 v3.6.1-0.20210513125055-cb9106d884d5 h1:xiJN6PvJPDDVac4Ha+ekuGUjRh49O1a1xwxrJPCwlto=
github.com/aos-dev/go-storage/v3 v3.6.1-0.20210513125055-cb9106d884d5/go.mod h1:qareAWtwrRlx4Fw6XIhtAbQnM7I3wylhaQ5Gr3Q5Geg=
github.com/aos-dev/specs/go v0.0.0-20210512024100-386a13f23a83/go.mod h1:gNah3KaPJEfysh7uCCX+sYjQC3g2yx2VgBkFlT945Ws=
github.com/aos-dev/specs/go v0.0.0-20210512093613-3e7634b4a7f5 h1:MmXROEim7Z9u1lFLRvZCy/yKBhq3k1Q/nvaVQmVvZUU=
github.com/aos-dev/specs/go v0.0.0-20210512093613-3e7634b4a7f5/go.mod h1:owye99eWsZvtg5kCEKtSp+AsRPsANhnXgCzHacu4icM=
github.com/beyondstorage/go-integration-test/v4 v4.0.0-20210521062555-83f8f166943f h1:2a44nxIWm5DgEb6/gnD3We/32Bx19ET0iOM4+mxOmp8=
github.com/beyondstorage/go-integration-test/v4 v4.0.0-20210521062555-83f8f166943f/go.mod h1:PUhp+CDYnsysCKVU7poqIK7ZWTfADkOu2Z/PjlSIhsY=
github.com/beyondstorage/go-storage/v4 v4.0.0-20210521045436-248353dfc077 h1:BxqrLLELv6ZvP4+DZlwPAwBhNYkQqpZFvujvUT8zGiY=
github.com/beyondstorage/go-storage/v4 v4.0.0-20210521045436-248353dfc077/go.mod h1:oa2dYco+xplPj99WSBnYVw/xXvRkIKWSSVDQKNZ5Kz8=
github.com/beyondstorage/specs/go v0.0.0-20210521044836-3d41c1d9c97f h1:KMXKB/LACUmnOfLfjND8222qtzWT9lWRUdsPOlM4FqE=
github.com/beyondstorage/specs/go v0.0.0-20210521044836-3d41c1d9c97f/go.mod h1:f5VvmLHc/dNJwl+/yAv/TOHdev3phvuEswx8DIXiSQQ=
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=
Expand Down Expand Up @@ -53,7 +51,6 @@ github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqf
github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/pelletier/go-toml v1.9.0/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/pelletier/go-toml v1.9.1 h1:a6qW1EVNZWH9WGI6CsYdD8WAylkoXBS5yv0XHlh17Tc=
github.com/pelletier/go-toml v1.9.1/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
4 changes: 2 additions & 2 deletions service.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/Azure/azure-storage-blob-go/azblob"

ps "github.com/aos-dev/go-storage/v3/pairs"
typ "github.com/aos-dev/go-storage/v3/types"
ps "github.com/beyondstorage/go-storage/v4/pairs"
typ "github.com/beyondstorage/go-storage/v4/types"
)

func (s *Service) create(ctx context.Context, name string, opt pairServiceCreate) (store typ.Storager, err error) {
Expand Down
12 changes: 6 additions & 6 deletions storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"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"
"github.com/beyondstorage/go-storage/v4/pkg/iowrap"
"github.com/beyondstorage/go-storage/v4/services"
. "github.com/beyondstorage/go-storage/v4/types"
)

func (s *Storage) commitAppend(ctx context.Context, o *Object, opt pairStorageCommitAppend) (err error) {
Expand Down Expand Up @@ -62,7 +62,7 @@ func (s *Storage) delete(ctx context.Context, path string, opt pairStorageDelete
azblob.DeleteSnapshotsOptionNone, azblob.BlobAccessConditions{})
if err != nil && checkError(err, azblob.ServiceCodeBlobNotFound) {
// Omit `BlobNotFound` error here
// ref: [AOS-46](https://github.com/aos-dev/specs/blob/master/rfcs/46-idempotent-delete.md)
// ref: [GSP-46](https://github.com/beyondstorage/specs/blob/master/rfcs/46-idempotent-delete.md)
err = nil
}
if err != nil {
Expand Down Expand Up @@ -93,11 +93,11 @@ func (s *Storage) list(ctx context.Context, path string, opt pairStorageList) (o
return NewObjectIterator(ctx, nextFn, input), nil
}

func (s *Storage) metadata(ctx context.Context, opt pairStorageMetadata) (meta *StorageMeta, err error) {
func (s *Storage) metadata(opt pairStorageMetadata) (meta *StorageMeta) {
meta = NewStorageMeta()
meta.Name = s.name
meta.WorkDir = s.workDir
return meta, nil
return meta
}

func (s *Storage) nextObjectPageByDir(ctx context.Context, page *ObjectPage) error {
Expand Down
2 changes: 1 addition & 1 deletion tests/storage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"testing"

tests "github.com/aos-dev/go-integration-test/v3"
tests "github.com/beyondstorage/go-integration-test/v4"
)

func TestStorage(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions tests/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"os"
"testing"

azblob "github.com/aos-dev/go-service-azblob"
ps "github.com/aos-dev/go-storage/v3/pairs"
"github.com/aos-dev/go-storage/v3/types"
azblob "github.com/beyondstorage/go-service-azblob/v2"
ps "github.com/beyondstorage/go-storage/v4/pairs"
"github.com/beyondstorage/go-storage/v4/types"
"github.com/google/uuid"
)

Expand Down
2 changes: 1 addition & 1 deletion tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
package azblob

import (
_ "github.com/aos-dev/go-storage/v3/cmd/definitions"
_ "github.com/beyondstorage/go-storage/v4/cmd/definitions"
)
14 changes: 7 additions & 7 deletions utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"github.com/Azure/azure-pipeline-go/pipeline"
"github.com/Azure/azure-storage-blob-go/azblob"

ps "github.com/aos-dev/go-storage/v3/pairs"
"github.com/aos-dev/go-storage/v3/pkg/credential"
"github.com/aos-dev/go-storage/v3/pkg/endpoint"
"github.com/aos-dev/go-storage/v3/pkg/httpclient"
"github.com/aos-dev/go-storage/v3/services"
typ "github.com/aos-dev/go-storage/v3/types"
ps "github.com/beyondstorage/go-storage/v4/pairs"
"github.com/beyondstorage/go-storage/v4/pkg/credential"
"github.com/beyondstorage/go-storage/v4/pkg/endpoint"
"github.com/beyondstorage/go-storage/v4/pkg/httpclient"
"github.com/beyondstorage/go-storage/v4/services"
typ "github.com/beyondstorage/go-storage/v4/types"
)

// Service is the azblob config.
Expand Down Expand Up @@ -176,7 +176,7 @@ 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 {
if _, ok := err.(services.InternalError); ok {
return err
}

Expand Down