Remove dmf and azure_archive location types

Issue: CLDSRV-624

Author: francoisferrand

constants.js

@@ -130,7 +130,7 @@ const constants = {
         },
     },
     /* eslint-disable camelcase */
-    externalBackends: { aws_s3: true, azure: true, gcp: true, pfs: true, dmf: true, azure_archive: true, tlp: true },
+    externalBackends: { aws_s3: true, azure: true, gcp: true, pfs: true, tlp: true },
     // some of the available data backends  (if called directly rather
     // than through the multiple backend gateway) need a key provided
     // as a string as first parameter of the get/delete methods.

lib/Config.js

@@ -300,103 +300,9 @@ function hdClientLocationConstraintAssert(configHd) {
     return hdclientFields;
 }
 
-function azureArchiveLocationConstraintAssert(locationObj) {
-    const checkedFields = [
-        'azureContainerName',
-        'azureStorageEndpoint',
-    ];
-    if (Object.keys(locationObj.details).length === 0 ||
-        !checkedFields.every(field => field in locationObj.details)) {
-        return;
-    }
-    const {
-        azureContainerName,
-        azureStorageEndpoint,
-    } = locationObj.details;
-    const stringFields = [
-        azureContainerName,
-        azureStorageEndpoint,
-    ];
-    stringFields.forEach(field => {
-        assert(typeof field === 'string',
-            `bad config: ${field} must be a string`);
-    });
-
-    let hasAuthMethod = false;
-    if (locationObj.details.sasToken !== undefined) {
-        assert(typeof locationObj.details.sasToken === 'string',
-            `bad config: ${locationObj.details.sasToken} must be a string`);
-        hasAuthMethod = true;
-    }
-
-    if (locationObj.details.azureStorageAccountName !== undefined &&
-        locationObj.details.azureStorageAccessKey !== undefined) {
-        assert(typeof locationObj.details.azureStorageAccountName === 'string',
-            `bad config: ${locationObj.details.azureStorageAccountName} must be a string`);
-        assert(typeof locationObj.details.azureStorageAccessKey === 'string',
-            `bad config: ${locationObj.details.azureStorageAccessKey} must be a string`);
-        assert(!hasAuthMethod, 'Multiple authentication methods are not allowed');
-        hasAuthMethod = true;
-    }
-
-    if (locationObj.details.tenantId !== undefined &&
-        locationObj.details.clientId !== undefined &&
-        locationObj.details.clientKey !== undefined) {
-        assert(typeof locationObj.details.tenantId === 'string',
-            `bad config: ${locationObj.details.tenantId} must be a string`);
-        assert(typeof locationObj.details.clientId === 'string',
-            `bad config: ${locationObj.details.clientId} must be a string`);
-        assert(typeof locationObj.details.clientKey === 'string',
-            `bad config: ${locationObj.details.clientKey} must be a string`);
-        assert(!hasAuthMethod, 'Multiple authentication methods are not allowed');
-        hasAuthMethod = true;
-    }
-    assert(hasAuthMethod, 'Missing authentication method');
-}
-
-function dmfLocationConstraintAssert(locationObj) {
-    const checkedFields = [
-        'endpoint',
-        'username',
-        'password',
-        'repoId',
-        'nsId',
-    ];
-    if (Object.keys(locationObj.details).length === 0 ||
-        !checkedFields.every(field => field in locationObj.details)) {
-        return;
-    }
-    const {
-        endpoint,
-        username,
-        password,
-        repoId,
-        nsId,
-    } = locationObj.details;
-    const stringFields = [
-        endpoint,
-        username,
-        password,
-        nsId,
-    ];
-    stringFields.forEach(field => {
-        assert(typeof field === 'string',
-            `bad config: ${field} must be a string`);
-    });
-    assert.strictEqual(Array.isArray(repoId), true);
-    repoId.forEach(rId => {
-        assert(typeof rId === 'string',
-            `bad config: ${rId} must be a string`);
-    });
-    assert(repoId.every(
-        r => typeof r === 'string'),
-        'bad config: each repoId must be a string',
-    );
-}
-
 function locationConstraintAssert(locationConstraints) {
     const supportedBackends = [
-        'mem', 'file', 'scality', 'mongodb', 'dmf', 'azure_archive', 'tlp',
+        'mem', 'file', 'scality', 'mongodb', 'tlp',
     ].concat(Object.keys(validExternalBackends));
     assert(typeof locationConstraints === 'object',
         'bad config: locationConstraints must be an object');
@@ -467,6 +373,15 @@ function locationConstraintAssert(locationConstraints) {
             assert(typeof details.credentials.secretKey === 'string',
                 'bad config: credentials must include secretKey as string');
         }
+
+        if (locationConstraints[l].type === 'tlp') {
+            // should have no detail
+            assert(Object.keys(locationConstraints[l].details).length === 0);
+
+            // should be a cold location
+            assert(locationConstraints[l].isCold === true);
+        }
+
         if (process.env.CI_CEPH === 'true') {
             // eslint-disable-next-line no-param-reassign
             locationConstraints[l].details.https = false;
@@ -505,15 +420,6 @@ function locationConstraintAssert(locationConstraints) {
         if (locationConstraints[l].type === 'gcp') {
             gcpLocationConstraintAssert(l, locationConstraints[l]);
         }
-        if (locationConstraints[l].type === 'dmf') {
-            dmfLocationConstraintAssert(locationConstraints[l]);
-        }
-        if (locationConstraints[l].type === 'azure_archive') {
-            azureArchiveLocationConstraintAssert(locationConstraints[l]);
-        }
-        if (locationConstraints[l].type === 'tlp') {
-            assert(Object.keys(locationConstraints[l].details).length === 0);
-        }
         if (locationConstraints[l].type === 'pfs') {
             assert(typeof details.pfsDaemonEndpoint === 'object',
             'bad config: pfsDaemonEndpoint is mandatory and must be an object');
@@ -2009,6 +1915,5 @@ module.exports = {
     bucketNotifAssert,
     azureGetStorageAccountName,
     azureGetLocationCredentials,
-    azureArchiveLocationConstraintAssert,
     parseSupportedLifecycleRules,
 };

locationConfig.json

@@ -96,14 +96,14 @@
         "details": {}
     },
     "location-dmf-v1": {
-        "type": "dmf",
+        "type": "tlp",
         "objectId": "location-dmf-v1",
         "legacyAwsBehavior": false,
         "isCold": true,
         "details": {}
     },
     "location-azure-archive-v1": {
-        "type": "azure_archive",
+        "type": "tlp",
         "objectId": "location-azure-archive-v1",
         "legacyAwsBehavior": false,
         "isCold": true,

tests/locationConfig/locationConfigCeph.json

@@ -258,7 +258,7 @@
         "isTransient": true
     },
     "location-dmf-v1": {
-        "type": "dmf",
+        "type": "tlp",
         "objectId": "location-dmf-v1",
         "legacyAwsBehavior": false,
         "isCold": true,

tests/locationConfig/locationConfigLegacy.json

@@ -180,7 +180,7 @@
         "isTransient": true
     },
     "location-dmf-v1": {
-        "type": "dmf",
+        "type": "tlp",
         "objectId": "location-dmf-v1",
         "legacyAwsBehavior": false,
         "isCold": true,

tests/locationConfig/locationConfigTests.json

@@ -269,16 +269,10 @@
         "isTransient": true
     },
     "location-dmf-v1": {
-        "type": "dmf",
+        "type": "tlp",
         "objectId": "location-dmf-v1",
         "legacyAwsBehavior": false,
         "isCold": true,
-        "details": {
-            "endpoint": "10.0.0.200:24000",
-            "repoId": ["repo1"],
-            "username": "username",
-            "password": "password",
-            "nsId": "nsId"
-        }
+        "details": {}
     }
 }