index.js

@@ -173,7 +173,4 @@ module.exports = {
     pensieve: {
         credentialUtils: require('./lib/executables/pensieveCreds/utils'),
     },
-    management: {
-        locations: require('./lib/management/locations'),
-    },
 };

lib/management/locations.js

@@ -1,166 +0,0 @@
-const { URL } = require('url');
-
-const { decryptSecret } = require('../executables/pensieveCreds/utils');
-
-/**
- * Load locations from the PENSIEVE collection, including decryption
- * of the credentials
- *
- * @param {object} [locationsOverlay] - mapping of location names to
- * location properties
- * @param {object} [creds] - decryption credentials
- * @param {string} creds.privateKey - private decryption key
- * @param {Logger} log - logger object
- * @return {object} - loaded locations
- */
-function loadLocationsOverlay(locationsOverlay, creds, log) {
-    if (!locationsOverlay) {
-        return {};
-    }
-    const locations = {};
-    Object.keys(locationsOverlay || {}).forEach(k => {
-        const l = locationsOverlay[k];
-        const location = {
-            locationType: l.locationType,
-            objectId: l.objectId,
-            details: {},
-        };
-        let supportsVersioning = false;
-        let pathStyle = process.env.CI_CEPH !== undefined;
-
-        switch (l.locationType) {
-        case 'location-mem-v1':
-            location.type = 'mem';
-            location.details = { supportsVersioning: true };
-            break;
-        case 'location-file-v1':
-            location.type = 'file';
-            location.details = { supportsVersioning: true };
-            break;
-        case 'location-azure-v1':
-            location.type = 'azure';
-            if (l.details.secretKey && l.details.secretKey.length > 0) {
-                location.details = {
-                    bucketMatch: l.details.bucketMatch,
-                    azureStorageEndpoint: l.details.endpoint,
-                    azureStorageAccountName: l.details.accessKey,
-                    azureStorageAccessKey: creds ? decryptSecret(
-                        creds, l.details.secretKey) : l.details.secretKey,
-                    azureContainerName: l.details.bucketName,
-                };
-            }
-            break;
-        case 'location-ceph-radosgw-s3-v1':
-        case 'location-scality-ring-s3-v1':
-            pathStyle = true; // fallthrough
-        case 'location-aws-s3-v1':
-        case 'location-wasabi-v1':
-            supportsVersioning = true; // fallthrough
-        case 'location-do-spaces-v1':
-            location.type = 'aws_s3';
-            if (l.details.secretKey && l.details.secretKey.length > 0) {
-                let https = true;
-                let awsEndpoint = l.details.endpoint ||
-                    's3.amazonaws.com';
-                if (awsEndpoint.includes('://')) {
-                    const url = new URL(awsEndpoint);
-                    awsEndpoint = url.host;
-                    https = url.protocol.includes('https');
-                }
-
-                location.details = {
-                    credentials: {
-                        accessKey: l.details.accessKey,
-                        secretKey: creds ? decryptSecret(
-                            creds, l.details.secretKey) : l.details.secretKey,
-                    },
-                    bucketName: l.details.bucketName,
-                    bucketMatch: l.details.bucketMatch,
-                    serverSideEncryption:
-                    Boolean(l.details.serverSideEncryption),
-                    region: l.details.region,
-                    awsEndpoint,
-                    supportsVersioning,
-                    pathStyle,
-                    https,
-                };
-            }
-            break;
-        case 'location-gcp-v1':
-            location.type = 'gcp';
-            if (l.details.secretKey && l.details.secretKey.length > 0) {
-                location.details = {
-                    credentials: {
-                        accessKey: l.details.accessKey,
-                        secretKey: creds ? decryptSecret(
-                            creds, l.details.secretKey) : l.details.secretKey,
-                    },
-                    bucketName: l.details.bucketName,
-                    mpuBucketName: l.details.mpuBucketName,
-                    bucketMatch: l.details.bucketMatch,
-                    gcpEndpoint: l.details.endpoint ||
-                        'storage.googleapis.com',
-                    https: true,
-                };
-            }
-            break;
-        case 'location-scality-sproxyd-v1':
-            location.type = 'scality';
-            if (l.details && l.details.bootstrapList &&
-                l.details.proxyPath) {
-                location.details = {
-                    supportsVersioning: true,
-                    connector: {
-                        sproxyd: {
-                            chordCos: l.details.chordCos || null,
-                            bootstrap: l.details.bootstrapList,
-                            path: l.details.proxyPath,
-                        },
-                    },
-                };
-            }
-            break;
-        case 'location-nfs-mount-v1':
-            location.type = 'pfs';
-            if (l.details) {
-                location.details = {
-                    supportsVersioning: true,
-                    bucketMatch: true,
-                    pfsDaemonEndpoint: {
-                        host: `${l.name}-cosmos-pfsd`,
-                        port: 80,
-                    },
-                };
-            }
-            break;
-        case 'location-scality-hdclient-v2':
-            location.type = 'scality';
-            if (l.details && l.details.bootstrapList) {
-                location.details = {
-                    supportsVersioning: true,
-                    connector: {
-                        hdclient: {
-                            bootstrap: l.details.bootstrapList,
-                        },
-                    },
-                };
-            }
-            break;
-        default:
-            log.info('unknown location type', {
-                locationType: l.locationType,
-            });
-            return undefined;
-        }
-        location.sizeLimitGB = l.sizeLimitGB || null;
-        location.isTransient = Boolean(l.isTransient);
-        location.legacyAwsBehavior = Boolean(l.legacyAwsBehavior);
-        locations[l.name] = location;
-        return undefined;
-    });
-    return locations;
-}
-
-module.exports = {
-    loadLocationsOverlay,
-};

lib/storage/data/external/AwsClient.js

@@ -178,9 +178,6 @@ class AwsClient {
               { responseHeaders: response.httpResponse.headers,
                 backendType: this.clientType });
         });
-        if (!callback) {
-            return request;
-        }
         const stream = request.createReadStream().on('error', err => {
             let logLevel;
             let retError;