diff options
| -rw-r--r-- | fs.go | 27 | ||||
| -rw-r--r-- | fs_test.go | 2 |
2 files changed, 27 insertions, 2 deletions
@@ -3,6 +3,8 @@ package s3 import ( "context" "errors" + "fmt" + neturl "net/url" "os" "time" @@ -12,7 +14,8 @@ import ( ) var ( - ErrUnsupported = errors.New("unsupported operation") + ErrUnsupported = errors.New("unsupported operation") + ErrInvalidProtocol = errors.New("invalid protocol") ) type Fs struct { @@ -41,6 +44,28 @@ func NewFs(endpoint, bucket, accessKeyID, secretAccessKey string, useSSL bool) ( }, nil } +func NewFsFromURL(url string) (*Fs, error) { + r, err := neturl.ParseRequestURI(url) + if err != nil { + return nil, fmt.Errorf("failed to parse url: %w", err) + } + useSSL := false + switch r.Scheme { + case "http": + case "https": + useSSL = true + default: + return nil, ErrInvalidProtocol + + } + + endpoint := r.Host + bucket := r.Path[1:] + accessKeyId := r.User.Username() + secretAccessKey, _ := r.User.Password() + return NewFs(endpoint, bucket, accessKeyId, secretAccessKey, useSSL) +} + // The name of this FileSystem func (fs *Fs) Name() string { return "s3" @@ -76,7 +76,7 @@ func TestFsStatNoExist(t *testing.T) { } func newTestFs() (*Fs, error) { - fs, err := NewFs("127.0.0.1:9000", "test-bucket", "testuser", "testsecret", false) + fs, err := NewFsFromURL("http://testuser:[email protected]:9000/test-bucket") return fs, err } |