fix: honour the set region config

src/main/helpers.js

@@ -791,3 +791,5 @@ export class SelectResults {
   }
 
 }
+
+export const DEFAULT_REGION = 'us-east-1'

src/main/minio.js

@@ -40,7 +40,8 @@ import {
   LEGAL_HOLD_STATUS, CopySourceOptions, CopyDestinationOptions, getSourceVersionId,
   PART_CONSTRAINTS,
   partsRequired,
-  calculateEvenSplits
+  calculateEvenSplits,
+  DEFAULT_REGION
 } from './helpers.js'
 
 import { signV4, presignSignatureV4, postPresignSignatureV4 } from './signing.js'
@@ -62,6 +63,7 @@ import { parseSelectObjectContentResponse} from "./xml-parsers"
 
 var Package = require('../../package.json')
 
+
 export class Client {
   constructor(params) {
     if (typeof params.secure !== 'undefined') throw new Error('"secure" option deprecated, "useSSL" should be used instead')
@@ -132,6 +134,7 @@ export class Client {
     this.secretKey = params.secretKey
     this.sessionToken = params.sessionToken
     this.userAgent = `${libraryAgent}`
+    this.region = DEFAULT_REGION
 
     // Default path style is true
     if (params.pathStyle === undefined) {
@@ -517,7 +520,7 @@ export class Client {
     if (this.regionMap[bucketName]) return cb(null, this.regionMap[bucketName])
     var extractRegion = (response) => {
       var transformer = transformers.getBucketRegionTransformer()
-      var region = 'us-east-1'
+      var region = DEFAULT_REGION
       pipesetup(response, transformer)
         .on('error', cb)
         .on('data', data => {
@@ -545,7 +548,7 @@ export class Client {
     //   obtained region.
     var pathStyle = this.pathStyle && typeof window === 'undefined'
 
-    this.makeRequest({method, bucketName, query, pathStyle}, '', [200], 'us-east-1', true, (e, response) => {
+    this.makeRequest({method, bucketName, query, pathStyle}, '', [200], this.region, true, (e, response) => {
       if (e) {
         if (e.name === 'AuthorizationHeaderMalformed') {
           var region = e.Region
@@ -569,7 +572,7 @@ export class Client {
   // * `region` _string_ - region valid values are _us-west-1_, _us-west-2_,  _eu-west-1_, _eu-central-1_, _ap-southeast-1_, _ap-northeast-1_, _ap-southeast-2_, _sa-east-1_.
   // * `makeOpts` _object_ - Options to create a bucket. e.g {ObjectLocking:true} (Optional)
   // * `callback(err)` _function_ - callback function with `err` as the error argument. `err` is null if the bucket is successfully created.
-  makeBucket(bucketName, region, makeOpts={}, cb) {
+  makeBucket(bucketName, region="", makeOpts={}, cb) {
     if (!isValidBucketName(bucketName)) {
       throw new errors.InvalidBucketNameError('Invalid bucket name: ' + bucketName)
     }
@@ -602,17 +605,9 @@ export class Client {
 
     var payload = ''
 
-    // Region already set in constructor, validate if
-    // caller requested bucket location is same.
-    if (region && this.region) {
-      if (region !== this.region) {
-        throw new errors.InvalidArgumentError(`Configured region ${this.region}, requested ${region}`)
-      }
-    }
-
     // sending makeBucket request with XML containing 'us-east-1' fails. For
     // default region server expects the request without body
-    if (region && region !== 'us-east-1') {
+    if (region && region !== DEFAULT_REGION) {
       var createBucketConfiguration = []
       createBucketConfiguration.push({
         _attr: {
@@ -634,7 +629,7 @@ export class Client {
       headers["x-amz-bucket-object-lock-enabled"]=true
     }
 
-    if (!region) region = 'us-east-1'
+    if (!region) region = this.region
     this.makeRequest({method, bucketName, headers}, payload, [200], region, false, cb)
   }
 
@@ -651,7 +646,7 @@ export class Client {
       throw new TypeError('callback should be of type "function"')
     }
     var method = 'GET'
-    this.makeRequest({method}, '', [200], 'us-east-1', true, (e, response) => {
+    this.makeRequest({method}, '', [200], this.region, true, (e, response) => {
       if (e) return cb(e)
       var transformer = transformers.getListBucketTransformer()
       var buckets
@@ -763,7 +758,7 @@ export class Client {
       throw new TypeError('callback should be of type "function"')
     }
     var method = 'DELETE'
-    this.makeRequest({method, bucketName}, '', [204], '', false, (e) => {
+    this.makeRequest({method, bucketName}, '', [204], this.region, false, (e) => {
       // If the bucket was successfully removed, remove the region map entry.
       if (!e) delete(this.regionMap[bucketName])
       cb(e)

src/main/notification.js

@@ -16,7 +16,7 @@
 
 import { EventEmitter } from 'events'
 import * as transformers from './transformers'
-import { pipesetup, uriEscape } from './helpers'
+import {DEFAULT_REGION, pipesetup, uriEscape} from './helpers'
 
 // Notification config - array of target configs.
 // Target configs can be
@@ -151,7 +151,7 @@ export class NotificationPoller extends EventEmitter {
     if (queries.length > 0) {
       query = `${queries.join('&')}`
     }
-    const region = this.client.region || 'us-east-1'
+    const region = this.client.region || DEFAULT_REGION
     this.client.makeRequest({ method, bucketName: this.bucketName, query }, '', [200], region, true, (e, response) => {
       if (e) return this.emit('error', e)