Skip to content
This repository has been archived by the owner on Apr 21, 2022. It is now read-only.

Commit

Permalink
Added a task :harbor:get-container-name
Browse files Browse the repository at this point in the history
  • Loading branch information
blackandred committed Aug 4, 2020
1 parent 2e3629b commit c5ff774
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
2 changes: 2 additions & 0 deletions src/harbor/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from .tasks.service import InspectContainerTask
from .tasks.service import ExecTask
from .tasks.service import ServiceRemoveTask
from .tasks.service import GetContainerNameTask
from .tasks.service import ServiceUpTask
from .tasks.service import ServiceStopTask
from .tasks.service import WaitForServiceTask
Expand Down Expand Up @@ -63,6 +64,7 @@ def imports():
TaskDeclaration(ServiceStopTask()),
TaskDeclaration(WaitForServiceTask()),
TaskDeclaration(ServiceRemoveTask()),
TaskDeclaration(GetContainerNameTask()),
TaskDeclaration(ExecTask()),
TaskDeclaration(LogsTask()),
TaskDeclaration(AnalyzeServiceTask()),
Expand Down
25 changes: 21 additions & 4 deletions src/harbor/tasks/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def configure_argparse(self, parser: ArgumentParser):
parser.add_argument('name', help='Service name')
parser.add_argument('--extra-args', '-c', help='Optional compose arguments', default='')

def prepare_single_for_single_container(self, ctx: ExecutionContext) -> tuple:
def prepare_tuple_for_single_container(self, ctx: ExecutionContext) -> tuple:
service_name = ctx.get_arg('--name')
service = self.services(ctx).get_by_name(service_name)
instance_num = int(ctx.get_arg('--instance-num')) if ctx.get_arg('--instance-num') else None
Expand Down Expand Up @@ -260,7 +260,7 @@ def run(self, ctx: ExecutionContext) -> bool:
tty = bool(ctx.get_arg('--no-tty'))
interactive = bool(ctx.get_arg('--no-interactive'))

container_name, service, instance_num = self.prepare_single_for_single_container(ctx)
container_name, service, instance_num = self.prepare_tuple_for_single_container(ctx)

if not service:
return False
Expand All @@ -275,6 +275,23 @@ def run(self, ctx: ExecutionContext) -> bool:
return True


class GetContainerNameTask(BaseHarborServiceTask):
"""Returns a full container name - can be used in scripting"""

def get_name(self) -> str:
return ":get-container-name"

def configure_argparse(self, parser: ArgumentParser):
super().configure_argparse(parser)
parser.add_argument('--instance-num', '-i', default=None, help='Instance number. If None, then will pick last.')

def run(self, ctx: ExecutionContext) -> bool:
container_name, service, instance_num = self.prepare_tuple_for_single_container(ctx)
self.io().out(container_name)

return True


class InspectContainerTask(BaseHarborServiceTask):
"""Inspect a single container"""

Expand All @@ -286,7 +303,7 @@ def get_name(self) -> str:
return ':inspect'

def run(self, ctx: ExecutionContext) -> bool:
container_name, service, instance_num = self.prepare_single_for_single_container(ctx)
container_name, service, instance_num = self.prepare_tuple_for_single_container(ctx)

if not service:
return False
Expand Down Expand Up @@ -372,7 +389,7 @@ def get_name(self) -> str:
return ':logs'

def run(self, ctx: ExecutionContext) -> bool:
container_name, service, instance_num = self.prepare_single_for_single_container(ctx)
container_name, service, instance_num = self.prepare_tuple_for_single_container(ctx)
buffered = bool(ctx.get_arg('--buffered'))

if not service:
Expand Down

0 comments on commit c5ff774

Please sign in to comment.