This is an automated email from the ASF dual-hosted git repository.
ferruzzi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 9a9497bde49 Check if awslogs_stream_prefix already ends with
container_name (#43724)
9a9497bde49 is described below
commit 9a9497bde495df135be05cadb83358b3e3dbef1f
Author: Adam Perry <[email protected]>
AuthorDate: Wed Nov 6 10:23:12 2024 -0700
Check if awslogs_stream_prefix already ends with container_name (#43724)
---
providers/src/airflow/providers/amazon/aws/operators/ecs.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/providers/src/airflow/providers/amazon/aws/operators/ecs.py
b/providers/src/airflow/providers/amazon/aws/operators/ecs.py
index be4da8d6f55..10b2d83ec92 100644
--- a/providers/src/airflow/providers/amazon/aws/operators/ecs.py
+++ b/providers/src/airflow/providers/amazon/aws/operators/ecs.py
@@ -661,7 +661,13 @@ class EcsRunTaskOperator(EcsBaseOperator):
return self.awslogs_group and self.awslogs_stream_prefix
def _get_logs_stream_name(self) -> str:
- return
f"{self.awslogs_stream_prefix}/{self.container_name}/{self._get_ecs_task_id(self.arn)}"
+ if (
+ self.awslogs_stream_prefix
+ and self.container_name
+ and not
self.awslogs_stream_prefix.endswith(f"/{self.container_name}")
+ ):
+ return
f"{self.awslogs_stream_prefix}/{self.container_name}/{self._get_ecs_task_id(self.arn)}"
+ return
f"{self.awslogs_stream_prefix}/{self._get_ecs_task_id(self.arn)}"
def _get_task_log_fetcher(self) -> AwsTaskLogFetcher:
if not self.awslogs_group:
