bucket notifications - facilitate notif conf to override connection

Signed-off-by: Amit Prinz Setter <[email protected]>

Author: alphaprinz

src/test/unit_tests/test_notifications.js

@@ -36,7 +36,7 @@ const http_connect_path = path.join(tmp_connect, http_connect_filename);
 //content of connect file, will be written to a file in before()
 const http_connect = {
     agent_request_object: {"host": "localhost", "port": 9998, "timeout": 1500},
-    request_options_object: {"auth": "amit:passw", "timeout": 1500},
+    request_options_object: {"auth": "amit:passw", "timeout": 1500, "path": "/default"},
     notification_protocol: 'http',
     name: 'http_notif'
 };
@@ -55,6 +55,7 @@ let expected_event_name;
 let expected_key;
 let expected_eTag;
 let expect_test;
+let expected_url;
 
 // eslint-disable-next-line max-lines-per-function
 mocha.describe('notifications', function() {
@@ -95,6 +96,7 @@ mocha.describe('notifications', function() {
                     assert.strictEqual(notif.Records[0].Event, "s3:TestEvent", 'wrong event name in notification');
                     expect_test = false;
                 } else {
+                    assert.strictEqual(req.url, expected_url);
                     assert.strictEqual(notif.Records[0].s3.bucket.name, expected_bucket, 'wrong bucket name in notification');
                     assert.strictEqual(notif.Records[0].eventName, expected_event_name, 'wrong event name in notification');
                     assert.strictEqual(notif.Records[0].s3.object.key, expected_key, 'wrong key in notification');
@@ -235,18 +237,47 @@ mocha.describe('notifications', function() {
             });
         });
 
+        mocha.it('override connection', async () => {
+            await s3.putBucketNotificationConfiguration({
+                Bucket: bucket,
+                NotificationConfiguration: {
+                    TopicConfigurations: [{
+                        "Id": "system_test_http_no_event_override",
+                        "TopicArn": http_connect_filename + "?" + JSON.stringify({
+                            request_options_object: {path: "/override"}
+                        }),
+                    }],
+                },
+            });
+
+            const res = await s3.putObject({
+                Bucket: bucket,
+                Key: 'f1',
+                Body: 'this is the body',
+            });
+
+            await notify_await_result({
+                bucket_name: bucket,
+                event_name: 'ObjectCreated:Put',
+                key: "f1",
+                etag: res.ETag,
+                url: "/override"
+            });
+        });
+
     });
 
 });
 
 const step_wait = 100;
-async function notify_await_result({bucket_name, event_name, etag, key, timeout = undefined}) {
+async function notify_await_result({bucket_name, event_name, etag, key, url = "/default", timeout = undefined}) {
 
     //remember expected result here so server could compare it to actual result later
     expected_bucket = bucket_name;
     expected_event_name = event_name;
     expected_eTag = etag;
     expected_key = key;
+    expected_url = url;
     server_done = false;
 
     //busy-sync wait for server

src/util/notifications_util.js

@@ -186,15 +186,24 @@ class Notificator {
         }
     }
 
-    async parse_connect_file(connect_filename, decrypt = false) {
+    async parse_connect_file(connect_filename_with_overrides, decrypt = false) {
         let connect;
+        const filename_parts = connect_filename_with_overrides.split('?');
+        const connect_filename_no_overrides = filename_parts[0];
+        const overrides_str = filename_parts[1];
+
         if (this.nc_config_fs) {
-            connect = await this.nc_config_fs.get_connection_by_name(connect_filename);
+            connect = await this.nc_config_fs.get_connection_by_name(connect_filename_no_overrides);
         } else {
-            const filepath = path.join(this.connect_files_dir, connect_filename);
+            const filepath = path.join(this.connect_files_dir, connect_filename_no_overrides);
             const connect_str = fs.readFileSync(filepath, 'utf-8');
             connect = JSON.parse(connect_str);
         }
+        if (overrides_str) {
+            const overrides_obj = JSON.parse(overrides_str);
+            _.merge(connect, overrides_obj);
+            dbg.log2("effective connect =", connect);
+        }
 
         //if connect file is encrypted (and decryption is requested),
         //decrypt the auth field