Merge pull request #324 from dnicolson/add-s3-properties

Add additional S3 properties
iann0036 · May 31, 2023 · ccb72df · ccb72df
2 parents f65ce6a + 6bf0ece
commit ccb72df
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/RESOURCE_COVERAGE.md b/RESOURCE_COVERAGE.md
@@ -16188,7 +16188,11 @@ ObjectLockEnabled: [ ]
 OwnershipControls: [X]
     Rules: [X]
         ObjectOwnership: [X]
-PublicAccessBlockConfiguration: [ ]
+PublicAccessBlockConfiguration: [X]
+    BlockPublicAcls: [X]
+    IgnorePublicAcls: [X]
+    BlockPublicPolicy: [X]
+    RestrictPublicBuckets: [X]
 ReplicationConfiguration: [X]
     Role: [X]
     Rules: [X]

diff --git a/js/services/s3.js b/js/services/s3.js
@@ -526,6 +526,11 @@ async function updateDatatableStorageS3() {
                     Bucket: bucket.Name
                 }, false).then((data) => {
                     bucket['OwnershipControls'] = data.OwnershipControls;
+                }).catch(() => { }),
+                sdkcall("S3", "getPublicAccessBlock", {
+                    Bucket: bucket.Name
+                }, false).then((data) => {
+                    bucket['PublicAccessBlockConfiguration'] = data.PublicAccessBlockConfiguration;
                 }).catch(() => { })
             ]).then(async () => {
                 $('#section-storage-s3-buckets-datatable').deferredBootstrapTable('append', [{
@@ -1140,14 +1145,8 @@ service_mapping_functions.push(function(reqParams, obj, tracked_resources){
             });
         }
 
-        /*
-        TODO:
-        AccessControl: String
-        PublicAccessBlockConfiguration: 
-            PublicAccessBlockConfiguration
-        Tags:
-            - Resource Tag
-        */
+        reqParams.cfn['PublicAccessBlockConfiguration'] = obj.data.PublicAccessBlockConfiguration;
+        reqParams.cfn['Tags'] = obj.data.Tags;
 
         tracked_resources.push({
             'obj': obj,