Skip to content

Commit

Permalink
Complete the move to the rclone organization by changing the import path
Browse files Browse the repository at this point in the history
  • Loading branch information
ncw committed Apr 12, 2024
1 parent 5be237a commit c07f205
Show file tree
Hide file tree
Showing 22 changed files with 33 additions and 29 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ s3f_*
*.out
.devcontainer/
build/
*~
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@

![Logo](/GoFakeS3.png)

This is a fork of [johannesboyne/gofakes3](https://github.com/johannesboyne/gofakes3).
This is a fork of [johannesboyne/gofakes3](https://github.com/johannesboyne/gofakes3)
mainly for use implementing the [rclone serves3](https://rclone.org/commands/rclone_serve_s3/) command in
[rclone/rclone](https://github.com/rclone/rclone).

Notable differences:

* Use modified xml library to handle more control chars
* Func `getVersioningConfiguration` will return empty when unversioned
* New func in `backend` interface: `CopyObjcet`
* Support authentication with AWS Signature V4
* New func in `backend` interface: `CopyObject`
* Support authentication with AWS Signature V4
* Interfaces changed to take context
2 changes: 1 addition & 1 deletion awscli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"testing"
"time"

"github.com/Mikubill/gofakes3"
"github.com/rclone/gofakes3"
)

func TestCLILsBuckets(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion error.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"time"

xml "github.com/Mikubill/gofakes3/xml"
xml "github.com/rclone/gofakes3/xml"
)

// Error codes are documented here:
Expand Down
2 changes: 1 addition & 1 deletion error_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

xml "github.com/Mikubill/gofakes3/xml"
xml "github.com/rclone/gofakes3/xml"
)

func TestErrorCustomResponseMarshalsAsExpected(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/Mikubill/gofakes3
module github.com/rclone/gofakes3

go 1.17

Expand Down
4 changes: 2 additions & 2 deletions gofakes3.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"sync/atomic"
"time"

"github.com/Mikubill/gofakes3/signature"
xml "github.com/Mikubill/gofakes3/xml"
"github.com/rclone/gofakes3/signature"
xml "github.com/rclone/gofakes3/xml"
)

// GoFakeS3 implements HTTP handlers for processing S3 requests and returning
Expand Down
2 changes: 1 addition & 1 deletion gofakes3_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http/httptest"
"testing"

xml "github.com/Mikubill/gofakes3/xml"
xml "github.com/rclone/gofakes3/xml"
)

func TestHttpError(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions gofakes3_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"testing"
"time"

xml "github.com/Mikubill/gofakes3/xml"
xml "github.com/rclone/gofakes3/xml"

"github.com/Mikubill/gofakes3"
"github.com/Mikubill/gofakes3/s3mem"
"github.com/rclone/gofakes3"
"github.com/rclone/gofakes3/s3mem"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3"
)
Expand Down
4 changes: 2 additions & 2 deletions init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"testing"
"time"

"github.com/Mikubill/gofakes3"
"github.com/Mikubill/gofakes3/s3mem"
"github.com/rclone/gofakes3"
"github.com/rclone/gofakes3/s3mem"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/aws/credentials"
Expand Down
2 changes: 1 addition & 1 deletion makefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func runBuildDocker() error {
return err
}

cmd = command("docker", "build", "-t", "Mikubill/gofakes3", ".")
cmd = command("docker", "build", "-t", "rclone/gofakes3", ".")
if err := cmd.Run(); err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion messages.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

xml "github.com/Mikubill/gofakes3/xml"
xml "github.com/rclone/gofakes3/xml"
)

type Storage struct {
Expand Down
2 changes: 1 addition & 1 deletion messages_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

xml "github.com/Mikubill/gofakes3/xml"
xml "github.com/rclone/gofakes3/xml"
)

func TestObjectListAddPrefix(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion option_autobucket_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"testing"

"github.com/Mikubill/gofakes3"
"github.com/rclone/gofakes3"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3"
)
Expand Down
4 changes: 2 additions & 2 deletions s3mem/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync"
"time"

"github.com/Mikubill/gofakes3"
"github.com/Mikubill/gofakes3/internal/goskipiter"
"github.com/rclone/gofakes3"
"github.com/rclone/gofakes3/internal/goskipiter"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions s3mem/bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io"
"time"

"github.com/Mikubill/gofakes3"
"github.com/Mikubill/gofakes3/internal/s3io"
"github.com/rclone/gofakes3"
"github.com/rclone/gofakes3/internal/s3io"
"github.com/ryszard/goskiplist/skiplist"
)

Expand Down
2 changes: 1 addition & 1 deletion s3mem/versionid.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"math/big"
"sync"

"github.com/Mikubill/gofakes3"
"github.com/rclone/gofakes3"
)

var add1 = new(big.Int).SetInt64(1)
Expand Down
2 changes: 1 addition & 1 deletion s3mem/versionid_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

"github.com/Mikubill/gofakes3"
"github.com/rclone/gofakes3"
)

func TestVersionID(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion signature/signature-errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"net/http"

"github.com/Mikubill/gofakes3/xml"
"github.com/rclone/gofakes3/xml"
)

// ErrorCode is code[int] of APIError
Expand Down
2 changes: 1 addition & 1 deletion signature/signature-v4_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/Mikubill/gofakes3/signature"
"github.com/rclone/gofakes3/signature"
"github.com/aws/aws-sdk-go/aws/credentials"
v4 "github.com/aws/aws-sdk-go/aws/signer/v4"
)
Expand Down
2 changes: 1 addition & 1 deletion uploader.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sync"
"time"

"github.com/Mikubill/gofakes3/internal/goskipiter"
"github.com/rclone/gofakes3/internal/goskipiter"
"github.com/ryszard/goskiplist/skiplist"
)

Expand Down
2 changes: 1 addition & 1 deletion uploader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package gofakes3_test
import (
"testing"

"github.com/Mikubill/gofakes3"
"github.com/rclone/gofakes3"
"github.com/aws/aws-sdk-go/service/s3"
)

Expand Down

0 comments on commit c07f205

Please sign in to comment.