update bucket policy with cloudfront access

Author: danielcondemarin

__mocks__/aws-sdk.js

@@ -24,12 +24,18 @@ const mockCreateCloudFrontOriginAccessIdentityPromise = promisifyMock(
   mockCreateCloudFrontOriginAccessIdentity
 )
 
+const mockPutBucketPolicy = jest.fn()
+const mockPutBucketPolicyPromise = promisifyMock(mockPutBucketPolicy)
+
 module.exports = {
   mockCreateDistribution,
   mockUpdateDistribution,
   mockGetDistributionConfig,
   mockDeleteDistribution,
   mockCreateCloudFrontOriginAccessIdentity,
+  mockPutBucketPolicy,
+
+  mockPutBucketPolicyPromise,
   mockCreateDistributionPromise,
   mockUpdateDistributionPromise,
   mockGetDistributionConfigPromise,
@@ -42,5 +48,9 @@ module.exports = {
     getDistributionConfig: mockGetDistributionConfig,
     deleteDistribution: mockDeleteDistribution,
     createCloudFrontOriginAccessIdentity: mockCreateCloudFrontOriginAccessIdentity
+  })),
+
+  S3: jest.fn(() => ({
+    putBucketPolicy: mockPutBucketPolicy
   }))
 }

__tests__/__snapshots__/s3-origin.test.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Input origin as an S3 bucket url creates distribution configured to serve private S3 content 1`] = `
+exports[`S3 origins When origin is an S3 URL only accessible via CloudFront creates distribution 1`] = `
 Object {
   "DistributionConfig": Object {
     "Aliases": Object {
@@ -80,7 +80,7 @@ Object {
 }
 `;
 
-exports[`Input origin as an S3 bucket url creates distribution with S3 origin 1`] = `
+exports[`S3 origins When origin is an S3 URL only accessible via CloudFront updates distribution 1`] = `
 Object {
   "DistributionConfig": Object {
     "Aliases": Object {
@@ -149,7 +149,7 @@ Object {
           "Id": "mybucket",
           "OriginPath": "",
           "S3OriginConfig": Object {
-            "OriginAccessIdentity": "",
+            "OriginAccessIdentity": "origin-access-identity/cloudfront/access-identity-xyz",
           },
         },
       ],
@@ -160,9 +160,15 @@ Object {
 }
 `;
 
-exports[`Input origin as an S3 bucket url updates distribution 1`] = `
+exports[`S3 origins When origin is an S3 bucket URL creates distribution 1`] = `
 Object {
   "DistributionConfig": Object {
+    "Aliases": Object {
+      "Items": Array [],
+      "Quantity": 0,
+    },
+    "CallerReference": "1566599541192",
+    "Comment": "",
     "DefaultCacheBehavior": Object {
       "AllowedMethods": Object {
         "CachedMethods": Object {
@@ -202,7 +208,7 @@ Object {
       "MaxTTL": 31536000,
       "MinTTL": 0,
       "SmoothStreaming": false,
-      "TargetOriginId": "anotherbucket",
+      "TargetOriginId": "mybucket",
       "TrustedSigners": Object {
         "Enabled": false,
         "Items": Array [],
@@ -211,15 +217,16 @@ Object {
       "ViewerProtocolPolicy": "redirect-to-https",
     },
     "Enabled": true,
+    "HttpVersion": "http2",
     "Origins": Object {
       "Items": Array [
         Object {
           "CustomHeaders": Object {
             "Items": Array [],
             "Quantity": 0,
           },
-          "DomainName": "anotherbucket.s3.amazonaws.com",
-          "Id": "anotherbucket",
+          "DomainName": "mybucket.s3.amazonaws.com",
+          "Id": "mybucket",
           "OriginPath": "",
           "S3OriginConfig": Object {
             "OriginAccessIdentity": "",
@@ -228,21 +235,14 @@ Object {
       ],
       "Quantity": 1,
     },
+    "PriceClass": "PriceClass_All",
   },
-  "Id": "distributionwithS3origin",
-  "IfMatch": "etag",
 }
 `;
 
-exports[`Input origin as an S3 bucket url updates distribution configured to serve private S3 content 1`] = `
+exports[`S3 origins When origin is an S3 bucket URL updates distribution 1`] = `
 Object {
   "DistributionConfig": Object {
-    "Aliases": Object {
-      "Items": Array [],
-      "Quantity": 0,
-    },
-    "CallerReference": "1566599541192",
-    "Comment": "",
     "DefaultCacheBehavior": Object {
       "AllowedMethods": Object {
         "CachedMethods": Object {
@@ -282,7 +282,7 @@ Object {
       "MaxTTL": 31536000,
       "MinTTL": 0,
       "SmoothStreaming": false,
-      "TargetOriginId": "mybucket",
+      "TargetOriginId": "anotherbucket",
       "TrustedSigners": Object {
         "Enabled": false,
         "Items": Array [],
@@ -291,25 +291,25 @@ Object {
       "ViewerProtocolPolicy": "redirect-to-https",
     },
     "Enabled": true,
-    "HttpVersion": "http2",
     "Origins": Object {
       "Items": Array [
         Object {
           "CustomHeaders": Object {
             "Items": Array [],
             "Quantity": 0,
           },
-          "DomainName": "mybucket.s3.amazonaws.com",
-          "Id": "mybucket",
+          "DomainName": "anotherbucket.s3.amazonaws.com",
+          "Id": "anotherbucket",
           "OriginPath": "",
           "S3OriginConfig": Object {
-            "OriginAccessIdentity": "origin-access-identity/cloudfront/access-identity-xyz",
+            "OriginAccessIdentity": "",
           },
         },
       ],
       "Quantity": 1,
     },
-    "PriceClass": "PriceClass_All",
   },
+  "Id": "distributionwithS3origin",
+  "IfMatch": "etag",
 }
 `;