Merge pull request #8265 from dannyzaken/danny-5.16

[Backport to 5.16] moved upgrade script of upgrade_bucket_policy to 5.15.6 dir
noobaa · Aug 28, 2024 · a15bf2d · a15bf2d
2 parents 7264179 + 400e3aa
commit a15bf2d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/src/test/unit_tests/test_upgrade_scripts.js b/src/test/unit_tests/test_upgrade_scripts.js
@@ -9,7 +9,7 @@ const { S3 } = require('@aws-sdk/client-s3');
 const { NodeHttpHandler } = require("@smithy/node-http-handler");
 const http = require('http');
 const system_store = require('../../server/system_services/system_store').get_instance();
-const upgrade_bucket_policy = require('../../upgrade/upgrade_scripts/5.14.0/upgrade_bucket_policy');
+const upgrade_bucket_policy = require('../../upgrade/upgrade_scripts/5.15.6/upgrade_bucket_policy');
 const dbg = require('../../util/debug_module')(__filename);
 const assert = require('assert');
 const mocha = require('mocha');
@@ -21,7 +21,7 @@ let s3;
 async function _clean_all_bucket_policies() {
     for (const bucket of system_store.data.buckets) {
         if (bucket.s3_policy) {
-            await s3.deleteBucketPolicy({Bucket: bucket.name.unwrap()});
+            await s3.deleteBucketPolicy({ Bucket: bucket.name.unwrap() });
         }
     }
 }
@@ -50,8 +50,7 @@ mocha.describe('test upgrade scripts', async function() {
     mocha.it('test upgrade bucket policy to version 5.14.0', async function() {
         const old_policy = {
             version: '2012-10-17',
-            statement: [
-                {
+            statement: [{
                     sid: 'id-1',
                     effect: 'allow',
                     principal: ["*"],
@@ -79,7 +78,7 @@ mocha.describe('test upgrade scripts', async function() {
             }
         });
 
-        await upgrade_bucket_policy.run({dbg, system_store, system_server: null});
+        await upgrade_bucket_policy.run({ dbg, system_store, system_server: null });
         const res = await s3.getBucketPolicy({ // should work - bucket policy should fit current schema
             Bucket: BKT,
         });

diff --git a/...e_scripts/5.14.0/upgrade_bucket_policy.js → ...e_scripts/5.15.6/upgrade_bucket_policy.js b/...e_scripts/5.14.0/upgrade_bucket_policy.js → ...e_scripts/5.15.6/upgrade_bucket_policy.js
@@ -3,6 +3,8 @@
 
 const util = require('util');
 const { OP_NAME_TO_ACTION } = require('../../../endpoint/s3/s3_bucket_policy_utils');
+const _ = require('lodash');
+
 
 function _create_actions_map() {
     const actions_map = new Map();
@@ -26,20 +28,22 @@ async function run({ dbg, system_store, system_server }) {
             //Do not update if there are no bucket policy.
             if (!bucket.s3_policy) continue;
 
-            const new_policy = {};
-            if (bucket.s3_policy.version) new_policy.Version = bucket.s3_policy.version;
-
-            new_policy.Statement = bucket.s3_policy.statement.map(statement => ({
-                Effect: statement.effect === 'allow' ? 'Allow' : 'Deny',
-                Action: statement.action.map(action => actions_map.get(action)),
-                Principal: { AWS: statement.principal },
-                Resource: statement.resource,
-                Sid: statement.sid
-            }));
-            buckets.push({
-                _id: bucket._id,
-                s3_policy: new_policy,
-            });
+
+            if (_.isUndefined(bucket.s3_policy.Statement)) {
+                const new_policy = {};
+                if (bucket.s3_policy.version) new_policy.Version = bucket.s3_policy.version;
+                new_policy.Statement = bucket.s3_policy.statement.map(statement => ({
+                    Effect: statement.effect === 'allow' ? 'Allow' : 'Deny',
+                    Action: statement.action.map(action => actions_map.get(action)),
+                    Principal: { AWS: statement.principal },
+                    Resource: statement.resource,
+                    Sid: statement.sid
+                }));
+                buckets.push({
+                    _id: bucket._id,
+                    s3_policy: new_policy,
+                });
+            }
         }
 
         if (buckets.length > 0) {