From 621bef4bff2e82bdfe4e2546e1f0542b95845ff4 Mon Sep 17 00:00:00 2001
From: Thomas Prelot <tprelot@gmail.com>
Date: Tue, 7 Jul 2020 14:44:41 +0200
Subject: [PATCH 1/2] fix: Deploy bucket in configured location

---
 package/lib/prepareDeployment.js      |  9 +++++++--
 package/lib/prepareDeployment.test.js | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/package/lib/prepareDeployment.js b/package/lib/prepareDeployment.js
index d116671..0c07593 100644
--- a/package/lib/prepareDeployment.js
+++ b/package/lib/prepareDeployment.js
@@ -18,7 +18,8 @@ module.exports = {
     const bucket = deploymentTemplate.resources.find(findDeploymentBucket);
 
     const name = this.serverless.service.provider.deploymentBucketName;
-    const updatedBucket = updateBucketName(bucket, name);
+    const location = this.serverless.service.provider.region;
+    const updatedBucket = updateBucket(bucket, name, location);
 
     const bucketIndex = deploymentTemplate.resources.findIndex(findDeploymentBucket);
 
@@ -30,9 +31,13 @@ module.exports = {
   },
 };
 
-const updateBucketName = (bucket, name) => {
+const updateBucket = (bucket, name, location) => {
   const newBucket = _.cloneDeep(bucket);
   newBucket.name = name;
+  if (location) {
+    newBucket.properties = newBucket.properties || {};
+    newBucket.properties.location = location;
+  }
   return newBucket;
 };
 
diff --git a/package/lib/prepareDeployment.test.js b/package/lib/prepareDeployment.test.js
index 64e955b..bc94353 100644
--- a/package/lib/prepareDeployment.test.js
+++ b/package/lib/prepareDeployment.test.js
@@ -62,5 +62,28 @@ describe('PrepareDeployment', () => {
         );
       });
     });
+
+    it('should use the configured location', () => {
+      serverless.service.provider.region = 'europe-west1';
+
+      const expectedCompiledConfiguration = {
+        resources: [
+          {
+            type: 'storage.v1.bucket',
+            name: 'sls-my-service-dev-12345678',
+            properties: {
+              location: 'europe-west1',
+            },
+          },
+        ],
+      };
+
+      return googlePackage.prepareDeployment().then(() => {
+        expect(readFileSyncStub.calledOnce).toEqual(true);
+        expect(serverless.service.provider.compiledConfigurationTemplate).toEqual(
+          expectedCompiledConfiguration
+        );
+      });
+    });
   });
 });

From bce0b58a514c16680d4100d042fc43ef7c0c6513 Mon Sep 17 00:00:00 2001
From: Thomas Prelot <tprelot@gmail.com>
Date: Tue, 7 Jul 2020 16:26:35 +0200
Subject: [PATCH 2/2] review: Upgrade style

---
 package/lib/prepareDeployment.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lib/prepareDeployment.js b/package/lib/prepareDeployment.js
index 0c07593..2287807 100644
--- a/package/lib/prepareDeployment.js
+++ b/package/lib/prepareDeployment.js
@@ -35,7 +35,7 @@ const updateBucket = (bucket, name, location) => {
   const newBucket = _.cloneDeep(bucket);
   newBucket.name = name;
   if (location) {
-    newBucket.properties = newBucket.properties || {};
+    if (!newBucket.properties) newBucket.properties = {};
     newBucket.properties.location = location;
   }
   return newBucket;