Merge pull request #119 from oss-serverless/revert-113-fix-deployment-bucket-inus-east-1

Author: mnapoli

lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js

@@ -27,7 +27,7 @@ module.exports = {
     if (this.serverless.service.provider.deploymentBucket) {
       let result;
       try {
-        result = await this.provider.request('S3', 'headBucket', {
+        result = await this.provider.request('S3', 'getBucketLocation', {
           Bucket: this.bucketName,
         });
       } catch (err) {
@@ -37,8 +37,9 @@ module.exports = {
         );
       }
 
-      if (result.BucketRegion === 'EU') result.BucketRegion = 'eu-west-1';
-      if (result.BucketRegion !== this.provider.getRegion()) {
+      if (result.LocationConstraint === '') result.LocationConstraint = 'us-east-1';
+      if (result.LocationConstraint === 'EU') result.LocationConstraint = 'eu-west-1';
+      if (result.LocationConstraint !== this.provider.getRegion()) {
         throw new ServerlessError(
           'Deployment bucket is not in the same region as the lambda function',
           'DEPLOYMENT_BUCKET_INVALID_REGION'

test/unit/lib/plugins/aws/deploy/index.test.js

@@ -112,16 +112,12 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
           deleteObjects: deleteObjectsStub,
           listObjectsV2: { Contents: [] },
           upload: s3UploadStub,
+          headBucket: {},
           getBucketLocation: () => {
             return {
               LocationConstraint: 'us-east-1',
             };
           },
-          headBucket: () => {
-            return {
-              BucketRegion: 'us-east-1',
-            };
-          },
         },
         CloudFormation: {
           describeStacks: describeStacksStub,
@@ -527,16 +523,12 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
           deleteObjects: deleteObjectsStub,
           listObjectsV2: { Contents: [] },
           upload: s3UploadStub,
+          headBucket: {},
           getBucketLocation: () => {
             return {
               LocationConstraint: 'us-east-1',
             };
           },
-          headBucket: () => {
-            return {
-              BucketRegion: 'us-east-1',
-            };
-          },
         },
         CloudFormation: {
           describeStacks: describeStacksStub,
@@ -1214,9 +1206,6 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
         getBucketLocation: () => {
           throw new Error();
         },
-        headBucket: () => {
-          throw new Error();
-        },
       },
       CloudFormation: {
         describeStacks: { Stacks: [{}] },
@@ -1253,11 +1242,6 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
             LocationConstraint: 'us-west-1',
           };
         },
-        headBucket: () => {
-          return {
-            BucketRegion: 'us-west-1',
-          };
-        },
       },
       CloudFormation: {
         describeStacks: { Stacks: [{}] },