From e43648e4f1ac805051141580681bd637c247ff2e Mon Sep 17 00:00:00 2001
From: Berend Sliedrecht <blu3beri@proton.me>
Date: Mon, 13 Nov 2023 13:05:04 +0100
Subject: [PATCH] minor fixes to make the docker container work
Signed-off-by: Berend Sliedrecht <blu3beri@proton.me>
---
.gitignore | 2 +-
apps/attestation-manager/src/utils/logger.ts | 4 +---
apps/connection-manager/src/utils/logger.ts | 7 ++-----
apps/principal-manager/src/utils/logger.ts | 7 ++-----
apps/principal-manager/tsconfig.json | 3 ++-
apps/proof-manager/src/utils/logger.ts | 7 ++-----
apps/ssi-abstraction/start.sh | 0
7 files changed, 10 insertions(+), 20 deletions(-)
mode change 100644 => 100755 apps/ssi-abstraction/start.sh
diff --git a/.gitignore b/.gitignore
index fa86b29..ecfe0b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,7 @@ pnpm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
-logs/log.json
+**/logs/log.json
# OS
.DS_Store
diff --git a/apps/attestation-manager/src/utils/logger.ts b/apps/attestation-manager/src/utils/logger.ts
index a486e32..3aa7703 100644
--- a/apps/attestation-manager/src/utils/logger.ts
+++ b/apps/attestation-manager/src/utils/logger.ts
@@ -1,8 +1,6 @@
import { existsSync, mkdirSync } from 'fs';
-import { Logger } from 'winston';
+import winston, { Logger } from 'winston';
import ecsFormat from '@elastic/ecs-winston-format';
-// import { ElasticsearchTransport } from 'winston-elasticsearch';
-import winston = require('winston');
import { LoggerConfig } from '@common/constants';
if (!existsSync(LoggerConfig.lOG_DIR)) {
diff --git a/apps/connection-manager/src/utils/logger.ts b/apps/connection-manager/src/utils/logger.ts
index be9e4f5..7e23cd5 100644
--- a/apps/connection-manager/src/utils/logger.ts
+++ b/apps/connection-manager/src/utils/logger.ts
@@ -1,9 +1,6 @@
import { existsSync, mkdirSync } from 'fs';
-import { Logger } from 'winston';
-import ecsFormat = require('@elastic/ecs-winston-format');
-
-import winston = require('winston');
-// import { ElasticsearchTransport } from 'winston-elasticsearch';
+import winston, { Logger } from 'winston';
+import ecsFormat from '@elastic/ecs-winston-format';
import { LoggerConfig } from '@common/constants';
if (!existsSync(LoggerConfig.lOG_DIR)) {
diff --git a/apps/principal-manager/src/utils/logger.ts b/apps/principal-manager/src/utils/logger.ts
index cba1791..4623c69 100644
--- a/apps/principal-manager/src/utils/logger.ts
+++ b/apps/principal-manager/src/utils/logger.ts
@@ -1,9 +1,6 @@
import { existsSync, mkdirSync } from 'fs';
-import { Logger } from 'winston';
-import ecsFormat = require('@elastic/ecs-winston-format');
-
-import winston = require('winston');
-// import { ElasticsearchTransport } from 'winston-elasticsearch';
+import winston, { Logger } from 'winston';
+import ecsFormat from '@elastic/ecs-winston-format';
import { LoggerConfig } from '@common/constants';
if (!existsSync(LoggerConfig.lOG_DIR)) {
diff --git a/apps/principal-manager/tsconfig.json b/apps/principal-manager/tsconfig.json
index d4bdcc6..38d0318 100644
--- a/apps/principal-manager/tsconfig.json
+++ b/apps/principal-manager/tsconfig.json
@@ -4,6 +4,7 @@
"declaration": true,
"removeComments": true,
"emitDecoratorMetadata": true,
+ "esModuleInterop": true,
"experimentalDecorators": true,
"target": "es6",
"sourceMap": true,
@@ -29,4 +30,4 @@
"config",
],
"exclude": ["node_modules", "./dist/**/*"]
-}
\ No newline at end of file
+}
diff --git a/apps/proof-manager/src/utils/logger.ts b/apps/proof-manager/src/utils/logger.ts
index be9e4f5..7e23cd5 100644
--- a/apps/proof-manager/src/utils/logger.ts
+++ b/apps/proof-manager/src/utils/logger.ts
@@ -1,9 +1,6 @@
import { existsSync, mkdirSync } from 'fs';
-import { Logger } from 'winston';
-import ecsFormat = require('@elastic/ecs-winston-format');
-
-import winston = require('winston');
-// import { ElasticsearchTransport } from 'winston-elasticsearch';
+import winston, { Logger } from 'winston';
+import ecsFormat from '@elastic/ecs-winston-format';
import { LoggerConfig } from '@common/constants';
if (!existsSync(LoggerConfig.lOG_DIR)) {
diff --git a/apps/ssi-abstraction/start.sh b/apps/ssi-abstraction/start.sh
old mode 100644
new mode 100755
--
GitLab