refractor: response

cmd/btfs/daemon.go

@@ -717,6 +717,9 @@ If the user need to start multiple nodes on the same machine, the configuration
 		functest(cfg.Services.OnlineServerDomain, cfg.Identity.PeerID, hValue)
 	}
 
+	// init s3 providers
+	s3.InitProviders(statestore)
+
 	// access-key init
 	accesskey.InitService(s3.GetProviders())
 

core/commands/files.go

@@ -735,7 +735,7 @@ stat' on the file or any of its ancestors.
 	},
 	Arguments: []cmds.Argument{
 		cmds.StringArg("path", true, false, "Path to write to."),
-		cmds.FileArg("data", true, false, "Data to write.").EnableStdin(),
+		cmds.FileArg("data", true, false, "data to write.").EnableStdin(),
 	},
 	Options: []cmds.Option{
 		cmds.Int64Option(filesOffsetOptionName, "o", "Byte offset to begin writing at."),

core/commands/object/object.go

@@ -270,7 +270,7 @@ Supported values are:
 	Type: Node{},
 	Encoders: cmds.EncoderMap{
 		cmds.Protobuf: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *Node) error {
-			// deserialize the Data field as text as this was the standard behaviour
+			// deserialize the data field as text as this was the standard behaviour
 			object, err := deserializeNode(out, "text")
 			if err != nil {
 				return nil
@@ -371,20 +371,20 @@ It reads from stdin, and the output is a base58 encoded multihash.
 'btfs object put' is a plumbing command for storing DAG nodes.
 It reads from stdin, and the output is a base58 encoded multihash.
 
-Data should be in the format specified by the --inputenc flag.
+data should be in the format specified by the --inputenc flag.
 --inputenc may be one of the following:
 	* "protobuf"
 	* "json" (default)
 
 Examples:
 
-	$ echo '{ "Data": "abc" }' | btfs object put
+	$ echo '{ "data": "abc" }' | btfs object put
 
 This creates a node with the data 'abc' and no links. For an object with
 links, create a file named 'node.json' with the contents:
 
     {
-        "Data": "another",
+        "data": "another",
         "Links": [ {
             "Name": "some link",
             "Hash": "QmXg9Pp2ytZ14xgmQjYEiHjVjMFXzCVVEcRTWJBmLgR39V",
@@ -399,7 +399,7 @@ And then run:
 	},
 
 	Arguments: []cmds.Argument{
-		cmds.FileArg("data", true, false, "Data to be stored as a DAG object.").EnableStdin(),
+		cmds.FileArg("data", true, false, "data to be stored as a DAG object.").EnableStdin(),
 	},
 	Options: []cmds.Option{
 		cmds.StringOption(inputencOptionName, "Encoding type of input data. One of: {\"protobuf\", \"json\"}.").WithDefault("json"),

core/commands/object/patch.go

@@ -46,7 +46,7 @@ the limit will not be respected by the network.
 	},
 	Arguments: []cmds.Argument{
 		cmds.StringArg("root", true, false, "The hash of the node to modify."),
-		cmds.FileArg("data", true, false, "Data to append.").EnableStdin(),
+		cmds.FileArg("data", true, false, "data to append.").EnableStdin(),
 	},
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
 		api, err := cmdenv.GetApi(env, req)

fuse/ipns/ipns_test.go

@@ -66,10 +66,10 @@ func verifyFile(t *testing.T, path string, wantData []byte) {
 		t.Fatal(err)
 	}
 	if len(isData) != len(wantData) {
-		t.Fatal("Data not equal - length check failed")
+		t.Fatal("data not equal - length check failed")
 	}
 	if !bytes.Equal(isData, wantData) {
-		t.Fatal("Data not equal")
+		t.Fatal("data not equal")
 	}
 }
 
@@ -328,7 +328,7 @@ func TestAppendFile(t *testing.T) {
 		t.Fatal(err)
 	}
 	if !bytes.Equal(rbuf, data) {
-		t.Fatal("Data inconsistent!")
+		t.Fatal("data inconsistent!")
 	}
 }
 
@@ -458,7 +458,7 @@ func TestFSThrash(t *testing.T) {
 		}
 
 		if !bytes.Equal(data, out) {
-			t.Errorf("Data didn't match in %s: expected %v, got %v", name, data, out)
+			t.Errorf("data didn't match in %s: expected %v, got %v", name, data, out)
 		}
 	}
 }

fuse/readonly/readonly_unix.go

@@ -272,7 +272,7 @@ func (s *Node) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadR
 	if err != nil {
 		return err
 	}
-	// Data has a capacity of Size
+	// data has a capacity of Size
 	buf := resp.Data[:int(req.Size)]
 	n, err := io.ReadFull(r, buf)
 	resp.Data = buf[:n]

s3/consts/consts.go

@@ -28,10 +28,11 @@ const (
 	AssumeRole      = "AssumeRole"
 	SignV4Algorithm = "AWS4-HMAC-SHA256"
 
-	DefaultLocation  = "us-east-1"
-	DefaultBucketACL = s3.BucketCannedACLPublicRead
-	DefaultObjectACL = ""
-	AllUsersURI      = "http://acs.amazonaws.com/groups/global/AllUsers"
+	DefaultServerInfo = "BTFS"
+	DefaultLocation   = "us-east-1"
+	DefaultBucketACL  = s3.BucketCannedACLPublicRead
+	DefaultObjectACL  = ""
+	AllUsersURI       = "http://acs.amazonaws.com/groups/global/AllUsers"
 )
 
 var SupportedLocations = map[string]bool{

s3/handlers/handlers.go

@@ -12,8 +12,6 @@ import (
 	"strconv"
 )
 
-const lockPrefix = "s3:lock/"
-
 var _ Handlerser = (*Handlers)(nil)
 
 type Handlers struct {

s3/handlers/handlers_bucket.go

@@ -44,7 +44,7 @@ func (h *Handlers) CreateBucketHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	responses.WritePutBucketResponse(w, r)
+	responses.WriteCreateBucketResponse(w, r)
 
 	return
 }
@@ -154,7 +154,7 @@ func (h *Handlers) PutBucketAclHandler(w http.ResponseWriter, r *http.Request) {
 	}()
 
 	req, rerr := requests.ParsePutBucketAclRequest(r)
-	if err != nil {
+	if rerr != nil {
 		err = rerr
 		responses.WriteErrorResponse(w, r, rerr)
 		return

s3/requests/parsers.go

@@ -1,12 +1,9 @@
 package requests
 
 import (
-	"errors"
-	"fmt"
 	"github.com/bittorrent/go-btfs/s3/cctx"
 	"github.com/bittorrent/go-btfs/s3/responses"
 	"net/http"
-	"reflect"
 )
 
 // CreateBucketRequest .
@@ -17,23 +14,6 @@ type CreateBucketRequest struct {
 	Region    string
 }
 
-// todo: parse aws request use aws struct
-func ParseS3Request(r *http.Request, v interface{}) (err error) {
-	rv := reflect.ValueOf(v)
-	if rv.Kind() != reflect.Pointer || rv.IsNil() {
-		err = errors.New("invalid value must be non nil pointer")
-		return
-	}
-
-	rt := reflect.TypeOf(v).Elem()
-	n := rt.NumField()
-	for i := 0; i < n; i++ {
-		f := rt.Field(i)
-		fmt.Println(f)
-	}
-	return
-}
-
 func ParseCreateBucketRequest(r *http.Request) (req *CreateBucketRequest, rerr *responses.Error) {
 	req = &CreateBucketRequest{}
 	req.AccessKey = cctx.GetAccessKey(r)

s3/requests/parsers_common.go

@@ -14,7 +14,8 @@ import (
 )
 
 func parseBucket(r *http.Request) (bucket string, rerr *responses.Error) {
-	err := s3utils.CheckValidBucketNameStrict(mux.Vars(r)["bucket"])
+	bucket = mux.Vars(r)["bucket"]
+	err := s3utils.CheckValidBucketNameStrict(bucket)
 	if err != nil {
 		rerr = responses.ErrInvalidBucketName
 	}