mirror of
https://github.com/minio/minio.git
synced 2025-02-13 06:38:09 -05:00
Add region to gcs gateway example
This commit is contained in:
parent
5c78415b31
commit
4430085981
@ -222,8 +222,28 @@ func (l *gcsGateway) MakeBucket(bucket string) error {
|
|||||||
func (l *gcsGateway) MakeBucketWithLocation(bucket, location string) error {
|
func (l *gcsGateway) MakeBucketWithLocation(bucket, location string) error {
|
||||||
bkt := l.client.Bucket(bucket)
|
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{
|
if err := bkt.Create(l.ctx, l.projectID, &storage.BucketAttrs{
|
||||||
Location: serverConfig.Region,
|
Location: location,
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return gcsToObjectError(traceError(err), bucket)
|
return gcsToObjectError(traceError(err), bucket)
|
||||||
}
|
}
|
||||||
|
@ -658,7 +658,10 @@ func (api gatewayAPIHandlers) PutBucketHandler(w http.ResponseWriter, r *http.Re
|
|||||||
// reads body which has been read already. So only validating
|
// reads body which has been read already. So only validating
|
||||||
// region here.
|
// region here.
|
||||||
serverRegion := serverConfig.GetRegion()
|
serverRegion := serverConfig.GetRegion()
|
||||||
if serverRegion != location {
|
if serverRegion == "" {
|
||||||
|
// we will only validate the region
|
||||||
|
// when the region has been explicitely set
|
||||||
|
} else if serverRegion != location {
|
||||||
writeErrorResponse(w, ErrInvalidRegion, r.URL)
|
writeErrorResponse(w, ErrInvalidRegion, r.URL)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user