adapt config require on all files

scality · Sep 18, 2024 · 6345bba · 6345bba
1 parent 1c10fe0
commit 6345bba
Show file tree

Hide file tree

Showing 41 changed files with 72 additions and 72 deletions.
diff --git a/bin/backbeat.js b/bin/backbeat.js
@@ -5,7 +5,7 @@ const werelogs = require('werelogs');
 const runServer = require('../lib/api/BackbeatServer');
 const { initManagement } = require('../lib/management/index');
 const setupIngestionSiteMock = require('../tests/utils/mockIngestionSite');
-const config = require('../lib/Config');
+const { config } = require('../lib/Config');
 const Logger = werelogs.Logger;
 const log = new Logger('BackbeatServer:index');
 

diff --git a/bin/ingestion.js b/bin/ingestion.js
@@ -14,7 +14,7 @@ const { sendSuccess, sendError } = require('arsenal').network.probe.Utils;
 const { reshapeExceptionError } = require('arsenal').errorUtils;
 
 const IngestionPopulator = require('../lib/queuePopulator/IngestionPopulator');
-const config = require('../lib/Config');
+const { config } = require('../lib/Config');
 const { initManagement } = require('../lib/management/index');
 const ZookeeperManager = require('../lib/clients/ZookeeperManager');
 const { zookeeperNamespace, zkStatePath } =

diff --git a/bin/queuePopulator.js b/bin/queuePopulator.js
@@ -3,7 +3,7 @@ const schedule = require('node-schedule');
 
 const werelogs = require('werelogs');
 
-const config = require('../lib/Config');
+const { config } = require('../lib/Config');
 const zkConfig = config.zookeeper;
 const kafkaConfig = config.kafka;
 const extConfigs = config.extensions;

diff --git a/bin/replication.js b/bin/replication.js
@@ -5,7 +5,7 @@ const werelogs = require('werelogs');
 const Logger = werelogs.Logger;
 const { RoundRobin } = require('arsenal').network;
 
-const config = require('../lib/Config');
+const { config } = require('../lib/Config');
 const SetupReplication =
           require('../extensions/replication/utils/SetupReplication');
 const version = require('../package.json').version;

diff --git a/extensions/gc/GarbageCollectorProducer.js b/extensions/gc/GarbageCollectorProducer.js
@@ -3,7 +3,7 @@
 const { Logger } = require('werelogs');
 
 const BackbeatProducer = require('../../lib/BackbeatProducer');
-const config = require('../../lib/Config');
+const { config } = require('../../lib/Config');
 
 class GarbageCollectorProducer {
     /**

diff --git a/extensions/gc/service.js b/extensions/gc/service.js
@@ -13,7 +13,7 @@ const { ZenkoMetrics } = require('arsenal').metrics;
 const GarbageCollector = require('./GarbageCollector');
 const { startProbeServer } = require('../../lib/util/probe');
 const { initManagement } = require('../../lib/management');
-const config = require('../../lib/Config');
+const { config } = require('../../lib/Config');
 
 const kafkaConfig = config.kafka;
 const s3Config = config.s3;

diff --git a/extensions/lifecycle/LifecycleQueuePopulator.js b/extensions/lifecycle/LifecycleQueuePopulator.js
@@ -15,7 +15,7 @@ const LIFEYCLE_POPULATOR_CLIENT_ID = 'lifecycle-populator';
 const METASTORE = '__metastore';
 const VaultClientWrapper = require('../utils/VaultClientWrapper');
 
-const config = require('../../lib/Config');
+const { config } = require('../../lib/Config');
 const {
     coldStorageRestoreAdjustTopicPrefix,
     coldStorageRestoreTopicPrefix,

diff --git a/extensions/lifecycle/bucketProcessor/task.js b/extensions/lifecycle/bucketProcessor/task.js
@@ -15,7 +15,7 @@ const { initManagement } = require('../../../lib/management/index');
 const LifecycleBucketProcessor = require('./LifecycleBucketProcessor');
 const { applyBucketLifecycleWorkflows } = require('../management');
 const { startProbeServer } = require('../../../lib/util/probe');
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 
 const { zookeeper, kafka, extensions, s3, log, queuePopulator } = config;
 const lcConfig = extensions.lifecycle;

diff --git a/extensions/lifecycle/conductor/service.js b/extensions/lifecycle/conductor/service.js
@@ -12,7 +12,7 @@ const { sendSuccess, sendError } = require('arsenal').network.probe.Utils;
 const { ZenkoMetrics } = require('arsenal').metrics;
 
 const LifecycleConductor = require('./LifecycleConductor');
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 const { startProbeServer } = require('../../../lib/util/probe');
 
 const zkConfig = config.zookeeper;

diff --git a/extensions/lifecycle/management.js b/extensions/lifecycle/management.js
@@ -1,7 +1,7 @@
 const AWS = require('aws-sdk');
 const werelogs = require('werelogs');
 
-const config = require('../../lib/Config');
+const  { config } = require('../../lib/Config');
 const management = require('../../lib/management/index');
 const { TIMEOUT_MS } = require('../../lib/clients/utils');
 

diff --git a/extensions/lifecycle/objectProcessor/task.js b/extensions/lifecycle/objectProcessor/task.js
@@ -15,7 +15,7 @@ const { initManagement } = require('../../../lib/management/index');
 const LifecycleObjectExpirationProcessor = require('./LifecycleObjectExpirationProcessor');
 const LifecycleObjectTransitionProcessor = require('./LifecycleObjectTransitionProcessor');
 const { startProbeServer } = require('../../../lib/util/probe');
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 
 const zkConfig = config.zookeeper;
 const kafkaConfig = config.kafka;

diff --git a/extensions/lifecycle/tasks/LifecycleTask.js b/extensions/lifecycle/tasks/LifecycleTask.js
@@ -10,7 +10,7 @@ const {
 } = require('arsenal').s3middleware.lifecycleHelpers;
 const { CompareResult, MinHeap } = require('arsenal').algorithms.Heap;
 
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 const { attachReqUids } = require('../../../lib/clients/utils');
 const BackbeatTask = require('../../../lib/tasks/BackbeatTask');
 const ActionQueueEntry = require('../../../lib/models/ActionQueueEntry');

diff --git a/extensions/mongoProcessor/MongoQueueProcessor.js b/extensions/mongoProcessor/MongoQueueProcessor.js
@@ -10,7 +10,7 @@ const MongoClient = require('arsenal').storage
 const ObjectMD = require('arsenal').models.ObjectMD;
 const { extractVersionId } = require('../../lib/util/versioning');
 
-const Config = require('../../lib/Config');
+const  { config } = require('../../lib/Config');
 const BackbeatConsumer = require('../../lib/BackbeatConsumer');
 const QueueEntry = require('../../lib/models/QueueEntry');
 const DeleteOpQueueEntry = require('../../lib/models/DeleteOpQueueEntry');
@@ -74,7 +74,7 @@ class MongoQueueProcessor {
         this.logger = new Logger('Backbeat:Ingestion:MongoProcessor');
         this.mongoClientConfig.logger = this.logger;
         this._mongoClient = new MongoClient(this.mongoClientConfig);
-        this._bucketMemState = new BucketMemState(Config);
+        this._bucketMemState = new BucketMemState(config);
 
         // in-mem batch of metrics, we only track total entry count by location
         // this._accruedMetrics = { zenko-location: 10 }
@@ -123,9 +123,9 @@ class MongoQueueProcessor {
                 process.exit(1);
             }
 
-            this._bootstrapList = Config.getBootstrapList();
-            Config.on('bootstrap-list-update', () => {
-                this._bootstrapList = Config.getBootstrapList();
+            this._bootstrapList = config.getBootstrapList();
+            config.on('bootstrap-list-update', () => {
+                this._bootstrapList = config.getBootstrapList();
             });
 
             let consumerReady = false;

diff --git a/extensions/mongoProcessor/mongoProcessorTask.js b/extensions/mongoProcessor/mongoProcessorTask.js
@@ -11,7 +11,7 @@ const { sendSuccess, sendError } = require('arsenal').network.probe.Utils;
 const { ZenkoMetrics } = require('arsenal').metrics;
 
 const MongoQueueProcessor = require('./MongoQueueProcessor');
-const config = require('../../lib/Config');
+const  { config } = require('../../lib/Config');
 const { initManagement } = require('../../lib/management/index');
 const { startProbeServer } = require('../../lib/util/probe');
 

diff --git a/extensions/notification/queueProcessor/task.js b/extensions/notification/queueProcessor/task.js
@@ -12,7 +12,7 @@ const { sendSuccess, sendError } = require('arsenal').network.probe.Utils;
 const QueueProcessor = require('./QueueProcessor');
 const { startProbeServer } = require('../../../lib/util/probe');
 
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 const kafkaConfig = config.kafka;
 const notifConfig = config.extensions.notification;
 const mongoConfig = config.queuePopulator.mongo;

diff --git a/extensions/oplogPopulator/OplogPopulatorTask.js b/extensions/oplogPopulator/OplogPopulatorTask.js
@@ -3,7 +3,7 @@
 const werelogs = require('werelogs');
 const { errors } = require('arsenal');
 
-const config = require('../../lib/Config');
+const  { config } = require('../../lib/Config');
 const OplogPopulator = require('./OplogPopulator');
 
 const {

diff --git a/extensions/replication/ReplicationAPI.js b/extensions/replication/ReplicationAPI.js
@@ -1,4 +1,4 @@
-const config = require('../../lib/Config');
+const  { config } = require('../../lib/Config');
 const locations = require('../../conf/locationConfig.json') || {};
 
 const ActionQueueEntry = require('../../lib/models/ActionQueueEntry');

diff --git a/extensions/replication/ReplicationMetrics.js b/extensions/replication/ReplicationMetrics.js
@@ -1,6 +1,6 @@
 const { ZenkoMetrics } = require('arsenal').metrics;
 
-const config = require('../../lib/Config');
+const  { config } = require('../../lib/Config');
 const { promMetricNames } = require('./constants');
 
 const SIZE_BUCKETS = [

diff --git a/extensions/replication/failedCRR/FailedCRRConsumer.js b/extensions/replication/failedCRR/FailedCRRConsumer.js
@@ -7,7 +7,7 @@ const redisClient = require('../../replication/utils/getRedisClient')();
 const FailedCRRProducer = require('./FailedCRRProducer');
 const BackbeatConsumer = require('../../../lib/BackbeatConsumer');
 const BackbeatTask = require('../../../lib/tasks/BackbeatTask');
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 
 // BackbeatConsumer constant defaults
 const CONSUMER_FETCH_MAX_BYTES = 5000020;

diff --git a/extensions/replication/failedCRR/FailedCRRProducer.js b/extensions/replication/failedCRR/FailedCRRProducer.js
@@ -3,7 +3,7 @@
 const { Logger } = require('werelogs');
 
 const BackbeatProducer = require('../../../lib/BackbeatProducer');
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 
 class FailedCRRProducer {
     /**

diff --git a/extensions/replication/management.js b/extensions/replication/management.js
@@ -2,7 +2,7 @@ const async = require('async');
 const AWS = require('aws-sdk');
 const werelogs = require('werelogs');
 
-const config = require('../../lib/Config');
+const  { config } = require('../../lib/Config');
 const management = require('../../lib/management/index');
 
 const logger = new werelogs.Logger('mdManagement:replication');

diff --git a/extensions/replication/queueProcessor/task.js b/extensions/replication/queueProcessor/task.js
@@ -4,7 +4,7 @@ const assert = require('assert');
 const werelogs = require('werelogs');
 
 const QueueProcessor = require('./QueueProcessor');
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 const { initManagement } = require('../../../lib/management/index');
 const { applyBucketReplicationWorkflows } = require('../management');
 const { reshapeExceptionError } = require('arsenal').errorUtils;

diff --git a/extensions/replication/replicationStatusProcessor/task.js b/extensions/replication/replicationStatusProcessor/task.js
@@ -7,7 +7,7 @@ const { startProbeServer } = require('../../../lib/util/probe');
 const { DEFAULT_LIVE_ROUTE, DEFAULT_METRICS_ROUTE, DEFAULT_READY_ROUTE } =
     require('arsenal').network.probe.ProbeServer;
 
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 const kafkaConfig = config.kafka;
 const repConfig = config.extensions.replication;
 const sourceConfig = repConfig.source;

diff --git a/extensions/replication/tasks/UpdateReplicationStatus.js b/extensions/replication/tasks/UpdateReplicationStatus.js
@@ -1,7 +1,7 @@
 const errors = require('arsenal').errors;
 const assert = require('assert');
 
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 
 const ObjectQueueEntry = require('../../../lib/models/ObjectQueueEntry');
 const ActionQueueEntry = require('../../../lib/models/ActionQueueEntry');

diff --git a/extensions/replication/utils/getRedisClient.js b/extensions/replication/utils/getRedisClient.js
@@ -1,5 +1,5 @@
 const { RedisClient } = require('arsenal').metrics;
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 const werelogs = require('werelogs');
 
 const log = new werelogs.Logger('Backbeat:RedisClient');

diff --git a/lib/clients/VaultClientCache.js b/lib/clients/VaultClientCache.js
@@ -1,4 +1,4 @@
-const config = require('../Config');
+const  { config } = require('../Config');
 
 const VaultClient = require('vaultclient').Client;
 

diff --git a/lib/management/index.js b/lib/management/index.js
@@ -1,4 +1,4 @@
-const config = require('../Config');
+const  { config } = require('../Config');
 const werelogs = require('werelogs');
 
 werelogs.configure({

diff --git a/lib/management/operatorBackend.js b/lib/management/operatorBackend.js
@@ -1,5 +1,5 @@
 const arsenal = require('arsenal');
-const config = require('../Config');
+const  { config } = require('../Config');
 const werelogs = require('werelogs');
 
 const { reshapeExceptionError } = arsenal.errorUtils;

diff --git a/lib/management/patchConfiguration.js b/lib/management/patchConfiguration.js
@@ -1,7 +1,7 @@
 'use strict'; // eslint-disable-line strict
 
 const async = require('async');
-const config = require('../Config');
+const  { config } = require('../Config');
 const bucketclient = require('bucketclient');
 const { patchLocations } = require('arsenal').patches.locationConstraints;
 const Metadata = require('arsenal').storage.metadata.MetadataWrapper;

diff --git a/lib/management/pensieveBackend.js b/lib/management/pensieveBackend.js
@@ -1,7 +1,7 @@
 const async = require('async');
 const arsenal = require('arsenal');
 const { decryptSecret } = arsenal.pensieve.credentialUtils;
-const config = require('../Config');
+const  { config } = require('../Config');
 const werelogs = require('werelogs');
 const bucketclient = require('bucketclient');
 

diff --git a/lib/queuePopulator/IngestionPopulator.js b/lib/queuePopulator/IngestionPopulator.js
@@ -6,7 +6,7 @@ const { CircuitBreaker, BreakerState } = require('breakbeat').CircuitBreaker;
 
 const Logger = require('werelogs').Logger;
 
-const config = require('../Config');
+const  { config } = require('../Config');
 const IngestionReader = require('./IngestionReader');
 const BackbeatProducer = require('../BackbeatProducer');
 const MetricsConsumer = require('../MetricsConsumer');

diff --git a/lib/queuePopulator/LogReader.js b/lib/queuePopulator/LogReader.js
@@ -2,7 +2,7 @@ const async = require('async');
 
 const jsutil = require('arsenal').jsutil;
 
-const config = require('../Config');
+const  { config } = require('../Config');
 const BackbeatProducer = require('../BackbeatProducer');
 const ReplicationQueuePopulator =
     require('../../extensions/replication/ReplicationQueuePopulator');

diff --git a/tests/functional/api/retry.js b/tests/functional/api/retry.js
@@ -5,7 +5,7 @@ const querystring = require('querystring');
 const { RedisClient } = require('arsenal').metrics;
 const { StatsModel } = require('arsenal').metrics;
 
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 const getUrl = require('../utils/getUrl');
 const { addMembers, addManyMembers } = require('../utils/sortedSetHelpers');
 const { makeRetryPOSTRequest, getRequest, getResponseBody } =

diff --git a/tests/functional/api/routes.js b/tests/functional/api/routes.js
@@ -7,7 +7,7 @@ const zookeeper = require('node-zookeeper-client');
 const { RedisClient } = require('arsenal').metrics;
 const { StatsModel } = require('arsenal').metrics;
 
-const config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 const { makeRequest, getRequest, getResponseBody } =
     require('../utils/httpHelpers');
 const getUrl = require('../utils/getUrl');

diff --git a/tests/functional/ingestion/pauseResumeState.js b/tests/functional/ingestion/pauseResumeState.js
@@ -9,7 +9,7 @@ const ZKStateHelper = require('../utils/pauseResumeUtils/zkStateHelper');
 const MockAPI = require('../utils/pauseResumeUtils/mockAPI');
 
 // Configs
-const Config = require('../../../lib/Config');
+const  { config } = require('../../../lib/Config');
 const testConfig = require('../../config.json');
 const { zookeeperNamespace } =
     require('../../../extensions/ingestion/constants');
@@ -77,7 +77,7 @@ class IngestionPopulatorMock extends IngestionPopulator {
             assert.ifError(err);
 
             const buckets = [firstBucket, secondBucket];
-            Config.setIngestionBuckets(existingLocationConstraints, buckets);
+            config.setIngestionBuckets(existingLocationConstraints, buckets);
 
             return cb(err);
         });

diff --git a/tests/performance/lifecycle/conductor-check-memory-balloon.js b/tests/performance/lifecycle/conductor-check-memory-balloon.js
@@ -1,9 +1,9 @@
 const assert = require('assert');
 const async = require('async');
 
-const baseConfig = require('../../../lib/Config');
-baseConfig.zookeeper.autoCreateNamespace = true;
-const mongoConfig = baseConfig.queuePopulator.mongo;
+const { config } = require('../../../lib/Config');
+config.zookeeper.autoCreateNamespace = true;
+const mongoConfig = config.queuePopulator.mongo;
 const LifecycleConductor = require('../../../extensions/lifecycle/conductor/LifecycleConductor');
 const { BackbeatMetadataProxyMock } = require('../../functional/lifecycle/utils');
 
@@ -14,7 +14,7 @@ describe('Lifecycle Conductor', function testBackpressure() {
 
     describe('with bucketd', () => {
         const lcConfig = {
-            ...baseConfig.extensions.lifecycle,
+            ...config.extensions.lifecycle,
             auth: {
                 type: '',
             },
@@ -34,11 +34,11 @@ describe('Lifecycle Conductor', function testBackpressure() {
         };
 
         const lc = new LifecycleConductor(
-            baseConfig.zookeeper,
-            baseConfig.kafka,
+            config.zookeeper,
+            config.kafka,
             lcConfig,
-            baseConfig.extensions.replication,
-            baseConfig.s3,
+            config.extensions.replication,
+            config.s3,
         );
 
         it('should apply backpressure on bucket queue instead of ballooning', done => {
@@ -66,7 +66,7 @@ describe('Lifecycle Conductor', function testBackpressure() {
 
     describe('with mongodb', () => {
         const lcConfig = {
-            ...baseConfig.extensions.lifecycle,
+            ...config.extensions.lifecycle,
             auth: {
                 type: '',
             },
@@ -83,16 +83,16 @@ describe('Lifecycle Conductor', function testBackpressure() {
         };
 
         const zookeeperConfig = {
-            ...baseConfig.zookeeper,
+            ...config.zookeeper,
             autoCreateNamespace: true,
         };
 
         const lc = new LifecycleConductor(
             zookeeperConfig,
-            baseConfig.kafka,
+            config.kafka,
             lcConfig,
-            baseConfig.extensions.replication,
-            baseConfig.s3,
+            config.extensions.replication,
+            config.s3,
         );
 
         const injectAccounts = client => {