uber-compose 2.1.5b2__tar.gz → 2.1.5b4__tar.gz

{uber_compose-2.1.5b2 → uber_compose-2.1.5b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uber-compose
-Version: 2.1.5b2
+Version: 2.1.5b4
 Summary: docker compose testing env orchestrator
 Home-page: https://github.com/ko10ok/uber-compose
 Author: Yuriy Sagitov

{uber_compose-2.1.5b2 → uber_compose-2.1.5b4}/uber_compose/core/docker_compose.py

@@ -112,24 +112,49 @@ class ComposeInstance:
                 # TODO check if need to template migrations
                 #   substituted_cmd = handler.cmd.format(**env_config_instance.env_services_map)
                 substituted_cmd = handler.cmd
-                migrate_result = await self.compose_executor.dc_exec_until_state(
+                migration_result = await self.compose_executor.dc_exec_until_state(
                     target_service, substituted_cmd,
                     kill_before=False,
                     kill_after=False,
                 )
-                if not migrate_result.finished or migrate_result.stderr:
+
+                migration_errors = [error for error in migration_result.stderr.split(b'\n') if error]  # empty or none skips
+                skipper_migration_errors = [
+                    current_error
+                    for current_error in migration_errors
+                    if any(
+                        skip_error in current_error for skip_error in (self.health_policy.skip_migrations_errors or [])
+                    )
+                ]
+
+                for skipped_error in skipper_migration_errors:
+                    self.logger.stage_info(
+                        Text(
+                            f'⚠️Skipping migration error for "{substituted_cmd}" on {target_service}:'
+                            f'\n{skipped_error=}'
+                        )
+                    )
+
+                critical_migration_errors = [
+                    error
+                    for error in migration_errors
+                    if error not in skipper_migration_errors
+                ]
+                if not migration_result.finished or critical_migration_errors:
                     services_status = await self.compose_executor.dc_state()
                     error = Text(f"Can't migrate service {target_service}, with {substituted_cmd}", style=Style.bad).append(
-                        Text(f"\n{migrate_result.stdout=}\n",style=Style.regular)
+                        Text(f"\n{migration_result.stdout=}\n",style=Style.regular)
+                    ).append(
+                        Text(f"{migration_result.stderr=}\n", style=Style.bad)
                     ).append(
-                        Text(f"{migrate_result.stderr=}", style=Style.bad)
+                        Text(f"Services status:\n", style=Style.info)
                     ).append(
                         services_status.as_rich_text()
                     )
                     self.logger.error(error)
                     self.logger.error_details(f"\nServices logs:\n {await self.logs(services)}")
-                    raise ServicesUpError(f"Can't migrate service {target_service}, with {substituted_cmd}"
-                                          f"\n{migrate_result.stdout=}\n{migrate_result.stderr=}"
+                    raise ServicesUpError(f"Can't migrate service {target_service}, with {substituted_cmd}: {migration_result.finished=}"
+                                          f"\n{migration_result.stdout=}\n{migration_result.stderr=}\n"
                                           f"\nServices status:\n {services_status.as_rich_text()}") from None
 
     async def run_services_pack(self, services: list[str], migrations):

{uber_compose-2.1.5b2 → uber_compose-2.1.5b4}/uber_compose/core/docker_compose_shell/interface.py

@@ -366,12 +366,12 @@ class ComposeShellInterface:
             if process_ids == [-1]:
                 self.logger.stage_details(Text(
                     (
-                        f'Process:\n{cmd}\nwas not checked for completion '
+                        f'⚠️ Process:\n{cmd}\nwas not checked for completion '
                         f'due to no "pidof" tool in container {container}'
                     ),
                     style=Style.suspicious
                 ))
-                check_finished_result = False
+                check_finished_result = True
             elif process_ids:
                 self.logger.error(Text('Process was not completed', style=Style.suspicious))
                 check_finished_result = False

{uber_compose-2.1.5b2 → uber_compose-2.1.5b4}/uber_compose/helpers/health_policy.py

@@ -9,3 +9,5 @@ class UpHealthPolicy:
     service_up_check_delay_s: int = 3
 
     pre_check_delay_s: float = 0
+
+    skip_migrations_errors: list[bytes] = None

{uber_compose-2.1.5b2 → uber_compose-2.1.5b4}/uber_compose.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uber-compose
-Version: 2.1.5b2
+Version: 2.1.5b4
 Summary: docker compose testing env orchestrator
 Home-page: https://github.com/ko10ok/uber-compose
 Author: Yuriy Sagitov