Chore/move away from bird (#18)

* chore: bump connectors * chore: update vscode settings * chore: re-add configs without creds * chore: use env file * chore: newline --------- Co-authored-by: root <root@_HOSTNAME_> Co-authored-by: nmshd <[email protected]>
nmshd · May 10, 2024 · 4b9ccf3 · 4b9ccf3
1 parent 28ab857
commit 4b9ccf3
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 35 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1,3 @@
+transportLibrary__baseUrl=
+transportLibrary__platformClientId=
+transportLibrary__platformClientSecret=
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 dist
 build
+.env
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -21,7 +21,7 @@
   "editor.formatOnPaste": true,
   "files.autoSave": "off",
   "editor.codeActionsOnSave": {
-    "source.organizeImports": true
+    "source.organizeImports": "explicit"
   },
   "files.eol": "\n",
   "todo-tree.filtering.excludeGlobs": [

diff --git a/config/connector-config.json b/config/connector-config.json
@@ -1,9 +1,4 @@
 {
-  "transportLibrary": {
-    "baseUrl": "https://bird.enmeshed.eu",
-    "platformClientId": "dev",
-    "platformClientSecret": "SY3nxukl6Xn8kGDk52EwBKXZMR9OR5"
-  },
   "database": {
     "connectionString": "mongodb://root:example@mongodb:27017/?authSource=admin&readPreference=primary&appname=DyfeCore&ssl=false",
     "dbName": "nmshd"

diff --git a/config/connector-demo-config.json b/config/connector-demo-config.json
@@ -1,9 +1,4 @@
 {
-  "transportLibrary": {
-    "baseUrl": "https://bird.enmeshed.eu",
-    "platformClientId": "dev",
-    "platformClientSecret": "SY3nxukl6Xn8kGDk52EwBKXZMR9OR5"
-  },
   "database": {
     "connectionString": "mongodb://root:example@mongodb:27017/?authSource=admin&readPreference=primary&appname=DyfeCore&ssl=false",
     "dbName": "demo"

diff --git a/config/connector-school-config.json b/config/connector-school-config.json
@@ -1,9 +1,4 @@
 {
-  "transportLibrary": {
-    "baseUrl": "https://bird.enmeshed.eu",
-    "platformClientId": "dev",
-    "platformClientSecret": "SY3nxukl6Xn8kGDk52EwBKXZMR9OR5"
-  },
   "database": {
     "connectionString": "mongodb://root:example@mongodb:27017/?authSource=admin&readPreference=primary&appname=DyfeCore&ssl=false",
     "dbName": "school"

diff --git a/config/connector-university-config.json b/config/connector-university-config.json
@@ -1,9 +1,4 @@
 {
-  "transportLibrary": {
-    "baseUrl": "https://bird.enmeshed.eu",
-    "platformClientId": "dev",
-    "platformClientSecret": "SY3nxukl6Xn8kGDk52EwBKXZMR9OR5"
-  },
   "database": {
     "connectionString": "mongodb://root:example@mongodb:27017/?authSource=admin&readPreference=primary&appname=DyfeCore&ssl=false",
     "dbName": "university"

diff --git a/docker-compose.debug.demo.yml b/docker-compose.debug.demo.yml
@@ -22,10 +22,13 @@ services:
 
   connector-demo:
     container_name: connector-demo
-    image: ghcr.io/nmshd/connector:3.2.3
+    image: ghcr.io/nmshd/connector:3.10.1
     environment:
-      CUSTOM_CONFIG_LOCATION: "/config.json"
-      logging__appenders__console__level: "TRACE"
+      - CUSTOM_CONFIG_LOCATION=/config.json
+      - logging__appenders__console__level=TRACE
+      - transportLibrary__baseUrl
+      - transportLibrary__platformClientId
+      - transportLibrary__platformClientSecret
     ports:
       - 8012:80
     volumes:

diff --git a/docker-compose.debug.school.yml b/docker-compose.debug.school.yml
@@ -22,10 +22,13 @@ services:
 
   connector-school:
     container_name: connector-school
-    image: ghcr.io/nmshd/connector:3.2.3
+    image: ghcr.io/nmshd/connector:3.10.1
     environment:
-      CUSTOM_CONFIG_LOCATION: "/config.json"
-      logging__appenders__console__level: "TRACE"
+      - CUSTOM_CONFIG_LOCATION=/config.json
+      - logging__appenders__console__level=TRACE
+      - transportLibrary__baseUrl
+      - transportLibrary__platformClientId
+      - transportLibrary__platformClientSecret
     ports:
       - 8011:80
     volumes:

diff --git a/docker-compose.debug.university.yml b/docker-compose.debug.university.yml
@@ -22,9 +22,13 @@ services:
 
   connector-university:
     container_name: connector-university
-    image: ghcr.io/nmshd/connector:3.2.3
+    image: ghcr.io/nmshd/connector:3.10.1
     environment:
-      CUSTOM_CONFIG_LOCATION: "/config.json"
+      - CUSTOM_CONFIG_LOCATION=/config.json
+      - logging__appenders__console__level=TRACE
+      - transportLibrary__baseUrl
+      - transportLibrary__platformClientId
+      - transportLibrary__platformClientSecret
     ports:
       - 8013:80
     volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,9 +14,12 @@ services:
 
   connector-demo:
     container_name: connector-demo
-    image: ghcr.io/nmshd/connector:3.2.3
+    image: ghcr.io/nmshd/connector:3.10.1
     environment:
-      CUSTOM_CONFIG_LOCATION: "/config.json"
+      - CUSTOM_CONFIG_LOCATION=/config.json
+      - transportLibrary__baseUrl
+      - transportLibrary__platformClientId
+      - transportLibrary__platformClientSecret
     volumes:
       - ./config/connector-demo-config.json:/config.json:ro
     depends_on:
@@ -35,9 +38,12 @@ services:
 
   connector-school:
     container_name: connector-school
-    image: ghcr.io/nmshd/connector:3.2.3
+    image: ghcr.io/nmshd/connector:3.10.1
     environment:
-      CUSTOM_CONFIG_LOCATION: "/config.json"
+      - CUSTOM_CONFIG_LOCATION=/config.json
+      - transportLibrary__baseUrl
+      - transportLibrary__platformClientId
+      - transportLibrary__platformClientSecret
     volumes:
       - ./config/connector-school-config.json:/config.json:ro
     depends_on:
@@ -56,9 +62,12 @@ services:
 
   connector-university:
     container_name: connector-university
-    image: ghcr.io/nmshd/connector:3.2.3
+    image: ghcr.io/nmshd/connector:3.10.1
     environment:
-      CUSTOM_CONFIG_LOCATION: "/config.json"
+      - CUSTOM_CONFIG_LOCATION=/config.json
+      - transportLibrary__baseUrl
+      - transportLibrary__platformClientId
+      - transportLibrary__platformClientSecret
     volumes:
       - ./config/connector-university-config.json:/config.json:ro
     depends_on: