add get_running_containers_from_services

original Author/Committer: Agustín Ramiro Díaz <[email protected]>

Author: idan-miara

main.py

@@ -99,27 +99,18 @@ def get_running_digests_sha(running_containers, repository, tagged_images) -> se
     return running_digests_sha
 
 
-def discover_delete_images(region_name: str):
-    print("Discovering images in " + region_name)
-    ecr_client = boto3.client('ecr', region_name=region_name)
-
-    repositories = []
-    describe_repo_paginator = ecr_client.get_paginator('describe_repositories')
-    for describe_repo_response in describe_repo_paginator.paginate():
-        for repo in describe_repo_response['repositories']:
-            repositories.append(repo)
-
-    ecs_client = boto3.client('ecs', region_name=region_name)
-
-    running_containers = []
+def get_running_containers(ecs_client):
+    running_containers = set()  # Actually, used container images
     list_clusters_paginator = ecs_client.get_paginator('list_clusters')
     for response_clusters_list_paginator in list_clusters_paginator.paginate():
-        for cluster in response_clusters_list_paginator['clusterArns']:
+        for cluster_arn in response_clusters_list_paginator['clusterArns']:
+            print("cluster " + cluster_arn)
+
             list_tasks_paginator = ecs_client.get_paginator('list_tasks')
-            for list_tasks_response in list_tasks_paginator.paginate(cluster=cluster, desiredStatus='RUNNING'):
+            for list_tasks_response in list_tasks_paginator.paginate(cluster=cluster_arn, desiredStatus='RUNNING'):
                 if list_tasks_response['taskArns']:
                     describe_tasks_list = ecs_client.describe_tasks(
-                        cluster=cluster,
+                        cluster=cluster_arn,
                         tasks=list_tasks_response['taskArns']
                     )
 
@@ -130,8 +121,54 @@ def discover_delete_images(region_name: str):
                             )
                             for container in response['taskDefinition']['containerDefinitions']:
                                 if '.dkr.ecr.' in container['image'] and ":" in container['image']:
-                                    if container['image'] not in running_containers:
-                                        running_containers.append(container['image'])
+                                    running_containers.add(container['image'])
+
+    return sorted(running_containers)
+
+
+def get_running_containers_from_services(ecs_client):
+    running_containers = set()  # Actually, used container images
+    list_clusters_paginator = ecs_client.get_paginator('list_clusters')
+    for response_clusters_list_paginator in list_clusters_paginator.paginate():
+        for cluster_arn in response_clusters_list_paginator['clusterArns']:
+            print("cluster " + cluster_arn)
+            # List services in the cluster
+            services_response = ecs_client.list_services(cluster=cluster_arn)
+            service_arns = services_response['serviceArns']
+
+            # Describe the service to get details
+            services_details = ecs_client.describe_services(cluster=cluster_arn, services=service_arns)[
+                'services'] if service_arns else []
+
+            for service in services_details:
+                # Get task definition for the service
+                task_definition_arn = service['taskDefinition']
+                task_definition_response = ecs_client.describe_task_definition(taskDefinition=task_definition_arn)
+                task_definition = task_definition_response['taskDefinition']
+
+                # Extract container images from task definition
+                container_definitions = task_definition['containerDefinitions']
+                for container_definition in container_definitions:
+                    container_image = container_definition['image']
+                    print(f"Service: {service['serviceName']}, Container Image: {container_image}")
+                    running_containers.add(container_image)
+
+    return sorted(running_containers)
+
+
+def discover_delete_images(region_name: str):
+    print("Discovering images in " + region_name)
+    ecr_client = boto3.client('ecr', region_name=region_name)
+
+    repositories = []
+    describe_repo_paginator = ecr_client.get_paginator('describe_repositories')
+    for describe_repo_response in describe_repo_paginator.paginate():
+        for repo in describe_repo_response['repositories']:
+            repositories.append(repo)
+
+    ecs_client = boto3.client('ecs', region_name=region_name)
+
+    running_containers = get_running_containers(ecs_client)
 
     # example of `image`
     # {