feat(migrations): file-loader replaced by config-loaders

biorate · Nov 16, 2022 · db919de · db919de
1 parent e393df6
commit db919de
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 8 deletions.
diff --git a/packages/@biorate/config-loader-vault/.gitignore b/packages/@biorate/config-loader-vault/.gitignore
@@ -2,7 +2,7 @@
 dist
 node_modules
 cache
-keys
+downloads
 
 # Logs
 logs

diff --git a/packages/@biorate/config-loader-vault/tests/index.spec.ts b/packages/@biorate/config-loader-vault/tests/index.spec.ts
@@ -14,7 +14,7 @@ describe('@biorate/config-loader-vault', function () {
   it('files', async () => {
     expect(
       await fs.readFile(
-        path.create(process.cwd(), 'keys', Object.keys(data.files)[0]),
+        path.create(process.cwd(), 'downloads', Object.keys(data.files)[0]),
         'utf-8',
       ),
     )

diff --git a/packages/@biorate/migrations/package.json b/packages/@biorate/migrations/package.json
@@ -24,14 +24,18 @@
   "license": "MIT",
   "dependencies": {
     "@biorate/config": "1.11.2",
+    "@biorate/config-loader": "1.11.2",
+    "@biorate/config-loader-env": "1.11.2",
+    "@biorate/config-loader-fs": "1.11.2",
+    "@biorate/config-loader-vault": "1.21.2",
     "@biorate/connector": "1.20.1",
     "@biorate/errors": "1.2.2",
-    "@biorate/file-config": "1.11.2",
     "@biorate/inversion": "1.11.2",
     "@biorate/minio": "1.20.1",
     "@biorate/mongodb": "1.20.1",
     "@biorate/sequelize": "1.20.1",
-    "@biorate/tools": "1.11.2"
+    "@biorate/tools": "1.11.2",
+    "@biorate/vault": "1.11.2"
   },
   "gitHead": "366894dafd47b9613acde338a5615ee547f729a8"
 }
diff --git a/packages/@biorate/migrations/src/default.config.ts b/packages/@biorate/migrations/src/default.config.ts
@@ -1,13 +1,27 @@
 import { container, Types } from '@biorate/inversion';
-import { IConfig } from '@biorate/config';
-import { FileConfig } from '@biorate/file-config';
+import { IConfig, Config } from '@biorate/config';
+import { ConfigLoader } from '@biorate/config-loader';
+import { ConfigLoaderEnv } from '@biorate/config-loader-env';
+import { ConfigLoaderFs } from '@biorate/config-loader-fs';
+import { ConfigLoaderVault } from '@biorate/config-loader-vault';
+import { VaultConnector, IVaultConnector } from '@biorate/vault';
 import { ISequelizeConnection, SequelizeConnector } from '@biorate/sequelize';
 import { IMinioConnection, MinioConnector } from '@biorate/minio';
 import { IMongoDBConnection, MongoDBConnector } from '@biorate/mongodb';
 import { Root } from './';
 import * as Migrations from './types';
 
-container.bind<IConfig>(Types.Config).to(FileConfig).inSingletonScope();
+container.bind<IConfig>(Types.Config).to(Config).inSingletonScope();
+container
+  .bind<ConfigLoader>(Types.ConfigLoaderEnv)
+  .to(ConfigLoaderEnv)
+  .inSingletonScope();
+container.bind<ConfigLoader>(Types.ConfigLoaderFs).to(ConfigLoaderFs).inSingletonScope();
+container
+  .bind<ConfigLoader>(Types.ConfigLoaderVault)
+  .to(ConfigLoaderVault)
+  .inSingletonScope();
+container.bind<IVaultConnector>(Types.Vault).to(VaultConnector).inSingletonScope();
 container
   .bind<ISequelizeConnection>(Types.Sequelize)
   .to(SequelizeConnector)

diff --git a/packages/@biorate/migrations/src/root.ts b/packages/@biorate/migrations/src/root.ts
@@ -1,10 +1,16 @@
 import { IConfig } from '@biorate/config';
+import { ConfigLoader } from '@biorate/config-loader';
+import { IVaultConnector } from '@biorate/vault';
 import { init, injectable, inject, Types, Core } from '@biorate/inversion';
 import * as Migrations from './types';
 
 @injectable()
 export class Root extends Core() {
   @inject(Types.Config) public config: IConfig;
+  @inject(Types.ConfigLoaderEnv) public configLoaderEnv: ConfigLoader;
+  @inject(Types.ConfigLoaderFs) public configLoaderFs: ConfigLoader;
+  @inject(Types.ConfigLoaderVault) public configLoaderVault: ConfigLoader;
+  @inject(Types.Vault) public vault: IVaultConnector;
   @inject(Migrations.Sequelize) public sequelize: Migrations.Sequelize;
   @inject(Migrations.Minio) protected minio: Migrations.Minio;
   @inject(Migrations.Mongodb) protected mongodb: Migrations.Mongodb;

diff --git a/packages/@biorate/migrations/tests/migrations/minio/minio/00001_create-test.ts b/packages/@biorate/migrations/tests/migrations/minio/minio/00001_create-test.ts
@@ -1,4 +1,4 @@
 import { IMinioConfig, IMinioConnection } from '@biorate/minio';
 
 module.exports = async (connection: IMinioConnection, config: IMinioConfig) =>
-  await connection.makeBucket('test', 'test');
+  await connection.makeBucket('test-migrations', 'test-migrations');
diff --git a/packages/@biorate/migrations/tests/migrations/minio/minio/00002_delete-test.ts b/packages/@biorate/migrations/tests/migrations/minio/minio/00002_delete-test.ts
@@ -0,0 +1,5 @@
+import { IMinioConfig, IMinioConnection } from '@biorate/minio';
+
+module.exports = async (connection: IMinioConnection, config: IMinioConfig) => {
+  await connection.removeBucket('test-migrations');
+};
diff --git a/packages/@biorate/rdkafka/tests/index.spec.ts b/packages/@biorate/rdkafka/tests/index.spec.ts
@@ -21,6 +21,7 @@ describe('@biorate/rdkafka', function () {
 
   after(async () => {
     await cleanup();
+    process.exit();
   });
 
   it('AdminClient #createTopic', async () => {