Merge pull request #327 from sleavitt/fixes_for_s3_mappings

Fixes for s3 mappings
iann0036 · Jun 5, 2023 · e81287a · e81287a
2 parents 119e0dc + 9f6c7cf
commit e81287a
Showing 1 changed file with 34 additions and 13 deletions.
diff --git a/js/services/s3.js b/js/services/s3.js
@@ -1085,6 +1085,18 @@ service_mapping_functions.push(function(reqParams, obj, tracked_resources){
                 });
             });
         }
+        if (obj.data.IntelligentTieringConfiguration) {
+            reqParams.cfn['IntelligentTieringConfiguration'] = [];
+            obj.data.IntelligentTieringConfiguration.forEach(itconfig => {
+                reqParams.cfn['IntelligentTieringConfiguration'].push({
+                    'Id': itconfig.Id,
+                    'Prefix': (itconfig.Filter ? itconfig.Filter.Prefix : null),
+                    'Status': itconfig.Status,
+                    'TagFilters': (itconfig.Filter ? itconfig.Filter.Tag : null),
+                    'Tierings': itconfig.Tierings
+                });
+            });
+        }
         if (obj.data.InventoryConfigurations && obj.data.InventoryConfigurations.InventoryConfigurationList) {
             reqParams.cfn['InventoryConfigurations'] = [];
             obj.data.InventoryConfigurations.InventoryConfigurationList.forEach(config => {
@@ -1130,23 +1142,32 @@ service_mapping_functions.push(function(reqParams, obj, tracked_resources){
                 });
             });
         }
-        reqParams.cfn['ObjectLockConfiguration'] = obj.data.ObjectLockConfiguration;
-        reqParams.cfn['OwnershipControls'] = obj.data.OwnershipControls;
-        if (obj.data.OwnershipControls) {
-            reqParams.cfn['OwnershipControls'] = [];
-            obj.data.OwnershipControls.forEach(itconfig => {
-                reqParams.cfn['OwnershipControls'].push({
-                    'Id': itconfig.Id,
-                    'Prefix': (itconfig.Filter ? itconfig.Filter.Prefix : null),
-                    'Status': itconfig.Status,
-                    'TagFilters': (itconfig.Filter ? itconfig.Filter.Tag : null),
-                    'Tierings': itconfig.Tierings
+        if (obj.data.ObjectLockConfiguration) {
+            reqParams.cfn['ObjectLockConfiguration'] = obj.data.ObjectLockConfiguration;
+        }
+        if (obj.data.OwnershipControls && obj.data.OwnershipControls.Rules) {
+            var ownershipcontrolsrules = [];
+            obj.data.OwnershipControls.Rules.forEach(occonfig => {
+                ownershipcontrolsrules.push({
+                    'ObjectOwnership': occonfig.ObjectOwnership
                 });
             });
+            reqParams.cfn['OwnershipControls'] = {
+                'Rules': ownershipcontrolsrules
+            };
         }
 
-        reqParams.cfn['PublicAccessBlockConfiguration'] = obj.data.PublicAccessBlockConfiguration;
-        reqParams.cfn['Tags'] = obj.data.Tags;
+        if (obj.data.PublicAccessBlockConfiguration) {
+            reqParams.cfn['PublicAccessBlockConfiguration'] = {
+                'BlockPublicAcls': obj.data.PublicAccessBlockConfiguration.BlockPublicAcls,
+                'BlockPublicPolicy': obj.data.PublicAccessBlockConfiguration.BlockPublicPolicy,
+                'IgnorePublicAcls': obj.data.PublicAccessBlockConfiguration.IgnorePublicAcls,
+                'RestrictPublicBuckets': obj.data.PublicAccessBlockConfiguration.RestrictPublicBuckets
+            };
+        }
+        if (obj.data.Tags) {
+            reqParams.cfn['Tags'] = obj.data.Tags;
+        }
 
         tracked_resources.push({
             'obj': obj,