refactor(storage): change storage folder structure (#284)

modules/storage/src/Storage.ts

@@ -10,15 +10,16 @@ import AppConfigSchema, { Config } from './config';
 import { AdminRoutes } from './admin';
 import { FileHandlers } from './handlers/file';
 import { StorageRoutes } from './routes';
-import { createStorageProvider, IStorageProvider } from './storage-provider';
 import * as models from './models';
 import path from 'path';
 import { status } from '@grpc/grpc-js';
 import { isNil } from 'lodash';
-import { getAwsAccountId } from './storage-provider/utils/utils';
 import { isEmpty } from 'lodash';
 import { runMigrations } from './migrations';
 import { FileResponse, GetFileDataResponse } from './protoTypes/storage';
+import { IStorageProvider } from './interfaces';
+import { createStorageProvider } from './providers';
+import { getAwsAccountId } from './utils';
 
 type Callback = (arg1: { code: number; message: string }) => void;
 

modules/storage/src/handlers/file.ts

@@ -7,8 +7,8 @@ import ConduitGrpcSdk, {
 } from '@conduitplatform/grpc-sdk';
 import { status } from '@grpc/grpc-js';
 import { isNil, isString } from 'lodash';
-import { IStorageProvider } from '../storage-provider';
 import { _StorageContainer, _StorageFolder, File } from '../models';
+import { IStorageProvider } from '../interfaces';
 
 export class FileHandlers {
   private readonly database: DatabaseProvider;

modules/storage/src/storage-provider/providers/aliyun/index.ts → modules/storage/src/providers/aliyun/index.ts

@@ -1,9 +1,6 @@
 import { IStorageProvider, StorageConfig } from '../../interfaces';
-
 import OSS from 'ali-oss';
-
 import fs from 'fs';
-
 import { basename } from 'path';
 
 export class AliyunStorage implements IStorageProvider {

modules/storage/src/storage-provider/providers/aws/index.ts → modules/storage/src/providers/aws/index.ts

@@ -11,7 +11,7 @@ import {
   S3Client,
 } from '@aws-sdk/client-s3';
 import { Readable } from 'stream';
-import { streamToBuffer } from '../../utils/utils';
+import { streamToBuffer } from '../../utils';
 import fs from 'fs';
 import { getSignedUrl as awsGetSignedUrl } from '@aws-sdk/s3-request-presigner';
 import ConduitGrpcSdk, { ConfigController } from '@conduitplatform/grpc-sdk';

modules/storage/src/storage-provider/providers/azure/index.ts → modules/storage/src/providers/azure/index.ts

@@ -6,8 +6,8 @@ import {
   SASProtocol,
 } from '@azure/storage-blob';
 import fs from 'fs';
-import { streamToBuffer } from '../../utils/utils';
 import ConduitGrpcSdk from '@conduitplatform/grpc-sdk';
+import { streamToBuffer } from '../../utils';
 
 export class AzureStorage implements IStorageProvider {
   _activeContainer: string = '';

modules/storage/src/storage-provider/providers/google/index.ts → modules/storage/src/providers/google/index.ts

@@ -1,5 +1,4 @@
 import { IStorageProvider, StorageConfig } from '../../interfaces';
-
 import { Storage } from '@google-cloud/storage';
 
 /**

modules/storage/src/storage-provider/index.ts → modules/storage/src/providers/index.ts

@@ -1,9 +1,9 @@
-import { IStorageProvider, StorageConfig } from './interfaces';
-import { GoogleCloudStorage } from './providers/google';
-import { LocalStorage } from './providers/local';
-import { AzureStorage } from './providers/azure';
-import { AWSS3Storage } from './providers/aws';
-import { AliyunStorage } from './providers/aliyun';
+import { IStorageProvider, StorageConfig } from '../interfaces';
+import { GoogleCloudStorage } from './google';
+import { LocalStorage } from './local';
+import { AzureStorage } from './azure';
+import { AWSS3Storage } from './aws';
+import { AliyunStorage } from './aliyun';
 
 export function createStorageProvider(
   provider: keyof StorageConfig,
@@ -24,5 +24,3 @@ export function createStorageProvider(
       return new LocalStorage(options);
   }
 }
-
-export * from './interfaces';

modules/storage/src/storage-provider/providers/local/index.ts → modules/storage/src/providers/local/index.ts

@@ -1,5 +1,4 @@
-import { IStorageProvider } from '../../interfaces';
-import { StorageConfig } from '../../interfaces';
+import { IStorageProvider, StorageConfig } from '../../interfaces';
 import {
   constants,
   chmod,

modules/storage/src/storage-provider/utils/utils.ts → modules/storage/src/utils/index.ts

@@ -1,6 +1,4 @@
 import { GetUserCommand, IAMClient } from '@aws-sdk/client-iam';
-import { isNil } from 'lodash';
-import { ConfigController } from '@conduitplatform/grpc-sdk';
 import { StorageConfig } from '../interfaces';
 
 export async function streamToBuffer(readableStream: any): Promise<Buffer> {