Revert and bring back B2 gateway implementation (#7224)

This PR is simply a revert of 3265112d04
just for B2 gateway.

vendor/github.com/garyburd/redigo/internal/commandinfo.go

@@ -1,54 +0,0 @@
-// Copyright 2014 Gary Burd
-//
-// Licensed under the Apache License, Version 2.0 (the "License"): you may
-// not use this file except in compliance with the License. You may obtain
-// a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations
-// under the License.
-
-package internal // import "github.com/garyburd/redigo/internal"
-
-import (
-	"strings"
-)
-
-const (
-	WatchState = 1 << iota
-	MultiState
-	SubscribeState
-	MonitorState
-)
-
-type CommandInfo struct {
-	Set, Clear int
-}
-
-var commandInfos = map[string]CommandInfo{
-	"WATCH":      {Set: WatchState},
-	"UNWATCH":    {Clear: WatchState},
-	"MULTI":      {Set: MultiState},
-	"EXEC":       {Clear: WatchState | MultiState},
-	"DISCARD":    {Clear: WatchState | MultiState},
-	"PSUBSCRIBE": {Set: SubscribeState},
-	"SUBSCRIBE":  {Set: SubscribeState},
-	"MONITOR":    {Set: MonitorState},
-}
-
-func init() {
-	for n, ci := range commandInfos {
-		commandInfos[strings.ToLower(n)] = ci
-	}
-}
-
-func LookupCommandInfo(commandName string) CommandInfo {
-	if ci, ok := commandInfos[commandName]; ok {
-		return ci
-	}
-	return commandInfos[strings.ToUpper(commandName)]
-}

vendor/github.com/minio/blazer/LICENSE

@@ -0,0 +1,13 @@
+Copyright 2016, Google
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

vendor/github.com/minio/blazer/base/strings.go

@@ -0,0 +1,81 @@
+// Copyright 2017, Google
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package base
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+)
+
+func noEscape(c byte) bool {
+	switch c {
+	case '.', '_', '-', '/', '~', '!', '$', '\'', '(', ')', '*', ';', '=', ':', '@':
+		return true
+	}
+	return false
+}
+
+func escape(s string) string {
+	// cribbed from url.go, kinda
+	b := &bytes.Buffer{}
+	for i := 0; i < len(s); i++ {
+		switch c := s[i]; {
+		case c == '/':
+			b.WriteByte(c)
+		case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9':
+			b.WriteByte(c)
+		case noEscape(c):
+			b.WriteByte(c)
+		default:
+			fmt.Fprintf(b, "%%%X", c)
+		}
+	}
+	return b.String()
+}
+
+func unescape(s string) (string, error) {
+	b := &bytes.Buffer{}
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		switch c {
+		case '/':
+			b.WriteString("/")
+		case '+':
+			b.WriteString(" ")
+		case '%':
+			if len(s)-i < 3 {
+				return "", errors.New("unescape: bad encoding")
+			}
+			b.WriteByte(unhex(s[i+1])<<4 | unhex(s[i+2]))
+			i += 2
+		default:
+			b.WriteByte(c)
+		}
+	}
+	return b.String(), nil
+}
+
+func unhex(c byte) byte {
+	switch {
+	case '0' <= c && c <= '9':
+		return c - '0'
+	case 'a' <= c && c <= 'f':
+		return c - 'a' + 10
+	case 'A' <= c && c <= 'F':
+		return c - 'A' + 10
+	}
+	return 0
+}

vendor/github.com/minio/blazer/internal/b2types/b2types.go

@@ -0,0 +1,255 @@
+// Copyright 2016, Google
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package b2types implements internal types common to the B2 API.
+package b2types
+
+// You know what would be amazing?  If I could autogen this from like a JSON
+// file.  Wouldn't that be amazing?  That would be amazing.
+
+const (
+	V1api = "/b2api/v1/"
+)
+
+type ErrorMessage struct {
+	Status int    `json:"status"`
+	Code   string `json:"code"`
+	Msg    string `json:"message"`
+}
+
+type AuthorizeAccountResponse struct {
+	AccountID   string `json:"accountId"`
+	AuthToken   string `json:"authorizationToken"`
+	URI         string `json:"apiUrl"`
+	DownloadURI string `json:"downloadUrl"`
+	MinPartSize int    `json:"minimumPartSize"`
+}
+
+type LifecycleRule struct {
+	DaysHiddenUntilDeleted int    `json:"daysFromHidingToDeleting,omitempty"`
+	DaysNewUntilHidden     int    `json:"daysFromUploadingToHiding,omitempty"`
+	Prefix                 string `json:"fileNamePrefix"`
+}
+
+type CreateBucketRequest struct {
+	AccountID      string            `json:"accountId"`
+	Name           string            `json:"bucketName"`
+	Type           string            `json:"bucketType"`
+	Info           map[string]string `json:"bucketInfo"`
+	LifecycleRules []LifecycleRule   `json:"lifecycleRules"`
+}
+
+type CreateBucketResponse struct {
+	BucketID       string            `json:"bucketId"`
+	Name           string            `json:"bucketName"`
+	Type           string            `json:"bucketType"`
+	Info           map[string]string `json:"bucketInfo"`
+	LifecycleRules []LifecycleRule   `json:"lifecycleRules"`
+	Revision       int               `json:"revision"`
+}
+
+type DeleteBucketRequest struct {
+	AccountID string `json:"accountId"`
+	BucketID  string `json:"bucketId"`
+}
+
+type ListBucketsRequest struct {
+	AccountID string `json:"accountId"`
+}
+
+type ListBucketsResponse struct {
+	Buckets []CreateBucketResponse `json:"buckets"`
+}
+
+type UpdateBucketRequest struct {
+	AccountID string `json:"accountId"`
+	BucketID  string `json:"bucketId"`
+	// bucketName is a required field according to
+	// https://www.backblaze.com/b2/docs/b2_update_bucket.html.
+	//
+	// However, actually setting it returns 400: unknown field in
+	// com.backblaze.modules.b2.data.UpdateBucketRequest: bucketName
+	//
+	//Name           string            `json:"bucketName"`
+	Type           string            `json:"bucketType,omitempty"`
+	Info           map[string]string `json:"bucketInfo,omitempty"`
+	LifecycleRules []LifecycleRule   `json:"lifecycleRules,omitempty"`
+	IfRevisionIs   int               `json:"ifRevisionIs,omitempty"`
+}
+
+type UpdateBucketResponse CreateBucketResponse
+
+type GetUploadURLRequest struct {
+	BucketID string `json:"bucketId"`
+}
+
+type GetUploadURLResponse struct {
+	URI   string `json:"uploadUrl"`
+	Token string `json:"authorizationToken"`
+}
+
+type UploadFileResponse struct {
+	FileID    string `json:"fileId"`
+	Timestamp int64  `json:"uploadTimestamp"`
+	Action    string `json:"action"`
+}
+
+type DeleteFileVersionRequest struct {
+	Name   string `json:"fileName"`
+	FileID string `json:"fileId"`
+}
+
+type StartLargeFileRequest struct {
+	BucketID    string            `json:"bucketId"`
+	Name        string            `json:"fileName"`
+	ContentType string            `json:"contentType"`
+	Info        map[string]string `json:"fileInfo,omitempty"`
+}
+
+type StartLargeFileResponse struct {
+	ID string `json:"fileId"`
+}
+
+type CancelLargeFileRequest struct {
+	ID string `json:"fileId"`
+}
+
+type ListUnfinishedLargeFilesRequest struct {
+	BucketID     string `json:"bucketId"`
+	Continuation string `json:"startFileId,omitempty"`
+	Count        int    `json:"maxFileCount,omitempty"`
+}
+
+type ListUnfinishedLargeFilesResponse struct {
+	NextID string `json:"nextFileId"`
+	Files  []struct {
+		AccountID   string            `json:"accountId"`
+		BucketID    string            `json:"bucketId"`
+		Name        string            `json:"fileName"`
+		ID          string            `json:"fileId"`
+		Timestamp   int64             `json:"uploadTimestamp"`
+		ContentType string            `json:"contentType"`
+		Info        map[string]string `json:"fileInfo,omitempty"`
+	} `json:"files"`
+}
+
+type ListPartsRequest struct {
+	ID    string `json:"fileId"`
+	Start int    `json:"startPartNumber"`
+	Count int    `json:"maxPartCount"`
+}
+
+type ListPartsResponse struct {
+	Next  int `json:"nextPartNumber"`
+	Parts []struct {
+		ID     string `json:"fileId"`
+		Number int    `json:"partNumber"`
+		SHA1   string `json:"contentSha1"`
+		Size   int64  `json:"contentLength"`
+	} `json:"parts"`
+}
+
+type getUploadPartURLRequest struct {
+	ID string `json:"fileId"`
+}
+
+type getUploadPartURLResponse struct {
+	URL   string `json:"uploadUrl"`
+	Token string `json:"authorizationToken"`
+}
+
+type UploadPartResponse struct {
+	ID         string `json:"fileId"`
+	PartNumber int    `json:"partNumber"`
+	Size       int64  `json:"contentLength"`
+	SHA1       string `json:"contentSha1"`
+}
+
+type FinishLargeFileRequest struct {
+	ID     string   `json:"fileId"`
+	Hashes []string `json:"partSha1Array"`
+}
+
+type FinishLargeFileResponse struct {
+	Name      string `json:"fileName"`
+	FileID    string `json:"fileId"`
+	Timestamp int64  `json:"uploadTimestamp"`
+	Action    string `json:"action"`
+}
+
+type ListFileNamesRequest struct {
+	BucketID     string `json:"bucketId"`
+	Count        int    `json:"maxFileCount"`
+	Continuation string `json:"startFileName,omitempty"`
+	Prefix       string `json:"prefix,omitempty"`
+	Delimiter    string `json:"delimiter,omitempty"`
+}
+
+type ListFileNamesResponse struct {
+	Continuation string                `json:"nextFileName"`
+	Files        []GetFileInfoResponse `json:"files"`
+}
+
+type ListFileVersionsRequest struct {
+	BucketID  string `json:"bucketId"`
+	Count     int    `json:"maxFileCount"`
+	StartName string `json:"startFileName,omitempty"`
+	StartID   string `json:"startFileId,omitempty"`
+	Prefix    string `json:"prefix,omitempty"`
+	Delimiter string `json:"delimiter,omitempty"`
+}
+
+type ListFileVersionsResponse struct {
+	NextName string                `json:"nextFileName"`
+	NextID   string                `json:"nextFileId"`
+	Files    []GetFileInfoResponse `json:"files"`
+}
+
+type HideFileRequest struct {
+	BucketID string `json:"bucketId"`
+	File     string `json:"fileName"`
+}
+
+type HideFileResponse struct {
+	ID        string `json:"fileId"`
+	Timestamp int64  `json:"uploadTimestamp"`
+	Action    string `json:"action"`
+}
+
+type GetFileInfoRequest struct {
+	ID string `json:"fileId"`
+}
+
+type GetFileInfoResponse struct {
+	FileID      string            `json:"fileId"`
+	Name        string            `json:"fileName"`
+	SHA1        string            `json:"contentSha1"`
+	Size        int64             `json:"contentLength"`
+	ContentType string            `json:"contentType"`
+	Info        map[string]string `json:"fileInfo"`
+	Action      string            `json:"action"`
+	Timestamp   int64             `json:"uploadTimestamp"`
+}
+
+type GetDownloadAuthorizationRequest struct {
+	BucketID string `json:"bucketId"`
+	Prefix   string `json:"fileNamePrefix"`
+	Valid    int    `json:"validDurationInSeconds"`
+}
+
+type GetDownloadAuthorizationResponse struct {
+	BucketID string `json:"bucketId"`
+	Prefix   string `json:"fileNamePrefix"`
+	Token    string `json:"authorizationToken"`
+}

vendor/github.com/minio/blazer/internal/blog/blog.go

@@ -0,0 +1,54 @@
+// Copyright 2017, Google
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package blog implements a private logger, in the manner of glog, without
+// polluting the flag namespace or leaving files all over /tmp.
+//
+// It has almost no features, and a bunch of global state.
+package blog
+
+import (
+	"log"
+	"os"
+	"strconv"
+)
+
+var level int32
+
+type Verbose bool
+
+func init() {
+	lvl := os.Getenv("B2_LOG_LEVEL")
+	i, err := strconv.ParseInt(lvl, 10, 32)
+	if err != nil {
+		return
+	}
+	level = int32(i)
+}
+
+func (v Verbose) Info(a ...interface{}) {
+	if v {
+		log.Print(a...)
+	}
+}
+
+func (v Verbose) Infof(format string, a ...interface{}) {
+	if v {
+		log.Printf(format, a...)
+	}
+}
+
+func V(target int32) Verbose {
+	return Verbose(target <= level)
+}

vendor/vendor.json

@@ -297,12 +297,6 @@
 			"revision": "42c364ba490082e4815b5222728711b3440603eb",
 			"revisionTime": "2017-01-13T15:16:12Z"
 		},
-		{
-			"checksumSHA1": "2UmMbNHc8FBr98mJFN1k8ISOIHk=",
-			"path": "github.com/garyburd/redigo/internal",
-			"revision": "0d253a66e6e1349f4581d6d2b300ee434ee2da9f",
-			"revisionTime": "2017-02-16T21:49:44Z"
-		},
 		{
 			"checksumSHA1": "+IH9gXMht4fL/fxKRZ4sqGBps1g=",
 			"path": "github.com/go-ini/ini",
@@ -590,6 +584,24 @@
 			"revision": "db96a2b759cdef4f11a34506a42eb8d1290c598e",
 			"revisionTime": "2016-07-26T03:20:27Z"
 		},
+		{
+			"checksumSHA1": "uTShVxdYNwW+3WI6SfJwOc/LQgo=",
+			"path": "github.com/minio/blazer/base",
+			"revision": "2081f5bf046503f576d8712253724fbf2950fffe",
+			"revisionTime": "2017-11-26T20:28:54Z"
+		},
+		{
+			"checksumSHA1": "ucCxupZ1gyxvFsBg5igP13dySLI=",
+			"path": "github.com/minio/blazer/internal/b2types",
+			"revision": "2081f5bf046503f576d8712253724fbf2950fffe",
+			"revisionTime": "2017-11-26T20:28:54Z"
+		},
+		{
+			"checksumSHA1": "zgBbPwwuUH2sxz8smOzOA9TrD5g=",
+			"path": "github.com/minio/blazer/internal/blog",
+			"revision": "2081f5bf046503f576d8712253724fbf2950fffe",
+			"revisionTime": "2017-11-26T20:28:54Z"
+		},
 		{
 			"checksumSHA1": "fUWokilZyc1QDKnIgCDJE8n1S9U=",
 			"path": "github.com/minio/cli",