Implement object merge logic for updateBucket

By mixing in both the existing data as well as the incoming patch data,
we can check if the new combination still yields a valid and reachable
bucket.

Signed-off-by: Jeremy Ho <jujaga@gmail.com>

Author: jujaga

app/src/controllers/bucket.js

@@ -215,13 +215,17 @@ const controller = {
    * @returns {function} Express middleware function
    */
   async updateBucket(req, res, next) {
-    // Check for credential accessibility/validity first
-    await controller._validateCredentials(req.body, res);
-
     try {
+      const bucketId = addDashesToUuid(req.params.bucketId);
+      const currentBucket = await bucketService.read(bucketId);
+
+      // Check for credential accessibility/validity first
+      // Need to cross reference with existing data when partial patch data is provided
+      await controller._validateCredentials({ ...currentBucket, ...req.body });
+
       const userId = await userService.getCurrentUserId(getCurrentIdentity(req.currentUser, SYSTEM_USER), SYSTEM_USER);
       const response = await bucketService.update({
-        bucketId: req.params.bucketId,
+        bucketId: bucketId,
         bucketName: req.body.bucketName,
         accessKeyId: req.body.accessKeyId,
         bucket: req.body.bucket,

app/tests/unit/controllers/bucket.spec.js

@@ -107,7 +107,7 @@ describe('createBucket', () => {
     );
   });
 
-  it('excepts if invalid bucket head', async () => {
+  it('responds with error when invalid bucket head', async () => {
     // request object
     const req = {
       body: { bucket: REQUEST_BUCKET, region: 'test' },
@@ -126,13 +126,15 @@ describe('createBucket', () => {
       throw new Error();
     });
 
-    await expect(controller.createBucket(req, res, next)).rejects.toThrow();
+    await controller.createBucket(req, res, next);
 
     expect(headBucketSpy).toHaveBeenCalledTimes(1);
     expect(headBucketSpy).toHaveBeenCalledWith(req.body);
     expect(getCurrentIdentitySpy).toHaveBeenCalledTimes(0);
     expect(getCurrentUserIdSpy).toHaveBeenCalledTimes(0);
     expect(createSpy).toHaveBeenCalledTimes(0);
+    expect(next).toHaveBeenCalledTimes(1);
+    expect(next).toHaveBeenCalledWith(expect.any(Problem));
   });
 
   it('nexts an error if the bucket service fails to create', async () => {
@@ -167,7 +169,7 @@ describe('createBucket', () => {
     expect(getCurrentUserIdSpy).toHaveBeenCalledWith(USR_IDENTITY);
     expect(createSpy).toHaveBeenCalledTimes(1);
     expect(createSpy).toHaveBeenCalledWith({ ...req.body, userId: USR_ID });
-    
+
     expect(next).toHaveBeenCalledTimes(1);
     expect(next).toHaveBeenCalledWith(
       new Problem(502, 'Unknown BucketService Error')
@@ -213,7 +215,7 @@ describe('createBucket', () => {
     expect(createSpy).toHaveBeenCalledWith({ ...req.body, userId: USR_ID });
     expect(checkGrantPermissionsSpy).toHaveBeenCalledTimes(1);
     expect(checkGrantPermissionsSpy).toHaveBeenCalledWith({ ...req.body, userId: USR_ID });
-    
+
     expect(res.status).toHaveBeenCalledWith(201);
   });
 });