Revert "Disable utapi"

This reverts commit 5343e89.
Issue : CLDSRV-610

Author: benzekrimaha

lib/Config.js

@@ -20,11 +20,7 @@ const {
     allowedUtapiEventFilterStates,
     supportedLifecycleRules,
 } = require('../constants');
-
-// TODO CLDSRV-610: re-enable utapi
-// const { utapiVersion } = require('utapi');
-const utapiVersion = null;
-
+const { utapiVersion } = require('utapi');
 const { scaleMsPerDay } = s3middleware.objectUtils;
 
 const constants = require('../constants');

lib/utapi/utapi.js

@@ -1,12 +1,9 @@
 require('werelogs').stderrUtils.catchAndTimestampStderr();
 const _config = require('../Config').config;
-// TODO CLDSRV-610 re-enable utapi
-/* eslint-disable */
-// const { utapiVersion, UtapiServer: utapiServer } = require('utapi');
+const { utapiVersion, UtapiServer: utapiServer } = require('utapi');
 
 // start utapi server
-// TODO CLDSRV-610 re-enable utapi
-if (utapiVersion === 1 && _config.utapi && false) {
+if (utapiVersion === 1 && _config.utapi) {
     const fullConfig = Object.assign({}, _config.utapi,
         { redis: _config.redis });
     if (_config.vaultd) {

lib/utapi/utapiReindex.js

@@ -1,16 +1,11 @@
 require('werelogs').stderrUtils.catchAndTimestampStderr();
-// TODO CLDSRV-610 re-enable utapi
-/* eslint-disable */
-// const UtapiReindex = require('utapi').UtapiReindex;
+const UtapiReindex = require('utapi').UtapiReindex;
 const { config } = require('../Config');
 
-// TODO CLDSRV-610 re-enable utapi
-if (false) {
-    const reindexConfig = config.utapi && config.utapi.reindex;
-    if (reindexConfig && reindexConfig.password === undefined) {
-        reindexConfig.password = config.utapi && config.utapi.redis
-        && config.utapi.redis.password;
-    }
-    const reindex = new UtapiReindex(reindexConfig);
-    reindex.start();    
+const reindexConfig = config.utapi && config.utapi.reindex;
+if (reindexConfig && reindexConfig.password === undefined) {
+    reindexConfig.password = config.utapi && config.utapi.redis
+    && config.utapi.redis.password;
 }
+const reindex = new UtapiReindex(reindexConfig);
+reindex.start();

lib/utapi/utapiReplay.js

@@ -1,13 +1,8 @@
 require('werelogs').stderrUtils.catchAndTimestampStderr();
-// TODO CLDSRV-610 re-enable utapi
-/* eslint-disable */
-// const UtapiReplay = require('utapi').UtapiReplay;
+const UtapiReplay = require('utapi').UtapiReplay;
 const _config = require('../Config').config;
 
-// TODO CLDSRV-610 re-enable utapi
-if (false) {
-    const utapiConfig = _config.utapi &&
-        Object.assign({}, _config.utapi, { redis: _config.redis });
-    const replay = new UtapiReplay(utapiConfig); // start utapi server
-    replay.start();
-}
+const utapiConfig = _config.utapi &&
+    Object.assign({}, _config.utapi, { redis: _config.redis });
+const replay = new UtapiReplay(utapiConfig); // start utapi server
+replay.start();

lib/utapi/utilities.js

@@ -2,30 +2,27 @@ const http = require('http');
 const https = require('https');
 const commander = require('commander');
 const { auth } = require('arsenal');
-// TODO CLDSRV-610 re-enable utapi
-/* eslint-disable */
-// const { UtapiClient, utapiVersion } = require('utapi');
+const { UtapiClient, utapiVersion } = require('utapi');
 const logger = require('../utilities/logger');
 const _config = require('../Config').config;
 const { suppressedUtapiEventFields: suppressedEventFields } = require('../../constants');
 // setup utapi client
 let utapiConfig;
 
-// TODO CLDSRV-610 re-enable utapi
-// if (utapiVersion === 1 && _config.utapi) {
-//     if (_config.utapi.redis === undefined) {
-//         utapiConfig = Object.assign({}, _config.utapi, { redis: _config.redis });
-//     } else {
-//         utapiConfig = Object.assign({}, _config.utapi);
-//     }
-// } else if (utapiVersion === 2) {
-//     utapiConfig = Object.assign({
-//         tls: _config.https,
-//         suppressedEventFields,
-//     }, _config.utapi || {});
-// }
+if (utapiVersion === 1 && _config.utapi) {
+    if (_config.utapi.redis === undefined) {
+        utapiConfig = Object.assign({}, _config.utapi, { redis: _config.redis });
+    } else {
+        utapiConfig = Object.assign({}, _config.utapi);
+    }
+} else if (utapiVersion === 2) {
+    utapiConfig = Object.assign({
+        tls: _config.https,
+        suppressedEventFields,
+    }, _config.utapi || {});
+}
 
-// const utapi = new UtapiClient(utapiConfig);
+const utapi = new UtapiClient(utapiConfig);
 
 const bucketOwnerMetrics = [
     'completeMultipartUpload',
@@ -260,8 +257,6 @@ function listMetrics(metricType) {
  * filtered out and not pushed to utapi.
  */
 function pushMetric(action, log, metricObj) {
-    // TODO CLDSRV-610 re-enable utapi
-    return;
     const {
         bucket,
         keys,
@@ -360,8 +355,6 @@ function pushMetric(action, log, metricObj) {
  * @return {string} - location unique ID
  */
 function _getLocationId(location) {
-    // TODO CLDSRV-610 re-enable utapi
-    return;
     return _config.locationConstraints[location].objectId;
 }
 
@@ -374,8 +367,6 @@ function _getLocationId(location) {
  * @return {function} - `utapi.getLocationMetric`
  */
 function getLocationMetric(location, log, cb) {
-    // TODO CLDSRV-610 re-enable utapi
-    return;
     const locationId = _getLocationId(location);
     return utapi.getLocationMetric(locationId, log.getSerializedUids(), cb);
 }
@@ -390,8 +381,6 @@ function getLocationMetric(location, log, cb) {
  * @return {function} - `utapi.pushLocationMetric`
  */
 function pushLocationMetric(location, byteLength, log, cb) {
-    // TODO CLDSRV-610 re-enable utapi
-    return;
     const locationId = _getLocationId(location);
     return utapi.pushLocationMetric(locationId, byteLength,
         log.getSerializedUids(), cb);

tests/unit/Config.js

@@ -536,8 +536,7 @@ describe('Config', () => {
             process.env.S3_CONFIG_FILE = oldConfig;
         });
 
-        // TODO CLDSRV-610 re-enable utapi
-        it.skip('should set up utapi local cache', () => {
+        it('should set up utapi local cache', () => {
             const { ConfigObject } = require('../../lib/Config');
             const config = new ConfigObject();
 
@@ -551,8 +550,7 @@ describe('Config', () => {
             );
         });
 
-        // TODO CLDSRV-610 re-enable utapi
-        it.skip('should set up utapi redis', () => {
+        it('should set up utapi redis', () => {
             const { ConfigObject } = require('../../lib/Config');
             const config = new ConfigObject();
 

tests/utapi/utilities.js

@@ -480,8 +480,7 @@ const testEvents = [{
     },
 }];
 
-// TODO CLDSRV-610 re-enable utapi
-describe.skip('utapi v2 pushmetrics utility', () => {
+describe('utapi v2 pushmetrics utility', () => {
     const log = new werelogs.Logger('utapi-utility');
     const { UtapiClient, utapiVersion } = require('utapi');
     let pushMetric;