Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add UploadContent #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add UploadContent #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90e6ddb
repo: switch to go modules
Aug 5, 2019
f2a9fc2
feat: add UploadContent
Aug 5, 2019
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
3 changes: 3 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module github.com/akamai/NetStorageKit-Golang

go 1.7
77 changes: 48 additions & 29 deletions netstorage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,31 +46,31 @@ func NewNetstorage(hostname, keyname, key string, ssl bool) *Netstorage {
}

// Only for upload action. (Used by _request func)
func _ifUploadAction(kwargs map[string]string) (*io.Reader, error) {
func _ifUploadAction(kwargs map[string]interface{}) (io.Reader, error) {
var data io.Reader
if kwargs["action"] == "upload" {
bArr, err := ioutil.ReadFile(kwargs["source"])
if kwargs["action"].(string) == "upload" {
bArr, err := ioutil.ReadFile(kwargs["source"].(string))
if err != nil {
return nil, err
}

data = bytes.NewReader(bArr)
}
return &data, nil
return data, nil
}

// Reads http body from response, closes response.Body and
// returns that string. (Used by _request func)
func _getBody(kwargs map[string]string, response *http.Response) (string, error) {
func _getBody(kwargs map[string]interface{}, response *http.Response) (string, error) {
var body []byte
var err error
if kwargs["action"] == "download" && response.StatusCode == 200 {
localDestination := kwargs["destination"]
if kwargs["action"].(string) == "download" && response.StatusCode == 200 {
localDestination := kwargs["destination"].(string)

if localDestination == "" {
localDestination = path.Base(kwargs["path"])
localDestination = path.Base(kwargs["path"].(string))
} else if s, err := os.Stat(localDestination); err == nil && s.IsDir() {
localDestination = path.Join(localDestination, path.Base(kwargs["path"]))
localDestination = path.Join(localDestination, path.Base(kwargs["path"].(string)))
}

out, err := os.Create(localDestination)
Expand All @@ -96,17 +96,17 @@ func _getBody(kwargs map[string]string, response *http.Response) (string, error)
// Create the authorization headers with Netstorage struct values then
// request to the Netstorage hostname, and return the response,
// the body string and the error.
func (ns *Netstorage) _request(kwargs map[string]string) (*http.Response, string, error) {
func (ns *Netstorage) _request(kwargs map[string]interface{}) (*http.Response, string, error) {
var err error

nsPath := kwargs["path"]
nsPath := kwargs["path"].(string)
if u, err := url.Parse(nsPath); strings.HasPrefix(nsPath, "/") && err == nil {
nsPath = u.RequestURI()
} else {
return nil, "", fmt.Errorf("[Netstorage Error] Invalid netstorage path: %s", nsPath)
}

acsAction := fmt.Sprintf("version=1&action=%s", kwargs["action"])
acsAction := fmt.Sprintf("version=1&action=%s", kwargs["action"].(string))
acsAuthData := fmt.Sprintf("5, 0.0.0.0, 0.0.0.0, %d, %d, %s",
time.Now().Unix(),
rand.Intn(100000),
Expand All @@ -117,13 +117,18 @@ func (ns *Netstorage) _request(kwargs map[string]string) (*http.Response, string
mac.Write([]byte(acsAuthData + signString))
acsAuthSign := base64.StdEncoding.EncodeToString(mac.Sum(nil))

data, err := _ifUploadAction(kwargs)
if err != nil {
return nil, "", err
var data io.Reader
if _, exists := kwargs["content"]; exists {
data = kwargs["content"].(io.Reader)
} else {
data, err = _ifUploadAction(kwargs)
if err != nil {
return nil, "", err
}
}

request, err := http.NewRequest(kwargs["method"],
fmt.Sprintf("http%s://%s%s", ns.Ssl, ns.Hostname, nsPath), *data)
request, err := http.NewRequest(kwargs["method"].(string),
fmt.Sprintf("http%s://%s%s", ns.Ssl, ns.Hostname, nsPath), data)

if err != nil {
return nil, "", err
Expand All @@ -149,7 +154,7 @@ func (ns *Netstorage) _request(kwargs map[string]string) (*http.Response, string

// Dir returns the directory structure
func (ns *Netstorage) Dir(nsPath string) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "dir&format=xml",
"method": "GET",
"path": nsPath,
Expand All @@ -173,7 +178,7 @@ func (ns *Netstorage) Download(path ...string) (*http.Response, string, error) {
localDestination = path[1]
}

return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "download",
"method": "GET",
"path": nsSource,
Expand All @@ -183,7 +188,7 @@ func (ns *Netstorage) Download(path ...string) (*http.Response, string, error) {

// Du returns the disk usage information for a directory
func (ns *Netstorage) Du(nsPath string) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "du&format=xml",
"method": "GET",
"path": nsPath,
Expand All @@ -192,7 +197,7 @@ func (ns *Netstorage) Du(nsPath string) (*http.Response, string, error) {

// Stat returns the information about an object structure
func (ns *Netstorage) Stat(nsPath string) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "stat&format=xml",
"method": "GET",
"path": nsPath,
Expand All @@ -201,7 +206,7 @@ func (ns *Netstorage) Stat(nsPath string) (*http.Response, string, error) {

// Mkdir creates an empty directory
func (ns *Netstorage) Mkdir(nsPath string) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "mkdir",
"method": "POST",
"path": nsPath,
Expand All @@ -210,7 +215,7 @@ func (ns *Netstorage) Mkdir(nsPath string) (*http.Response, string, error) {

// Rmdir deletes an empty directory
func (ns *Netstorage) Rmdir(nsPath string) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "rmdir",
"method": "POST",
"path": nsPath,
Expand All @@ -219,7 +224,7 @@ func (ns *Netstorage) Rmdir(nsPath string) (*http.Response, string, error) {

// Mtime changes a file’s mtime
func (ns *Netstorage) Mtime(nsPath string, mtime int64) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": fmt.Sprintf("mtime&format=xml&mtime=%d", mtime),
"method": "POST",
"path": nsPath,
Expand All @@ -228,7 +233,7 @@ func (ns *Netstorage) Mtime(nsPath string, mtime int64) (*http.Response, string,

// Delete deletes an object/symbolic link
func (ns *Netstorage) Delete(nsPath string) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "delete",
"method": "POST",
"path": nsPath,
Expand All @@ -238,7 +243,7 @@ func (ns *Netstorage) Delete(nsPath string) (*http.Response, string, error) {
// QuickDelete deletes a directory (i.e., recursively delete a directory tree)
// In order to use this func, you need to the privilege on the CP Code.
func (ns *Netstorage) QuickDelete(nsPath string) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "quick-delete&quick-delete=imreallyreallysure",
"method": "POST",
"path": nsPath,
Expand All @@ -247,7 +252,7 @@ func (ns *Netstorage) QuickDelete(nsPath string) (*http.Response, string, error)

// Rename renames a file or symbolic link.
func (ns *Netstorage) Rename(nsTarget, nsDestination string) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "rename&destination=" + url.QueryEscape(nsDestination),
"method": "POST",
"path": nsTarget,
Expand All @@ -256,7 +261,7 @@ func (ns *Netstorage) Rename(nsTarget, nsDestination string) (*http.Response, st

// Symlink creates a symbolic link.
func (ns *Netstorage) Symlink(nsTarget, nsDestination string) (*http.Response, string, error) {
return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "symlink&target=" + url.QueryEscape(nsTarget),
"method": "POST",
"path": nsDestination,
Expand Down Expand Up @@ -284,10 +289,24 @@ func (ns *Netstorage) Upload(localSource, nsDestination string) (*http.Response,
return nil, "", fmt.Errorf("[NetstorageError] You should upload a file, not %s", localSource)
}

return ns._request(map[string]string{
return ns._request(map[string]interface{}{
"action": "upload",
"method": "PUT",
"source": localSource,
"path": nsDestination,
})
}

// UploadContent uploads an object directly with its content.
func (ns *Netstorage) UploadContent(reader io.Reader, nsDestination string) (*http.Response, string, error) {
if strings.HasSuffix(nsDestination, "/") {
return nil, "", fmt.Errorf("[NetstorageError] Destination path should not be a directory")
}

return ns._request(map[string]interface{}{
"action": "upload",
"method": "PUT",
"content": reader,
"path": nsDestination,
})
}
12 changes: 12 additions & 0 deletions netstorage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package netstorage

import (
"bytes"
"fmt"
"io/ioutil"
"os"
Expand Down Expand Up @@ -117,6 +118,17 @@ func TestNetstorage(t *testing.T) {
return
}

res, body, err = ns.UploadContent(bytes.NewBufferString(testString), tempNsFile)
wrong = assertEqual(t, res.StatusCode, 200,
"Upload",
fmt.Sprintf("[TEST] Upload content '%s' to %s done\n", testString, tempNsFile),
body,
err,
)
if wrong {
return
}

res, body, err = ns.Du(tempNsDir)
wrong = assertEqual(t, res.StatusCode, 200,
"Du",
Expand Down