Merge pull request #66 from SaintAngeLs/deploy_update

(#62) test for the deploy action
SaintAngeLs · Apr 20, 2024 · 66e32d4 · 66e32d4
2 parents f8d1002 + 05fcd26
commit 66e32d4
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 21 deletions.
diff --git a/.github/workflows/cloud_deploy.yml b/.github/workflows/cloud_deploy.yml
@@ -3,7 +3,7 @@ name: Deploy to Cloud
 on:
   push:
     branches:
-      - main
+      - main # dev for the test purposes here
   pull_request:
     branches:
       - main 
@@ -21,7 +21,7 @@ jobs:
         echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
         chmod 600 ~/.ssh/id_rsa
         ssh-keyscan -H ${{ secrets.DROPLET_IP }} >> ~/.ssh/known_hosts
-        cat ~/.ssh/known_hosts # Add this line to confirm that the key is added
+        cat ~/.ssh/known_hosts 
 
     - name: Check the structure
       run: |

diff --git a/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Api/appsettings.docker.json b/MiniSpace.Services.Events/src/MiniSpace.Services.Events.Api/appsettings.docker.json
@@ -1,13 +1,13 @@
 {
   "app": {
-    "name": "MiniSpace Identity Service",
+    "name": "MiniSpace Events Service",
     "version": "1"
   },
   "consul": {
     "enabled": true,
     "url": "http://consul:8500",
-    "service": "identity-service",
-    "address": "identity-service",
+    "service": "events-service",
+    "address": "events-service",
     "port": "80",
     "pingEnabled": true,
     "pingEndpoint": "ping",
@@ -17,7 +17,7 @@
   "fabio": {
     "enabled": true,
     "url": "http://fabio:9999",
-    "service": "identity-service"
+    "service": "events-service"
   },
   "httpClient": {
     "type": "fabio",
@@ -59,7 +59,7 @@
   },
   "jaeger": {
     "enabled": true,
-    "serviceName": "identity",
+    "serviceName": "events",
     "udpHost": "jaeger",
     "udpPort": 6831,
     "maxPacketSize": 0,
@@ -77,17 +77,54 @@
   },
   "mongo": {
     "connectionString": "mongodb+srv://minispace-user:9vd6IxYWUuuqhzEH@cluster0.mmhq4pe.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0",
-    "database": "identity-service",
+    "database": "events-service",
     "seed": false
   },
   "rabbitMq": {
+    "connectionName": "events-service",
+    "retries": 3,
+    "retryInterval": 2,
+    "conventionsCasing": "snakeCase",
+    "logger": {
+      "enabled": true
+    },
+    "username": "guest",
+    "password": "guest",
+    "virtualHost": "/",
+    "port": 5672,
     "hostnames": [
       "rabbitmq"
-    ]
+    ],
+    "requestedConnectionTimeout": "00:00:30",
+    "requestedHeartbeat": "00:01:00",
+    "socketReadTimeout": "00:00:30",
+    "socketWriteTimeout": "00:00:30",
+    "continuationTimeout": "00:00:20",
+    "handshakeContinuationTimeout": "00:00:10",
+    "networkRecoveryInterval": "00:00:05",
+    "exchange": {
+      "declare": true,
+      "durable": true,
+      "autoDelete": false,
+      "type": "topic",
+      "name": "events"
+    },
+    "queue": {
+      "declare": true,
+      "durable": true,
+      "exclusive": false,
+      "autoDelete": false,
+      "template": "events-service/{{exchange}}.{{message}}"
+    },
+    "context": {
+      "enabled": true,
+      "header": "message_context"
+    },
+    "spanContextHeader": "span_context"
   },
   "redis": {
     "connectionString": "redis",
-    "instance": "identity:"
+    "instance": "events:"
   },
   "swagger": {
     "enabled": true,

diff --git a/MiniSpace.Services.Identity/src/MiniSpace.Services.Identity.Api/appsettings.docker.json b/MiniSpace.Services.Identity/src/MiniSpace.Services.Identity.Api/appsettings.docker.json
@@ -6,8 +6,8 @@
   "consul": {
     "enabled": true,
     "url": "http://consul:8500",
-    "service": "events-service",
-    "address": "events-service",
+    "service": "identity-service",
+    "address": "identity-service",
     "port": "80",
     "pingEnabled": true,
     "pingEndpoint": "ping",
@@ -17,7 +17,7 @@
   "fabio": {
     "enabled": true,
     "url": "http://fabio:9999",
-    "service": "events-service"
+    "service": "identity-service"
   },
   "httpClient": {
     "type": "fabio",
@@ -59,7 +59,7 @@
   },
   "jaeger": {
     "enabled": true,
-    "serviceName": "events",
+    "serviceName": "identity",
     "udpHost": "jaeger",
     "udpPort": 6831,
     "maxPacketSize": 0,
@@ -77,7 +77,7 @@
   },
   "mongo": {
     "connectionString": "mongodb+srv://minispace-user:9vd6IxYWUuuqhzEH@cluster0.mmhq4pe.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0",
-    "database": "events-service",
+    "database": "identity-service",
     "seed": false
   },
   "rabbitMq": {
@@ -87,7 +87,7 @@
   },
   "redis": {
     "connectionString": "redis",
-    "instance": "events:"
+    "instance": "identity:"
   },
   "swagger": {
     "enabled": true,

diff --git a/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Api/appsettings.docker.json b/MiniSpace.Services.Students/src/MiniSpace.Services.Students.Api/appsettings.docker.json
@@ -1,6 +1,6 @@
 {
   "app": {
-    "name": "MiniSpace Identity Service",
+    "name": "MiniSpace Students Service",
     "version": "1"
   },
   "consul": {
@@ -81,9 +81,46 @@
     "seed": false
   },
   "rabbitMq": {
+    "connectionName": "students-service",
+    "retries": 3,
+    "retryInterval": 2,
+    "conventionsCasing": "snakeCase",
+    "logger": {
+      "enabled": true
+    },
+    "username": "guest",
+    "password": "guest",
+    "virtualHost": "/",
+    "port": 5672,
     "hostnames": [
       "rabbitmq"
-    ]
+    ],
+    "requestedConnectionTimeout": "00:00:30",
+    "requestedHeartbeat": "00:01:00",
+    "socketReadTimeout": "00:00:30",
+    "socketWriteTimeout": "00:00:30",
+    "continuationTimeout": "00:00:20",
+    "handshakeContinuationTimeout": "00:00:10",
+    "networkRecoveryInterval": "00:00:05",
+    "exchange": {
+      "declare": true,
+      "durable": true,
+      "autoDelete": false,
+      "type": "topic",
+      "name": "students"
+    },
+    "queue": {
+      "declare": true,
+      "durable": true,
+      "exclusive": false,
+      "autoDelete": false,
+      "template": "students-service/{{exchange}}.{{message}}"
+    },
+    "context": {
+      "enabled": true,
+      "header": "message_context"
+    },
+    "spanContextHeader": "span_context"
   },
   "redis": {
     "connectionString": "redis",

diff --git a/MiniSpace/compose/infrastructure.yml b/MiniSpace/compose/infrastructure.yml
@@ -82,9 +82,12 @@ services:
     networks:
       - minispace
     ports:
-      - 5672:5672
-      - 15672:15672
-      - 15692:15692
+      - 5672:5672    # default AMQP port
+      - 15672:15672  # default management UI port
+      - 15692:15692  # already existing custom port
+      - 25672:25672  # clustering port used for inter-node and CLI tools communication
+      - 5671:5671    # secure AMQP port (TLS)
+      - 15671:15671  # secure management UI port (TLS)
     # volumes: 
     #   - rabbitmq:/var/lib/rabbitmq