From bb74a7e0454286a495ee5214a877a2c35e295102 Mon Sep 17 00:00:00 2001
From: Konstantin Tsabolov <konstantin.tsabolov@spherity.com>
Date: Thu, 25 Jan 2024 21:37:30 +0100
Subject: [PATCH] chore: remove ssi config from services
---
apps/connection-manager/.env.example | 14 +++++---------
apps/connection-manager/src/application.ts | 3 +--
apps/connection-manager/src/config/ssi.config.ts | 5 -----
apps/connection-manager/src/config/validation.ts | 2 --
apps/credential-manager/src/application.ts | 3 +--
apps/credential-manager/src/config/ssi.config.ts | 5 -----
apps/credential-manager/src/config/validation.ts | 2 --
apps/proof-manager/src/application.ts | 3 +--
apps/proof-manager/src/config/ssi.config.ts | 5 -----
apps/proof-manager/src/config/validation.ts | 2 --
apps/schema-manager/src/application.ts | 3 +--
apps/schema-manager/src/config/ssi.config.ts | 5 -----
apps/schema-manager/src/config/validation.ts | 2 --
13 files changed, 9 insertions(+), 45 deletions(-)
delete mode 100644 apps/connection-manager/src/config/ssi.config.ts
delete mode 100644 apps/credential-manager/src/config/ssi.config.ts
delete mode 100644 apps/proof-manager/src/config/ssi.config.ts
delete mode 100644 apps/schema-manager/src/config/ssi.config.ts
diff --git a/apps/connection-manager/.env.example b/apps/connection-manager/.env.example
index 09f9087..d1d4674 100644
--- a/apps/connection-manager/.env.example
+++ b/apps/connection-manager/.env.example
@@ -1,10 +1,6 @@
-PORT=3003
-CONNECTION_MANAGER_URL=http://localhost:3003
-DATABASE_URL=postgresql://root:password@localhost:5432/postgres?schema=connection
-ECSURL=http://localhost:9200/
+HTTP_HOST=0.0.0.0
+HTTP_PORT=3002
NATS_URL=nats://localhost:4222
-AGENT_URL=http://localhost:3010
-USE_AUTH=false
-OAUTH_CLIENT_ID=clientid
-OAUTH_CLIENT_SECRET=clientsecret
-OAUTH_TOKEN_URL=https://tokenurl
\ No newline at end of file
+NATS_USER=nats_user
+NATS_PASSWORD=
+NATS_MONITORING_URL=http://localhost:8222
diff --git a/apps/connection-manager/src/application.ts b/apps/connection-manager/src/application.ts
index 4faf826..3ea98e3 100644
--- a/apps/connection-manager/src/application.ts
+++ b/apps/connection-manager/src/application.ts
@@ -10,7 +10,6 @@ import { HealthModule } from '@ocm/shared';
import { NATS_CLIENT } from './common/constants.js';
import { httpConfig } from './config/http.config.js';
import { natsConfig } from './config/nats.config.js';
-import { ssiConfig } from './config/ssi.config.js';
import { validationSchema } from './config/validation.js';
import { ConnectionsModule } from './connections/connections.module.js';
import { InvitationsModule } from './invitations/invitations.module.js';
@@ -19,7 +18,7 @@ import { InvitationsModule } from './invitations/invitations.module.js';
imports: [
ConfigModule.forRoot({
isGlobal: true,
- load: [httpConfig, natsConfig, ssiConfig],
+ load: [httpConfig, natsConfig],
cache: true,
expandVariables: true,
validationSchema,
diff --git a/apps/connection-manager/src/config/ssi.config.ts b/apps/connection-manager/src/config/ssi.config.ts
deleted file mode 100644
index 408bf27..0000000
--- a/apps/connection-manager/src/config/ssi.config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { registerAs } from '@nestjs/config';
-
-export const ssiConfig = registerAs('ssi', () => ({
- agentUrl: process.env.SSI_AGENT_URL || 'http://localhost:3010',
-}));
diff --git a/apps/connection-manager/src/config/validation.ts b/apps/connection-manager/src/config/validation.ts
index 8431e10..e9abf25 100644
--- a/apps/connection-manager/src/config/validation.ts
+++ b/apps/connection-manager/src/config/validation.ts
@@ -8,6 +8,4 @@ export const validationSchema = Joi.object({
NATS_USER: Joi.string().optional(),
NATS_PASSWORD: Joi.string().optional(),
NATS_MONITORING_URL: Joi.string().uri(),
-
- SSI_AGENT_URL: Joi.string(),
});
diff --git a/apps/credential-manager/src/application.ts b/apps/credential-manager/src/application.ts
index 982d2a6..7303c2e 100644
--- a/apps/credential-manager/src/application.ts
+++ b/apps/credential-manager/src/application.ts
@@ -10,7 +10,6 @@ import { HealthModule } from '@ocm/shared';
import { NATS_CLIENT } from './common/constants.js';
import { httpConfig } from './config/http.config.js';
import { natsConfig } from './config/nats.config.js';
-import { ssiConfig } from './config/ssi.config.js';
import { validationSchema } from './config/validation.js';
import { CredentialOffersModule } from './credential-offers/credential-offers.module.js';
import { CredentialRequestsModule } from './credential-requests/credential-requests.module.js';
@@ -19,7 +18,7 @@ import { CredentialRequestsModule } from './credential-requests/credential-reque
imports: [
ConfigModule.forRoot({
isGlobal: true,
- load: [httpConfig, natsConfig, ssiConfig],
+ load: [httpConfig, natsConfig],
cache: true,
expandVariables: true,
validationSchema,
diff --git a/apps/credential-manager/src/config/ssi.config.ts b/apps/credential-manager/src/config/ssi.config.ts
deleted file mode 100644
index 408bf27..0000000
--- a/apps/credential-manager/src/config/ssi.config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { registerAs } from '@nestjs/config';
-
-export const ssiConfig = registerAs('ssi', () => ({
- agentUrl: process.env.SSI_AGENT_URL || 'http://localhost:3010',
-}));
diff --git a/apps/credential-manager/src/config/validation.ts b/apps/credential-manager/src/config/validation.ts
index 8431e10..e9abf25 100644
--- a/apps/credential-manager/src/config/validation.ts
+++ b/apps/credential-manager/src/config/validation.ts
@@ -8,6 +8,4 @@ export const validationSchema = Joi.object({
NATS_USER: Joi.string().optional(),
NATS_PASSWORD: Joi.string().optional(),
NATS_MONITORING_URL: Joi.string().uri(),
-
- SSI_AGENT_URL: Joi.string(),
});
diff --git a/apps/proof-manager/src/application.ts b/apps/proof-manager/src/application.ts
index 0c71d7c..19c04cb 100644
--- a/apps/proof-manager/src/application.ts
+++ b/apps/proof-manager/src/application.ts
@@ -10,7 +10,6 @@ import { HealthModule } from '@ocm/shared';
import { NATS_CLIENT } from './common/constants.js';
import { httpConfig } from './config/http.config.js';
import { natsConfig } from './config/nats.config.js';
-import { ssiConfig } from './config/ssi.config.js';
import { validationSchema } from './config/validation.js';
import { ProofsModule } from './proofs/proofs.module.js';
@@ -18,7 +17,7 @@ import { ProofsModule } from './proofs/proofs.module.js';
imports: [
ConfigModule.forRoot({
isGlobal: true,
- load: [httpConfig, natsConfig, ssiConfig],
+ load: [httpConfig, natsConfig],
cache: true,
expandVariables: true,
validationSchema,
diff --git a/apps/proof-manager/src/config/ssi.config.ts b/apps/proof-manager/src/config/ssi.config.ts
deleted file mode 100644
index 408bf27..0000000
--- a/apps/proof-manager/src/config/ssi.config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { registerAs } from '@nestjs/config';
-
-export const ssiConfig = registerAs('ssi', () => ({
- agentUrl: process.env.SSI_AGENT_URL || 'http://localhost:3010',
-}));
diff --git a/apps/proof-manager/src/config/validation.ts b/apps/proof-manager/src/config/validation.ts
index fef0d7c..e9abf25 100644
--- a/apps/proof-manager/src/config/validation.ts
+++ b/apps/proof-manager/src/config/validation.ts
@@ -8,6 +8,4 @@ export const validationSchema = Joi.object({
NATS_USER: Joi.string().optional(),
NATS_PASSWORD: Joi.string().optional(),
NATS_MONITORING_URL: Joi.string().uri(),
-
- SSI_AGENT_URL: Joi.string().uri(),
});
diff --git a/apps/schema-manager/src/application.ts b/apps/schema-manager/src/application.ts
index f7219fc..649befb 100644
--- a/apps/schema-manager/src/application.ts
+++ b/apps/schema-manager/src/application.ts
@@ -10,7 +10,6 @@ import { HealthModule } from '@ocm/shared';
import { NATS_CLIENT } from './common/constants.js';
import { httpConfig } from './config/http.config.js';
import { natsConfig } from './config/nats.config.js';
-import { ssiConfig } from './config/ssi.config.js';
import { validationSchema } from './config/validation.js';
import { CredentialDefinitionsModule } from './credential-definitions/credential-definitions.module.js';
import { SchemasModule } from './schemas/schemas.module.js';
@@ -19,7 +18,7 @@ import { SchemasModule } from './schemas/schemas.module.js';
imports: [
ConfigModule.forRoot({
isGlobal: true,
- load: [httpConfig, natsConfig, ssiConfig],
+ load: [httpConfig, natsConfig],
cache: true,
expandVariables: true,
validationSchema,
diff --git a/apps/schema-manager/src/config/ssi.config.ts b/apps/schema-manager/src/config/ssi.config.ts
deleted file mode 100644
index 408bf27..0000000
--- a/apps/schema-manager/src/config/ssi.config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { registerAs } from '@nestjs/config';
-
-export const ssiConfig = registerAs('ssi', () => ({
- agentUrl: process.env.SSI_AGENT_URL || 'http://localhost:3010',
-}));
diff --git a/apps/schema-manager/src/config/validation.ts b/apps/schema-manager/src/config/validation.ts
index fef0d7c..e9abf25 100644
--- a/apps/schema-manager/src/config/validation.ts
+++ b/apps/schema-manager/src/config/validation.ts
@@ -8,6 +8,4 @@ export const validationSchema = Joi.object({
NATS_USER: Joi.string().optional(),
NATS_PASSWORD: Joi.string().optional(),
NATS_MONITORING_URL: Joi.string().uri(),
-
- SSI_AGENT_URL: Joi.string().uri(),
});
--
GitLab