Unify gateway and object layer. (#5487)

* Unify gateway and object layer. Bring bucket policies into
object layer.

cmd/gateway/b2/gateway-b2_test.go

@@ -18,7 +18,6 @@ package b2
 
 import (
 	"fmt"
-	"net/http"
 	"testing"
 
 	b2 "github.com/minio/blazer/base"
@@ -27,88 +26,6 @@ import (
 	minio "github.com/minio/minio/cmd"
 )
 
-// Tests headerToObjectInfo
-func TestHeaderToObjectInfo(t *testing.T) {
-	testCases := []struct {
-		bucket, object string
-		header         http.Header
-		objInfo        minio.ObjectInfo
-	}{
-		{
-			bucket: "bucket",
-			object: "object",
-			header: http.Header{
-				"Content-Length":         []string{"10"},
-				"Content-Type":           []string{"application/javascript"},
-				"X-Bz-Upload-Timestamp":  []string{"1000"},
-				"X-Bz-Info-X-Amz-Meta-1": []string{"test1"},
-				"X-Bz-File-Id":           []string{"xxxxx"},
-			},
-			objInfo: minio.ObjectInfo{
-				Bucket:      "bucket",
-				Name:        "object",
-				ContentType: "application/javascript",
-				Size:        10,
-				UserDefined: map[string]string{
-					"X-Amz-Meta-1": "test1",
-				},
-				ETag: "xxxxx",
-			},
-		},
-	}
-	for i, testCase := range testCases {
-		gotObjInfo, err := headerToObjectInfo(testCase.bucket, testCase.object, testCase.header)
-		if err != nil {
-			t.Fatalf("Test %d: %s", i+1, err)
-		}
-		if gotObjInfo.Bucket != testCase.objInfo.Bucket {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.objInfo.Bucket, gotObjInfo.Bucket)
-		}
-		if gotObjInfo.Name != testCase.objInfo.Name {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.objInfo.Name, gotObjInfo.Name)
-		}
-		if gotObjInfo.ContentType != testCase.objInfo.ContentType {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.objInfo.ContentType, gotObjInfo.ContentType)
-		}
-		if gotObjInfo.ETag != testCase.objInfo.ETag {
-			t.Errorf("Test %d: Expected %s, got %s", i+1, testCase.objInfo.ETag, gotObjInfo.ETag)
-		}
-	}
-}
-
-// Tests mkRange test.
-func TestMkRange(t *testing.T) {
-	testCases := []struct {
-		offset, size int64
-		expectedRng  string
-	}{
-		// No offset set, size not set.
-		{
-			offset:      0,
-			size:        0,
-			expectedRng: "",
-		},
-		// Offset set, size not set.
-		{
-			offset:      10,
-			size:        0,
-			expectedRng: "bytes=10-",
-		},
-		// Offset set, size set.
-		{
-			offset:      10,
-			size:        11,
-			expectedRng: "bytes=10-20",
-		},
-	}
-	for i, testCase := range testCases {
-		gotRng := mkRange(testCase.offset, testCase.size)
-		if gotRng != testCase.expectedRng {
-			t.Errorf("Test %d: expected %s, got %s", i+1, testCase.expectedRng, gotRng)
-		}
-	}
-}
-
 // Test b2 object error.
 func TestB2ObjectError(t *testing.T) {
 	testCases := []struct {