- update: grab version info to register from the cargo package

- update: docker volume to persist the registered service IDs
- update: consul service id function to store the service id in the services folder

api-service/src/main.rs

@@ -35,7 +35,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Register service with Consul
     let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME"));
-    let tags = vec!["version-1.0".to_string()];
+    let version = env!("CARGO_PKG_VERSION").to_string();
+    let tags = vec![version];
     let meta = HashMap::new();
     consul_registration::register_service(
         &consul_url,

auth-service/src/main.rs

@@ -39,7 +39,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Register service with Consul
     let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME"));
-    let tags = vec!["version-1.0".to_string()];
+    let version = env!("CARGO_PKG_VERSION").to_string();
+    let tags = vec![version];
     let mut meta = HashMap::new();
     consul_registration::register_service(
         &consul_url,

character-service/src/main.rs

@@ -39,7 +39,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Register service with Consul
     let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME"));
-    let tags = vec!["version-1.0".to_string()];
+    let version = env!("CARGO_PKG_VERSION").to_string();
+    let tags = vec![version];
     let mut meta = HashMap::new();
     meta.insert("name".to_string(), "Rose".to_string());
     consul_registration::register_service(

database-service/src/main.rs

@@ -37,7 +37,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     
     // Register service with Consul
     let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME"));
-    let tags = vec!["version-1.0".to_string()];
+    let version = env!("CARGO_PKG_VERSION").to_string();
+    let tags = vec![version];
     let meta = HashMap::new();
     consul_registration::register_service(
         &consul_url,

docker-compose.yml

@@ -29,6 +29,8 @@
       - session-service
       - database-service
       - consul
+    volumes:
+      - service_ids:/services
 
   api-service:
     build:
@@ -44,6 +46,8 @@
     depends_on:
       - auth-service
       - consul
+    volumes:
+      - service_ids:/services
 
   database-service:
     build:
@@ -58,6 +62,8 @@
     depends_on:
       - db
       - consul
+    volumes:
+      - service_ids:/services
 
   character-service:
     build:
@@ -72,6 +78,8 @@
     depends_on:
       - auth-service
       - consul
+    volumes:
+      - service_ids:/services
 
   world-service:
     build:
@@ -86,6 +94,8 @@
     depends_on:
       - auth-service
       - consul
+    volumes:
+      - service_ids:/services
 
   packet-service:
     build:
@@ -100,6 +110,8 @@
     depends_on:
       - auth-service
       - consul
+    volumes:
+      - service_ids:/services
 
   session-service:
     build:
@@ -113,6 +125,8 @@
       - .env
     depends_on:
       - consul
+    volumes:
+      - service_ids:/services
 
   db:
     image: postgres:17
@@ -136,3 +150,4 @@
 
 volumes:
   db_data:
+  service_ids:

packet-service/src/main.rs

@@ -73,7 +73,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Register service with Consul
     let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME"));
-    let tags = vec!["version-1.0".to_string()];
+    let version = env!("CARGO_PKG_VERSION").to_string();
+    let tags = vec![version];
     let mut meta = HashMap::new();
     consul_registration::register_service(
         &consul_url,

session-service/src/main.rs

@@ -40,7 +40,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Register service with Consul
     let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME"));
-    let tags = vec!["version-1.0".to_string()];
+    let version = env!("CARGO_PKG_VERSION").to_string();
+    let tags = vec![version];
     let meta = HashMap::new();
     consul_registration::register_service(
         &consul_url,

utils/src/consul_registration.rs

@@ -32,8 +32,9 @@ pub fn generate_service_id() -> String {
 }
 pub fn get_or_generate_service_id(package_name: &str) -> String {
     // let package_name = env!("CARGO_PKG_NAME");
-    let file_name = format!("{}_service_id.txt", package_name);
+    let file_name = format!("/services/{}_service_id.txt", package_name);
     let path = Path::new(&file_name);
+    let _ = fs::create_dir_all("/services"); // make sure the folders exist
 
     if path.exists() {
         // Read the service ID from the file

world-service/src/main.rs

@@ -29,7 +29,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Register service with Consul
     let service_id = consul_registration::get_or_generate_service_id(env!("CARGO_PKG_NAME"));
-    let tags = vec!["version-1.0".to_string()];
+    let version = env!("CARGO_PKG_VERSION").to_string();
+    let tags = vec![version];
     let mut meta = HashMap::new();
     meta.insert("name".to_string(), "Athena".to_string());
     consul_registration::register_service(