fix: handle claude suggestions (#460)

Author: jot2re

core-client/tests-utils/src/lib.rs

@@ -103,15 +103,15 @@ impl DockerComposeCmd {
             | KMSMode::ThresholdCustodianTestParameter => {
                 &[50100, 50200, 50300, 50400, 50001, 50002, 50003, 50004]
             }
-            KMSMode::Centralized | KMSMode::CentralizedCustodian => &[50100],
+            KMSMode::Centralized | KMSMode::CentralizedCustodian => &[50051],
         }
     }
 
     pub fn up(&self) {
         self.down(); // Make sure that no container is running
                      // Wait for the OS to release ports before starting new containers.
                      // Without this, Docker Compose retries fail with "address already in use".
-        wait_for_ports_free(Self::ports_for_mode(self.mode), Duration::from_secs(30));
+        wait_for_ports_free(Self::ports_for_mode(self.mode), Duration::from_secs(120));
         let build_docker = env::var("DOCKER_BUILD_TEST_CORE_CLIENT").unwrap_or("".to_string());
 
         // set the FHE params based on mode
@@ -172,7 +172,7 @@ impl DockerComposeCmd {
             build.arg("--build");
         }
 
-        build.arg("--wait");
+        build.arg("--wait").arg("--wait-timeout").arg("120");
         println!("{build:?}");
 
         match build.spawn() {
@@ -257,7 +257,9 @@ impl DockerComposeCmd {
             docker_down
                 .arg("down")
                 .arg("--volumes")
-                .arg("--remove-orphans");
+                .arg("--remove-orphans")
+                .arg("--timeout")
+                .arg("30");
 
             let docker_down_output = docker_down
                 .output()

core/service/src/bin/kms-server.rs

@@ -513,7 +513,7 @@ async fn main_exec() -> anyhow::Result<()> {
     };
     migrate_to_0_13_10(&mut private_storage, kms_type)
         .await
-        .expect("Could not complete migration: {e}");
+        .inspect_err(|e| tracing::error!("Could not complete migration: {e}"))?;
 
     let attest_private_vault_root_key_policy = core_config
         .threshold

docker-compose-core-centralized.yml

@@ -25,10 +25,10 @@ services:
       - "9646:9646"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50051"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - minio_secrets:/minio_secrets
       - ./core/service/config/:/app/kms/core/service/config

docker-compose-core-threshold-6.yml

@@ -69,10 +69,10 @@ services:
       - "9646:9646"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50100"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys
@@ -115,10 +115,10 @@ services:
       - "50200:50200"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50200"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys
@@ -158,10 +158,10 @@ services:
       - "50300:50300"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50300"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys
@@ -201,10 +201,10 @@ services:
       - "50400:50400"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50400"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys
@@ -244,10 +244,10 @@ services:
       - "50500:50500"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50500"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys
@@ -287,10 +287,10 @@ services:
       - "50600:50600"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50600"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys

docker-compose-core-threshold.yml

@@ -67,10 +67,10 @@ services:
       - "9646:9646"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50100"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys
@@ -111,10 +111,10 @@ services:
       - "9647:9646"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50200"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys
@@ -155,10 +155,10 @@ services:
       - "9648:9646"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50300"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys
@@ -199,10 +199,10 @@ services:
       - "9649:9646"
     healthcheck:
       test: "grpc_health_probe --addr=localhost:50400"
-      interval: 1s
-      timeout: 1s
-      retries: 5
-      start_period: 1s
+      interval: 2s
+      timeout: 2s
+      retries: 15
+      start_period: 10s
     volumes:
       - ./core/service/config/:/app/kms/core/service/config
       - keys:/app/kms/core/service/keys