Remove default behaviour of selecting the first cold location on expi…

…ration of cold objects We don’t need this logic anymore as sorbet always sets the location name and this might introduce unwanted behaviours when having multiple locations Issue: BB-417
scality · Oct 20, 2023 · 2201733 · 2201733
1 parent 726be8e
commit 2201733
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/extensions/lifecycle/tasks/LifecycleUpdateExpirationTask.js b/extensions/lifecycle/tasks/LifecycleUpdateExpirationTask.js
@@ -4,7 +4,6 @@ const { errors } = require('arsenal');
 const ObjectMD = require('arsenal').models.ObjectMD;
 const BackbeatTask = require('../../../lib/tasks/BackbeatTask');
 const ActionQueueEntry = require('../../../lib/models/ActionQueueEntry');
-const locations = require('../../../conf/locationConfig.json') || {};
 
 class LifecycleUpdateExpirationTask extends BackbeatTask {
     /**
@@ -146,10 +145,15 @@ class LifecycleUpdateExpirationTask extends BackbeatTask {
         async.waterfall([
             next => this._getMetadata(entry, log, next),
             (objMD, next) => {
-                const coldLocation = entry.getAttribute('target.location') ||
-                    // If location not specified, use the first (and only) location
-                    // This is a temporary fix, until Sorbet is fixed to provide the information
-                    Object.keys(locations).find(name => locations[name].isCold);
+                const coldLocation = entry.getAttribute('target.location');
+                if (!coldLocation) {
+                    // this should never happen as sorbet always sets the location attribute
+                    log.error('missing target location', {
+                        entry: entry.getLogInfo(),
+                        method: 'LifecycleUpdateExpirationTask.processActionEntry',
+                    });
+                    return next(errors.MissingParameter.customizeDescription('missing target location'));
+                }
 
                 const archive = objMD.getArchive();
 

diff --git a/tests/unit/lifecycle/LifecycleUpdateExpirationTask.spec.js b/tests/unit/lifecycle/LifecycleUpdateExpirationTask.spec.js
@@ -124,4 +124,28 @@ describe('LifecycleUpdateExpirationTask', () => {
             done();
         });
     });
+
+    it.only('should throw an error when location is not specified', done => {
+        const mdObj = new ObjectMD();
+        backbeatMetadataProxyClient.setMdObj(mdObj);
+        const invalidActionEntry = ActionQueueEntry.create('deleteObject')
+            .setAttribute('target', {
+                owner: 'eab6642741045d0ae7cb3333962ad56f847ce0d9bb73de98eb4959428fc28108',
+                bucket: 'somebucket',
+                key: 'somekey',
+                accountId: '871467171849',
+            })
+            .setAttribute('details', {
+                lastModified: '2023-06-02T12:50:57.016Z',
+            })
+            .addContext('details', {
+                origin: 'lifecycle',
+                ruleType: 'expiration',
+                reqId: '8b902aef7346801d99fc',
+            });
+        task.processActionEntry(invalidActionEntry, err => {
+            assert(err.is.MissingParameter);
+            done();
+        });
+    });
 });