Skip to content

Commit

Permalink
gateway/gcs: Complete minio browser support for gcs. (minio#4552)
Browse files Browse the repository at this point in the history
  • Loading branch information
harshavardhana authored Jun 20, 2017
1 parent 3928c1e commit 5a78266
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
5 changes: 0 additions & 5 deletions cmd/gateway-azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"crypto/md5"
"encoding/base64"
"encoding/hex"
"errors"
"fmt"
"hash"
"io"
Expand Down Expand Up @@ -169,10 +168,6 @@ func newAzureLayer(host string) (GatewayLayer, error) {
}

creds := serverConfig.GetCredential()
if !creds.IsValid() && !globalIsEnvCreds {
return nil, errors.New("Azure backend account and secret keys should be set through ENVs")
}

c, err := storage.NewClient(creds.AccessKey, creds.SecretKey, endpoint, globalAzureAPIVersion, secure)
if err != nil {
return &azureObjects{}, err
Expand Down
5 changes: 5 additions & 0 deletions cmd/gateway-main.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,11 @@ func gatewayMain(ctx *cli.Context, backendType gatewayBackend) {
// Handle common env vars.
handleCommonEnvVars()

// Validate if we have access, secret set through environment.
if !globalIsEnvCreds {
fatalIf(fmt.Errorf("Access and Secret keys should be set through ENVs for backend [%s]", backendType), "")
}

// Create certs path.
fatalIf(createConfigDir(), "Unable to create configuration directories.")

Expand Down
4 changes: 0 additions & 4 deletions cmd/gateway-s3.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package cmd

import (
"errors"
"io"
"net/http"
"path"
Expand Down Expand Up @@ -120,9 +119,6 @@ func newS3Gateway(host string) (GatewayLayer, error) {
}

creds := serverConfig.GetCredential()
if !creds.IsValid() && !globalIsEnvCreds {
return nil, errors.New("S3 backend account and secret keys should be set through ENVs")
}

// Initialize minio client object.
client, err := minio.NewCore(endpoint, creds.AccessKey, creds.SecretKey, secure)
Expand Down
14 changes: 9 additions & 5 deletions cmd/web-handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -690,13 +690,15 @@ func getBucketAccessPolicy(objAPI ObjectLayer, bucketName string) (policy.Bucket
policyInfo, err = layer.GetBucketPolicies(bucketName)
case *azureObjects:
policyInfo, err = layer.GetBucketPolicies(bucketName)
case *gcsGateway:
policyInfo, err = layer.GetBucketPolicies(bucketName)
default:
policyInfo, err = readBucketAccessPolicy(objAPI, bucketName)
}
return policyInfo, err
}

// GetBucketPolicy - get bucket policy.
// GetBucketPolicy - get bucket policy for the requested prefix.
func (web *webAPIHandlers) GetBucketPolicy(r *http.Request, args *GetBucketPolicyArgs, reply *GetBucketPolicyRep) error {
objectAPI := web.ObjectAPI()
if objectAPI == nil {
Expand All @@ -707,9 +709,12 @@ func (web *webAPIHandlers) GetBucketPolicy(r *http.Request, args *GetBucketPolic
return toJSONError(errAuthentication)
}

policyInfo, err := readBucketAccessPolicy(objectAPI, args.BucketName)
var policyInfo, err = getBucketAccessPolicy(objectAPI, args.BucketName)
if err != nil {
return toJSONError(err, args.BucketName)
_, ok := errorCause(err).(PolicyNotFound)
if !ok {
return toJSONError(err, args.BucketName)
}
}

reply.UIVersion = browser.UIVersion
Expand Down Expand Up @@ -745,8 +750,8 @@ func (web *webAPIHandlers) ListAllBucketPolicies(r *http.Request, args *ListAllB
if !isHTTPRequestValid(r) {
return toJSONError(errAuthentication)
}
var policyInfo, err = getBucketAccessPolicy(objectAPI, args.BucketName)

var policyInfo, err = getBucketAccessPolicy(objectAPI, args.BucketName)
if err != nil {
_, ok := errorCause(err).(PolicyNotFound)
if !ok {
Expand Down Expand Up @@ -791,7 +796,6 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic
}

var policyInfo, err = getBucketAccessPolicy(objectAPI, args.BucketName)

if err != nil {
if _, ok := errorCause(err).(PolicyNotFound); !ok {
return toJSONError(err, args.BucketName)
Expand Down

0 comments on commit 5a78266

Please sign in to comment.