[feature] Move storage-related files into "storage" folder; For bug 73502

Common/sources/storage/storage-az.js

@@ -5,9 +5,9 @@ const { BlobServiceClient, StorageSharedKeyCredential, generateBlobSASQueryParam
 const mime = require('mime');
 const config = require('config');
 const { Readable } = require('stream');
-const utils = require('./utils');
+const utils = require('../utils');
 const ms = require('ms');
-const commonDefines = require('./../../Common/sources/commondefines');
+const commonDefines = require('../commondefines');
 
 const cfgExpSessionAbsolute = ms(config.get('services.CoAuthoring.expire.sessionabsolute'));
 const MAX_DELETE_OBJECTS = 1000;

Common/sources/storage/storage-base.js

@@ -34,14 +34,14 @@
 const os = require('os');
 const cluster = require('cluster');
 var config = require('config');
-var utils = require('./utils');
+var utils = require('../utils');
 
 const cfgCacheStorage = config.get('storage');
 const cfgPersistentStorage = utils.deepMergeObjects({}, cfgCacheStorage, config.get('persistentStorage'));
 
 const cacheStorage = require('./' + cfgCacheStorage.name);
 const persistentStorage = require('./' + cfgPersistentStorage.name);
-const tenantManager = require('./tenantManager');
+const tenantManager = require('../tenantManager');
 
 const HEALTH_CHECK_KEY_MAX = 10000;
 

Common/sources/storage/storage-fs.js

@@ -35,12 +35,12 @@
 const { cp, rm, mkdir } = require('fs/promises');
 const { stat, readFile, writeFile } = require('fs/promises');
 var path = require('path');
-var utils = require("./utils");
+var utils = require("../utils");
 var crypto = require('crypto');
 const ms = require('ms');
 const config = require('config');
-const commonDefines = require('./../../Common/sources/commondefines');
-const constants = require('./../../Common/sources/constants');
+const commonDefines = require('../commondefines');
+const constants = require('../constants');
 
 const cfgExpSessionAbsolute = ms(config.get('services.CoAuthoring.expire.sessionabsolute'));
 

Common/sources/storage/storage-s3.js

@@ -42,9 +42,9 @@ const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
 const { NodeHttpHandler } = require("@aws-sdk/node-http-handler");
 const mime = require('mime');
 const config = require('config');
-const utils = require('./utils');
+const utils = require('../utils');
 const ms = require('ms');
-const commonDefines = require('./../../Common/sources/commondefines');
+const commonDefines = require('../commondefines');
 
 const cfgExpSessionAbsolute = ms(config.get('services.CoAuthoring.expire.sessionabsolute'));
 const cfgRequestDefaults = config.get('services.CoAuthoring.requestDefaults');

DocService/package.json

@@ -51,8 +51,9 @@
       "./sources/editorDataMemory.js",
       "./sources/editorDataRedis.js",
       "./sources/pubsubRabbitMQ.js",
-      "../Common/sources/storage-fs.js",
-      "../Common/sources/storage-s3.js"
+      "../Common/sources/storage/storage-fs.js",
+      "../Common/sources/storage/storage-s3.js",
+      "../Common/sources/storage/storage-az.js"
     ]
   }
 }

DocService/sources/DocsCoServer.js

@@ -84,7 +84,7 @@ const jwt = require('jsonwebtoken');
 const ms = require('ms');
 const deepEqual  = require('deep-equal');
 const bytes = require('bytes');
-const storage = require('./../../Common/sources/storage-base');
+const storage = require('./../../Common/sources/storage/storage-base');
 const constants = require('./../../Common/sources/constants');
 const utils = require('./../../Common/sources/utils');
 const utilsDocService = require('./utilsDocService');

DocService/sources/canvasservice.js

@@ -47,7 +47,7 @@ var logger = require('./../../Common/sources/logger');
 var utils = require('./../../Common/sources/utils');
 var constants = require('./../../Common/sources/constants');
 var commonDefines = require('./../../Common/sources/commondefines');
-var storage = require('./../../Common/sources/storage-base');
+var storage = require('./../../Common/sources/storage/storage-base');
 var formatChecker = require('./../../Common/sources/formatchecker');
 var statsDClient = require('./../../Common/sources/statsdclient');
 var operationContext = require('./../../Common/sources/operationContext');

DocService/sources/changes2forgotten.js

@@ -38,7 +38,7 @@ var pubsubService = require('./pubsubRabbitMQ');
 var commonDefines = require('./../../Common/sources/commondefines');
 var constants = require('./../../Common/sources/constants');
 var utils = require('./../../Common/sources/utils');
-const storage = require('./../../Common/sources/storage-base');
+const storage = require('./../../Common/sources/storage/storage-base');
 const queueService = require('./../../Common/sources/taskqueueRabbitMQ');
 const operationContext = require('./../../Common/sources/operationContext');
 const sqlBase = require('./databaseConnectors/baseConnector');

DocService/sources/converterservice.js

@@ -43,10 +43,10 @@ var commonDefines = require('./../../Common/sources/commondefines');
 var docsCoServer = require('./DocsCoServer');
 var canvasService = require('./canvasservice');
 var wopiClient = require('./wopiClient');
-var storage = require('./../../Common/sources/storage-base');
+var storage = require('./../../Common/sources/storage/storage-base');
 var formatChecker = require('./../../Common/sources/formatchecker');
 var statsDClient = require('./../../Common/sources/statsdclient');
-var storageBase = require('./../../Common/sources/storage-base');
+var storageBase = require('./../../Common/sources/storage/storage-base');
 var operationContext = require('./../../Common/sources/operationContext');
 const sqlBase = require('./databaseConnectors/baseConnector');
 const utilsDocService = require("./utilsDocService");

DocService/sources/fileuploaderservice.js

@@ -38,7 +38,7 @@ const utilsDocService = require('./utilsDocService');
 var docsCoServer = require('./DocsCoServer');
 var utils = require('./../../Common/sources/utils');
 var constants = require('./../../Common/sources/constants');
-var storageBase = require('./../../Common/sources/storage-base');
+var storageBase = require('./../../Common/sources/storage/storage-base');
 var formatChecker = require('./../../Common/sources/formatchecker');
 const commonDefines = require('./../../Common/sources/commondefines');
 const operationContext = require('./../../Common/sources/operationContext');

DocService/sources/gc.js

@@ -39,7 +39,7 @@ var ms = require('ms');
 var taskResult = require('./taskresult');
 var docsCoServer = require('./DocsCoServer');
 var canvasService = require('./canvasservice');
-var storage = require('./../../Common/sources/storage-base');
+var storage = require('./../../Common/sources/storage/storage-base');
 var utils = require('./../../Common/sources/utils');
 var logger = require('./../../Common/sources/logger');
 var constants = require('./../../Common/sources/constants');

DocService/sources/routes/static.js

@@ -35,7 +35,7 @@ const express = require('express');
 const config = require("config");
 const operationContext = require('./../../../Common/sources/operationContext');
 const utils = require('./../../../Common/sources/utils');
-const storage = require('./../../../Common/sources/storage-base');
+const storage = require('./../../../Common/sources/storage/storage-base');
 const urlModule = require("url");
 const path = require("path");
 const mime = require("mime");

FileConverter/package.json

@@ -13,8 +13,9 @@
   },
   "pkg": {
     "scripts": [
-      "../Common/sources/storage-fs.js",
-      "../Common/sources/storage-s3.js",
+      "../Common/sources/storage/storage-fs.js",
+      "../Common/sources/storage/storage-s3.js",
+      "../Common/sources/storage/storage-az.js",
       "../DocService/sources/editorDataMemory.js",
       "../DocService/sources/editorDataRedis.js"
     ]

FileConverter/sources/converter.js

@@ -43,7 +43,7 @@ const lcid = require('lcid');
 const ms = require('ms');
 
 var commonDefines = require('./../../Common/sources/commondefines');
-var storage = require('./../../Common/sources/storage-base');
+var storage = require('./../../Common/sources/storage/storage-base');
 var utils = require('./../../Common/sources/utils');
 var constants = require('./../../Common/sources/constants');
 var baseConnector = require('../../DocService/sources/databaseConnectors/baseConnector');

tests/integration/withServerInstance/forgottenFilesCommnads.tests.js

@@ -34,7 +34,7 @@ const { describe, test, expect, afterAll, beforeAll } = require('@jest/globals')
 const http = require('http');
 
 const { signToken } = require('../../../DocService/sources/DocsCoServer');
-const storage = require('../../../Common/sources/storage-base');
+const storage = require('../../../Common/sources/storage/storage-base');
 const constants = require('../../../Common/sources/commondefines');
 const operationContext = require('../../../Common/sources/operationContext');
 const utils = require("../../../Common/sources/utils");

tests/integration/withServerInstance/storage.tests.js

@@ -49,7 +49,7 @@ const { cp } = require('fs/promises');
 
 const operationContext = require('../../../Common/sources/operationContext');
 const tenantManager = require('../../../Common/sources/tenantManager');
-const storage = require('../../../Common/sources/storage-base');
+const storage = require('../../../Common/sources/storage/storage-base');
 const utils = require('../../../Common/sources/utils');
 const commonDefines = require("../../../Common/sources/commondefines");
 const config = require('../../../Common/node_modules/config');

tests/perf/checkFileExpire.js

@@ -40,7 +40,7 @@ const {
 
 const co = require('co');
 const taskResult = require('./../../DocService/sources/taskresult');
-const storage = require('./../../Common/sources/storage-base');
+const storage = require('./../../Common/sources/storage/storage-base');
 const storageFs = require('./../../Common/sources/storage-fs');
 const operationContext = require('./../../Common/sources/operationContext');
 const utils = require('./../../Common/sources/utils');