maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use MINIO_REGION environment variable for region configuration, closes #4287

Browse source
This commit is contained in:
Remco Verhoef 2017-05-10 10:02:45 -07:00 committed by Harshavardhana
parent dd7e47f264
commit 2de1921fe8
2 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
cmd/gateway-gcs-layer.go
View file

@ -218,28 +218,8 @@ func (l *gcsGateway) MakeBucket(bucket string) error {
func (l *gcsGateway) MakeBucketWithLocation(bucket, location string) error {
bkt := l.client.Bucket(bucket)
// this will map s3 regions to google multi regions
if v, ok := map[string]string{
"ap-northeast-1": "asia",
"ap-northeast-2": "asia",
"ap-south-1": "asia",
"ap-southeast-1": "asia",
"ap-southeast-2": "asia",
"eu-central-1": "eu",
"eu-west-1": "eu",
"eu-west-2": "eu",
"ca-central-1": "us",
"sa-east-1": "us",
"us-east-1": "us",
"us-east-2": "us",
"us-west-1": "us",
"us-west-2": "us",
}[location]; ok {
location = v
}
if err := bkt.Create(l.ctx, l.projectID, &storage.BucketAttrs{
Location: location,
Location: serverConfig.Region,
}); err != nil {
return gcsToObjectError(traceError(err), bucket)
}
@ -826,14 +806,15 @@ func (l *gcsGateway) SetBucketPolicies(bucket string, policyInfo policy.BucketAc
role := storage.RoleReader
if policies[0].Policy == policy.BucketPolicyReadOnly {
switch policies[0].Policy {
case policy.BucketPolicyReadOnly:
role = storage.RoleReader
} else if policies[0].Policy == policy.BucketPolicyWriteOnly {
case policy.BucketPolicyWriteOnly:
role = storage.RoleWriter
} else if policies[0].Policy == policy.BucketPolicyReadWrite {
case policy.BucketPolicyReadWrite:
// not supported, google only has owner role
return gcsToObjectError(traceError(NotSupported{}), bucket)
} else {
default:
return gcsToObjectError(traceError(fmt.Errorf("Unknown policy: %s", policies[0].Policy)), bucket)
}

9
cmd/gateway-handlers.go
View file

@ -652,6 +652,15 @@ func (api gatewayAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Re
return
}
// validating region here, because isValidLocationConstraint
// reads body which has been read already. So only validating
// region here.
serverRegion := serverConfig.GetRegion()
if serverRegion != location {
writeErrorResponse(w, ErrInvalidRegion, r.URL)
return
}
bucketLock := globalNSMutex.NewNSLock(bucket, "")
bucketLock.Lock()
defer bucketLock.Unlock()