Split commands into groups, add cloudfront commands

Author: Jim Robinson

Pipfile

@@ -12,7 +12,7 @@ boto3-stubs = {extras = ["ecs"], version = "*"}
 autopep8 = "*"
 build = "*"
 twine = "*"
-boto3-stubs = {extras = ["ecs", "essential", "servicediscovery"], version = "*"}
+boto3-stubs = {extras = ["cloudfront", "ecs", "essential", "resourcegroupstaggingapi", "servicediscovery", "sts"], version = "*"}
 
 [requires]
 python_version = "3.8"

Pipfile.lock

@@ -5,157 +5,23 @@
 from click.decorators import command
 from click.termui import prompt
 import os
-from croudtech_ecs_tools.ecs import Ecs, EcsScaler, ServiceInfo
+from croudtech_ecs_tools.ecs import Ecs, EcsScaler, ServiceInfo, EcsTools
+from croudtech_ecs_tools.cloudfront import Cloudfront
 import json
 
 
-
-class EcsTools:
-    _services = {}
-    _tasks = {}
-
-    def __init__(self, region):
-        self.region = region
-        print(self.region)
-        self.ecs_client = boto3.client("ecs", config=Boto3Config(
-            region_name= self.region
-        ))
-
-    @property
-    def clusters(self):
-        if not hasattr(self, "_clusters"):
-            paginator = self.ecs_client.get_paginator("list_clusters")
-            response_iterator = paginator.paginate(
-                PaginationConfig={
-                    "PageSize": 10,
-                }
-            )
-            self._clusters = []
-            for page in response_iterator:
-                for cluster in page["clusterArns"]:
-                    self._clusters.append(cluster.split("/").pop())
-            
-        return self._clusters
-    
-    def extractFromArn(self, arn):
-        arn_parts = arn.split(":")[-1].split("/")[1:]
-        return arn_parts
-
-    def get_services(self, cluster):
-        if cluster not in self._services:
-            self._services[cluster] = []
-            paginator = self.ecs_client.get_paginator("list_services")
-
-            response_iterator = paginator.paginate(
-                cluster=cluster,           
-                PaginationConfig={
-                    "PageSize": 50,
-                }
-            )
-            for page in response_iterator:
-                for service in page["serviceArns"]:
-                    self._services[cluster].append(service)
-        return self._services[cluster]
-
-    def get_tasks(self, cluster, service):
-        task_key = cluster+service
-        if task_key not in self._tasks:
-            self._tasks[task_key] = []
-            paginator = self.ecs_client.get_paginator("list_tasks")
-            response_iterator = paginator.paginate(
-                cluster=cluster,
-                serviceName=service,           
-                PaginationConfig={
-                    "PageSize": 50,
-                }
-            )
-            for page in response_iterator:
-                for task in page["taskArns"]:
-                    self._tasks[task_key].append(task)
-        return self._tasks[task_key]
-
-    def describe_task(self, cluster, task_arn):
-        response = self.ecs_client.describe_tasks(
-            cluster=cluster,
-            tasks=[
-                task_arn,
-            ],            
-        )
-        task = response["tasks"].pop()
-        return task
-
-    def execute_command(self,cluster, container, task_arn, command="bash"):
-        return self.ecs_client.execute_command(
-            cluster=cluster,
-            container=container["name"],
-            command=command,
-            interactive=True,
-            task=task_arn
-        )
-
-    def restart_service(self, service_arn, wait=False):
-        try:
-            cluster, service = self.extractFromArn(service_arn)
-        except ValueError as err:
-            click.echo(f"Invalid service ARN {service_arn}")
-            return
-        waiter = self.ecs_client.get_waiter('services_stable')
-        
-        self.ecs_client.update_service(
-            cluster=cluster,
-            service=service,
-            forceNewDeployment=True
-        )
-        if wait:
-            waiter.wait(
-                cluster=cluster,
-                services=[
-                    service,
-                ],            
-                WaiterConfig={
-                    'Delay': 5,
-                    'MaxAttempts': 100
-                }
-            )
-        return True
-
-    def get_task_containers(self, cluster, task_arn):
-        return self.describe_task(cluster, task_arn)["containers"]
-    
-    def get_service_options(self, cluster):
-        options = []
-        for index, option in enumerate(self.get_services(cluster)):
-            option_name = option.split("/").pop()
-            options.append(f"{index}: {option_name}")
-        return "\n".join(options)
-
-    def get_task_options(self, cluster, service):
-        options = []
-        for index, option in enumerate(self.get_tasks(cluster, service)):
-            option_name = option.split("/").pop()
-            options.append(f"{index}: {option_name}")
-        return "\n".join(options)
-
-    def get_task__container_options(self, cluster, task_arn):
-        options = []
-        for index, option in enumerate(self.get_task_containers(cluster, task_arn)):
-            option_name = option["name"]
-            options.append(f"{index}: {option_name}")
-        return "\n".join(options)
-
-    def get_cluster_options(self):
-        options = []
-        for index, option in enumerate(self.clusters):
-            options.append(f"{index}: {option}")
-        return "\n".join(options)
-
 @click.group()
 @click.version_option()
 def cli():
     "Tools for managing ECS Services and Tasks"
 
+@cli.group()
+@click.version_option()
+def ecs():
+    "Tools for managing ECS Services and Tasks"
+
 
-@cli.command()
+@ecs.command()
 @click.option("--region", required=True, default=os.getenv("AWS_DEFAULT_REGION", "eu-west-2"))
 @click.option("--command", default="bash")
 def ecs_shell(region, command):
@@ -180,7 +46,7 @@ def ecs_shell(region, command):
     click.secho(command, fg="cyan")
     os.system(command)
 
-@cli.command()
+@ecs.command()
 @click.option("--region", required=True, default=os.getenv("AWS_DEFAULT_REGION", "eu-west-2"))
 @click.option('--wait/--no-wait', default=False, help="Wait for service to become stable before exiting")
 @click.argument("service_arn", required=False)
@@ -200,30 +66,42 @@ def restart_service(region, wait, service_arn):
         click.echo(f"Service {service_arn} restarted")
 
 
-@cli.command()
+@ecs.command()
 @click.option("--cluster", required=True)
 def list_service_discovery_endpoints(cluster):
     ecs_manager = Ecs(cluster=cluster)
     print(json.dumps(ecs_manager.list_ecs_service_endpoints(), indent=2, default=str))
 
-@cli.command()
+@ecs.command()
 @click.option("--cluster", required=False)
 @click.option("--ip-filter", multiple=True)
 def show_service_ips(cluster=None, ip_filter=None):
     service_info = ServiceInfo()
     print(json.dumps(service_info.show_service_ips(cluster, ip_filter), indent=2, default=str))
 
-@cli.command()
+@ecs.command()
 @click.argument("environment")
 def scale_up(environment):
     ecs_scaler = EcsScaler(environment)
     ecs_scaler.scale_up()
 
-@cli.command()
+@ecs.command()
 @click.argument("environment")
 def scale_down(environment):
     ecs_scaler = EcsScaler(environment)
     ecs_scaler.scale_down()
 
+@cli.group()
+@click.version_option()
+def cloudfront():
+    "Tools for managing Cloudfront Distributions"
+
+@cloudfront.command()
+@click.argument("environment")
+@click.option("--paths", multiple=True)
+def clear_cloudfront_cache(environment, paths):
+    cloudfront_manager = Cloudfront()
+    cloudfront_manager.clear_cache(environment, paths)
+
 if __name__ == "__main__":
     cli()