-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #669 from hashicorp/f-fs-api
Introduce FS API
- Loading branch information
Showing
5 changed files
with
243 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
package agent | ||
|
||
import ( | ||
"fmt" | ||
"io" | ||
"net/http" | ||
"strconv" | ||
"strings" | ||
) | ||
|
||
var ( | ||
allocIDNotPresentErr = fmt.Errorf("must provide a valid alloc id") | ||
fileNameNotPresentErr = fmt.Errorf("must provide a file name") | ||
) | ||
|
||
func (s *HTTPServer) DirectoryListRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { | ||
var allocID, path string | ||
|
||
if allocID = strings.TrimPrefix(req.URL.Path, "/v1/client/fs/ls/"); allocID == "" { | ||
return nil, allocIDNotPresentErr | ||
} | ||
if path = req.URL.Query().Get("path"); path == "" { | ||
path = "/" | ||
} | ||
fs, err := s.agent.client.GetAllocFS(allocID) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return fs.List(path) | ||
} | ||
|
||
func (s *HTTPServer) FileStatRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { | ||
var allocID, path string | ||
if allocID = strings.TrimPrefix(req.URL.Path, "/v1/client/fs/stat/"); allocID == "" { | ||
return nil, allocIDNotPresentErr | ||
} | ||
if path = req.URL.Query().Get("path"); path == "" { | ||
return nil, fileNameNotPresentErr | ||
} | ||
fs, err := s.agent.client.GetAllocFS(allocID) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return fs.Stat(path) | ||
} | ||
|
||
func (s *HTTPServer) FileReadAtRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) { | ||
var allocID, path string | ||
var offset, limit int64 | ||
var err error | ||
|
||
q := req.URL.Query() | ||
|
||
if allocID = strings.TrimPrefix(req.URL.Path, "/v1/client/fs/readat/"); allocID == "" { | ||
return nil, allocIDNotPresentErr | ||
} | ||
if path = q.Get("path"); path == "" { | ||
return nil, fileNameNotPresentErr | ||
} | ||
|
||
if offset, err = strconv.ParseInt(q.Get("offset"), 10, 64); err != nil { | ||
return nil, fmt.Errorf("error parsing offset: %v", err) | ||
} | ||
if limit, err = strconv.ParseInt(q.Get("limit"), 10, 64); err != nil { | ||
return nil, fmt.Errorf("error parsing limit: %v", err) | ||
} | ||
fs, err := s.agent.client.GetAllocFS(allocID) | ||
if err != nil { | ||
return nil, err | ||
} | ||
r, err := fs.ReadAt(path, offset, limit) | ||
if err != nil { | ||
return nil, err | ||
} | ||
io.Copy(resp, r) | ||
return nil, nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
package agent | ||
|
||
import ( | ||
"net/http" | ||
"net/http/httptest" | ||
"testing" | ||
) | ||
|
||
func TestAllocDirFS_List(t *testing.T) { | ||
httpTest(t, nil, func(s *TestServer) { | ||
req, err := http.NewRequest("GET", "/v1/client/fs/ls/", nil) | ||
if err != nil { | ||
t.Fatalf("err: %v", err) | ||
} | ||
respW := httptest.NewRecorder() | ||
|
||
_, err = s.Server.DirectoryListRequest(respW, req) | ||
if err != allocIDNotPresentErr { | ||
t.Fatalf("expected err: %v, actual: %v", allocIDNotPresentErr, err) | ||
} | ||
}) | ||
} | ||
|
||
func TestAllocDirFS_Stat(t *testing.T) { | ||
httpTest(t, nil, func(s *TestServer) { | ||
req, err := http.NewRequest("GET", "/v1/client/fs/stat/", nil) | ||
if err != nil { | ||
t.Fatalf("err: %v", err) | ||
} | ||
respW := httptest.NewRecorder() | ||
|
||
_, err = s.Server.FileStatRequest(respW, req) | ||
if err != allocIDNotPresentErr { | ||
t.Fatalf("expected err: %v, actual: %v", allocIDNotPresentErr, err) | ||
} | ||
|
||
req, err = http.NewRequest("GET", "/v1/client/fs/stat/foo", nil) | ||
if err != nil { | ||
t.Fatalf("err: %v", err) | ||
} | ||
respW = httptest.NewRecorder() | ||
|
||
_, err = s.Server.FileStatRequest(respW, req) | ||
if err != fileNameNotPresentErr { | ||
t.Fatalf("expected err: %v, actual: %v", allocIDNotPresentErr, err) | ||
} | ||
|
||
}) | ||
} | ||
|
||
func TestAllocDirFS_ReadAt(t *testing.T) { | ||
httpTest(t, nil, func(s *TestServer) { | ||
req, err := http.NewRequest("GET", "/v1/client/fs/readat/", nil) | ||
if err != nil { | ||
t.Fatalf("err: %v", err) | ||
} | ||
respW := httptest.NewRecorder() | ||
|
||
_, err = s.Server.FileReadAtRequest(respW, req) | ||
if err == nil { | ||
t.Fatal("expected error") | ||
} | ||
|
||
req, err = http.NewRequest("GET", "/v1/client/fs/readat/foo", nil) | ||
if err != nil { | ||
t.Fatalf("err: %v", err) | ||
} | ||
respW = httptest.NewRecorder() | ||
|
||
_, err = s.Server.FileReadAtRequest(respW, req) | ||
if err == nil { | ||
t.Fatal("expected error") | ||
} | ||
|
||
req, err = http.NewRequest("GET", "/v1/client/fs/readat/foo?path=/path/to/file", nil) | ||
if err != nil { | ||
t.Fatalf("err: %v", err) | ||
} | ||
respW = httptest.NewRecorder() | ||
|
||
_, err = s.Server.FileReadAtRequest(respW, req) | ||
if err == nil { | ||
t.Fatal("expected error") | ||
} | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters