mantis-cli 9.0.0__tar.gz → 9.0.2__tar.gz

{mantis-cli-9.0.0/mantis_cli.egg-info → mantis-cli-9.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: mantis-cli
-Version: 9.0.0
+Version: 9.0.2
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský

mantis-cli-9.0.2/mantis/__init__.py

@@ -0,0 +1 @@
+VERSION = '9.0.2'

{mantis-cli-9.0.0 → mantis-cli-9.0.2}/mantis/extensions.py

@@ -32,7 +32,7 @@ class Postgres():
     def psql(self):
         CLI.info('Starting psql...')
         env = self.load_environment()
-        self.docker(f'exec -it {self.CONTAINER_DB} psql -h {env["POSTGRES_HOST"]} -U {env["POSTGRES_USER"]} -d {env["POSTGRES_DBNAME"]} -W')
+        self.docker(f'exec -it {self.postgres_container} psql -h {env["POSTGRES_HOST"]} -U {env["POSTGRES_USER"]} -d {env["POSTGRES_DBNAME"]} -W')
         # https://blog.sleeplessbeastie.eu/2014/03/23/how-to-non-interactively-provide-password-for-the-postgresql-interactive-terminal/
         # TODO: https://www.postgresql.org/docs/9.1/libpq-pgpass.html
 
@@ -55,7 +55,7 @@ class Postgres():
         filename = now.strftime(f"{self.PROJECT_NAME}_%Y%m%d_%H%M{data_only_suffix}.{extension}")
         CLI.info(f'Backuping database into file {filename}')
         env = self.load_environment()
-        self.docker(f'exec -it {self.CONTAINER_DB} bash -c \'pg_dump {compressed_params} {data_only_param} -h {env["POSTGRES_HOST"]} -U {env["POSTGRES_USER"]} {table_params} {env["POSTGRES_DBNAME"]} -W > /backups/{filename}\'')
+        self.docker(f'exec -it {self.postgres_container} bash -c \'pg_dump {compressed_params} {data_only_param} -h {env["POSTGRES_HOST"]} -U {env["POSTGRES_USER"]} {table_params} {env["POSTGRES_DBNAME"]} -W > /backups/{filename}\'')
         # https://blog.sleeplessbeastie.eu/2014/03/23/how-to-non-interactively-provide-password-for-the-postgresql-interactive-terminal/
         # TODO: https://www.postgresql.org/docs/9.1/libpq-pgpass.html
 
@@ -72,8 +72,8 @@ class Postgres():
 
         CLI.underline("Don't forget to drop database at first to prevent constraints collisions!")
         env = self.load_environment()
-        self.docker(f'exec -it {self.CONTAINER_DB} bash -c \'pg_restore -h {env["POSTGRES_HOST"]} -U {env["POSTGRES_USER"]} -d {env["POSTGRES_DBNAME"]} {table_params} -W < /backups/{filename}\'')
-        # print(f'exec -it {self.CONTAINER_DB} bash -c \'pg_restore -h {env["POSTGRES_HOST"]} -U {env["POSTGRES_USER"]} -d {env["POSTGRES_DBNAME"]} {table_params} -W < /backups/{filename}\'')
+        self.docker(f'exec -it {self.postgres_container} bash -c \'pg_restore -h {env["POSTGRES_HOST"]} -U {env["POSTGRES_USER"]} -d {env["POSTGRES_DBNAME"]} {table_params} -W < /backups/{filename}\'')
+        # print(f'exec -it {self.postgres_container} bash -c \'pg_restore -h {env["POSTGRES_HOST"]} -U {env["POSTGRES_USER"]} -d {env["POSTGRES_DBNAME"]} {table_params} -W < /backups/{filename}\'')
         # https://blog.sleeplessbeastie.eu/2014/03/23/how-to-non-interactively-provide-password-for-the-postgresql-interactive-terminal/
         # TODO: https://www.postgresql.org/docs/9.1/libpq-pgpass.html
 

{mantis-cli-9.0.0 → mantis-cli-9.0.2}/mantis/logic.py

@@ -158,74 +158,38 @@ def main():
 
 
 def execute(manager, command, params=None):
-    manager_methods = {
-        '--contexts': 'contexts',
-        '--create-context': 'create_context',
-        '--generate-key': 'generate_key',
-        '--encrypt-env': 'encrypt_env',
-        '--decrypt-env': 'decrypt_env',
-        '--check-env': 'check_env',
-        '--healthcheck': 'healthcheck',
+    shortcuts = {
         '-hc': 'healthcheck',
-        '--bash': 'bash',
-        '--build': 'build',
-        '--build-image': 'build_image',
         '-b': 'build',
-        '--push': 'push',
-        '--pull': 'pull',
         '-p': 'pull',
-        '--upload': 'upload',
-        '--upload-docker-configs': 'upload_docker_configs',
         '-u': 'upload',
-        '--reload': 'reload',
-        '--restart': 'restart',
-        '--run': 'run',
-        '--up': 'up',
-        '--deploy': 'deploy',
         '-d': 'deploy',
-        '--stop': 'stop',
-        '--start': 'start',
-        '--clean': 'clean',
         '-c': 'clean',
-        '--remove': 'remove',
-        '--reload-webserver': 'reload_webserver',
-        '--restart-proxy': 'restart_proxy',
-        '--status': 'status',
         '-s': 'status',
-        '--networks': 'networks',
         '-n': 'networks',
-        '--logs': 'logs',
         '-l': 'logs',
-        '--shell': 'shell',
-        '--sh': 'sh',
-        '--bash': 'bash',
-        '--manage': 'manage',
-        '--exec': 'exec',
-        '--psql': 'psql',
-        '--pg-dump': 'pg_dump',
-        '--pg-dump-data': 'pg_dump_data',
-        '--pg-restore': 'pg_restore',
-        '--pg-restore-data': 'pg_restore_data',
-        '--send-test-email': 'send_test_email',
     }
 
-    manager_method = manager_methods.get(command)
+    manager_method = shortcuts.get(command, None)
+
+    if manager_method is None:
+        manager_method = command.lstrip('-').replace('-', '_')
 
     if manager_method is None or not hasattr(manager, manager_method):
-        commands = '\n'.join(manager_methods.keys())
-        
-        CLI.error(f'Invalid command "{command}" \n\nUsage: mantis <ENVIRONMENT> \n{commands}')
+        CLI.error(f'Invalid command "{command}"')
+
+        # TODO: more sophisticated way to print usage/help
+        # commands = '\n'.join(manager_methods.keys())
+        # CLI.error(f'\n\nUsage: mantis <ENVIRONMENT> \n{commands}')
     else:
         methods_without_environment = ['contexts', 'create_context', 'generate_key', 'build', 'build_image', 'push']
-        methods_with_params = ['healthcheck', 'sh', 'bash', 'build_image', 'exec', 'bash', 'manage', 'pg_restore', 'pg_restore_data', 'pg_dump_data',
-                               'start', 'stop', 'logs', 'remove', 'upload', 'run', 'up', 'encrypt_env', 'decrypt_env']
 
         if manager.environment_id is None and manager_method not in methods_without_environment:
             CLI.error('Missing environment')
         elif manager.environment_id is not None and manager_method in methods_without_environment:
             CLI.error('Redundant environment')
 
-        if manager_method in methods_with_params and params:
+        if params:
             getattr(manager, manager_method)(*params)
         else:
             getattr(manager, manager_method)()

{mantis-cli-9.0.0 → mantis-cli-9.0.2}/mantis/managers.py

@@ -138,13 +138,10 @@ class DefaultManager(object):
             # TODO: refactor
             self.CONTAINER_WEBSERVER = f"{self.CONTAINER_PREFIX}{self.get_container_suffix('webserver')}"
 
-            self.SWARM = self.config.get('swarm', False)
-            self.SWARM_STACK = self.config.get(f'swarm_stack', self.CONTAINER_PREFIX)  # project name?
             self.compose_name = self.config['compose']['name']
             self.COMPOSE_PREFIX = 'docker-compose' if self.compose_name == '' else f'docker-compose.{self.compose_name}'
             self.compose_configs = [
-                f'{self.configs_path}/{self.configs_compose_folder}/{self.COMPOSE_PREFIX}.yml',
-                f'{self.configs_path}/{self.configs_compose_folder}/{self.COMPOSE_PREFIX}.proxy.yml',
+                f'{self.configs_path}/{self.configs_compose_folder}/{self.COMPOSE_PREFIX}.yml', # TODO: deprecated
                 f'{self.configs_path}/{self.configs_compose_folder}/{self.COMPOSE_PREFIX}.{self.environment_id}.yml',
             ]
 
@@ -363,11 +360,7 @@ class DefaultManager(object):
             # check encryption values
             self.check_environment_encryption(env_file)
 
-    def read_environment(self, path=None):
-        # if not path:
-        #     # TODO
-        #     path = self.environment_path
-
+    def read_environment(self, path):
         if not os.path.exists(path):
             CLI.error(f'Environment file {path} does not exist')
             return None
@@ -376,6 +369,19 @@ class DefaultManager(object):
             return f.read().splitlines()
 
     def load_environment(self, path=None):
+        # if not path is specified, load variables from all environment files
+        if not path:
+            CLI.info(f'Environment file path not specified. Walking all environment files...')
+
+            values = {}
+
+            for env_file in self.environment_files:
+                env_values = self.load_environment(path=env_file)
+                values.update(env_values)
+
+            return values
+
+        # read environment file
         lines = self.read_environment(path)
 
         # TODO: refactor
@@ -394,12 +400,11 @@ class DefaultManager(object):
         if not self.is_valid_line(line):
             return None
 
-        key = line.split('=', maxsplit=1)[0]
-        value = line.split('=', maxsplit=1)[1]
-
-        return key, value
+        return line.split('=', maxsplit=1)
 
     def cmd(self, command):
+        command = command.strip()
+
         error_message = "Error during running command '%s'" % command
 
         try:
@@ -527,7 +532,6 @@ class DefaultManager(object):
         image = service_build.get('image', self.get_image_name(service))
         dockerfile = f"{self.config['build'].get('context', '.')}{service_build['dockerfile']}"
         CLI.info(f'Building image {image} from {dockerfile}...')
-        steps = 1
 
         if not os.path.exists(dockerfile):
             CLI.error(f'Dockerfile {dockerfile} not found')
@@ -536,7 +540,7 @@ class DefaultManager(object):
         DOCKER_TAG = self.config['build']['tag']
         DOCKER_REPOSITORY_AND_TAG = f'{DOCKER_REPOSITORY}:{DOCKER_TAG}'
 
-        CLI.step(1, steps, f'Building Docker image [{DOCKER_REPOSITORY_AND_TAG}]...')
+        CLI.warning(f'Building Docker image [{DOCKER_REPOSITORY_AND_TAG}]...')
 
         build_args = self.config['build']['args']
         build_args = ','.join(map('='.join, build_args.items()))
@@ -552,8 +556,7 @@ class DefaultManager(object):
         CLI.info(f'Kit = {build_kit}')
         CLI.info(f'Args = {build_args}')
 
-        # TODO: platform as mantis config parameter
-        self.cmd(f'{time}{build_kit} docker build . {build_args} --platform linux/amd64 -t {image} -f {dockerfile} {params}')
+        self.cmd(f'{time}{build_kit} docker build . {build_args} -t {image} -f {dockerfile} {params}')
 
     def push(self, params=''):
         CLI.info(f'Pushing...')
@@ -586,7 +589,8 @@ class DefaultManager(object):
         self.docker_compose('pull')
 
     def upload(self, context='services'):
-        steps = 1
+        if not self.connection:
+            return CLI.warning('Connection not defined. Skipping uploading files')
 
         mapping = {
             'services': {
@@ -607,11 +611,11 @@ class DefaultManager(object):
             self.upload('compose')
             self.upload('mantis')
         elif context == 'services':
-            CLI.step(1, steps, 'Uploading configs for context "services" [webserver, database, cache, htpasswd]')
+            CLI.warning('Uploading configs for context "services" [webserver, database, cache, htpasswd]')
         elif context == 'compose':
-            CLI.step(1, steps, 'Uploading configs for context "compose" [docker compose configs and environment]')
+            CLI.warning('Uploading configs for context "compose" [docker compose configs and environment]')
         elif context == 'mantis':
-            CLI.step(1, steps, 'Uploading configs for mantis [mantis.json]')
+            CLI.warning('Uploading configs for mantis [mantis.json]')
         else:
             CLI.error(f'Unknown context "{context}". Available: services, compose, mantis or all')
 
@@ -650,40 +654,28 @@ class DefaultManager(object):
 
     def restart(self):
         CLI.info('Restarting...')
-        steps = 3
-
-        if self.SWARM:
-            CLI.step(1, steps, 'Stopping and removing Docker app service...')
-
-            for service in self.get_services():
-                if service == self.CONTAINER_APP:
-                    self.cmd(f'docker service rm {service}')
+        steps = 4
 
-            CLI.step(2, steps, 'Recreating Docker swarm stack...')
-            self.cmd(f'docker stack deploy -c configs/{self.configs_compose_folder}/{self.COMPOSE_PREFIX}.yml -c configs/{self.configs_compose_folder}/{self.COMPOSE_PREFIX}.{self.environment_id}.yml {self.PROJECT_NAME}')
+        # run down project containers
+        CLI.step(1, steps, 'Running down project containers...')
+        self.down()
 
-            CLI.step(3, steps, 'Prune Docker images and volumes')  # todo prune on every node
-            self.docker(f'system prune --volumes --force')
-        else:
-            CLI.step(1, steps, 'Stopping and removing Docker containers...')
+        # stop and remove all other containers
+        CLI.step(2, steps, 'Stopping and removing remaining containers...')
 
-            # stop and remove all containers with project prefix
-            containers = self.get_containers_starting_with(self.CONTAINER_PREFIX)
-
-            for container in containers:
-                self.docker(f'container stop {container}', return_output=True)
-                self.docker(f'container rm {container}')
+        containers = self.get_containers()
 
-            # for service in self.config['containers']['deploy']['zero_downtime'] + self.config['containers']['deploy']['restart']:
-            #     container = self.get_container_name(service)
-            #     self.docker(f'container stop {container}', return_output=True)
-            #     self.docker(f'container rm {container}')
+        for container in containers:
+            self.docker(f'container stop {container}', return_output=True)
+            self.docker(f'container rm {container}')
 
-            CLI.step(2, steps, 'Recreating Docker containers...')
-            self.docker_compose(f'--project-name={self.PROJECT_NAME} up -d')
+        # recreate project
+        CLI.step(3, steps, 'Recreating project containers...')
+        self.up()
 
-            CLI.step(3, steps, 'Prune Docker images and volumes')
-            self.docker(f'system prune --volumes --force')
+        # clean
+        CLI.step(4, steps, 'Prune Docker images and volumes')
+        self.clean()
 
     def deploy(self):
         CLI.info('Deploying...')
@@ -692,7 +684,7 @@ class DefaultManager(object):
         self.pull()
         self.reload()
 
-    def reload(self):  # todo deploy swarm
+    def reload(self):
         CLI.info('Reloading containers...')
         zero_downtime_services = self.config['containers']['deploy']['zero_downtime']
         restart_services = self.config['containers']['deploy']['restart']
@@ -713,8 +705,6 @@ class DefaultManager(object):
             num_retries = 30
             # num_retries = 20
 
-            print(self.get_containers())
-
             self.healthcheck(retries=num_retries, service=f'{service}-new', break_if_successful=True)
 
             # rename old container
@@ -770,72 +760,52 @@ class DefaultManager(object):
             self.docker_compose(f'--project-name={self.PROJECT_NAME} run -d --service-ports --name={container} {service}')
 
     def stop(self, params=None):
-        if self.SWARM:  # todo can stop service ?
-            CLI.info('Removing services...')
-            self.cmd(f'docker stack rm {self.PROJECT_NAME}')
-
-        else:
-            CLI.info('Stopping containers...')
+        CLI.info('Stopping containers...')
 
-            containers = self.get_containers() if not params else params.split(' ')
+        containers = self.get_containers() if not params else params.split(' ')
 
-            steps = len(containers)
+        steps = len(containers)
 
-            for index, container in enumerate(containers):
-                CLI.step(index + 1, steps, f'Stopping {container}')
-                self.docker(f'container stop {container}')
+        for index, container in enumerate(containers):
+            CLI.step(index + 1, steps, f'Stopping {container}')
+            self.docker(f'container stop {container}')
 
     def start(self, params=''):
-        if self.SWARM:
-            CLI.info('Starting services...')
-            self.cmd(f'docker stack deploy -c configs/{self.configs_compose_folder}/{self.COMPOSE_PREFIX}.yml -c configs/{self.configs_compose_folder}/{self.COMPOSE_PREFIX}.{self.environment_id}.yml {self.PROJECT_NAME}')
-
-        else:
-            CLI.info('Starting containers...')
+        CLI.info('Starting containers...')
 
-            containers = self.get_containers() if not params else params.split(' ')
+        containers = self.get_containers() if not params else params.split(' ')
 
-            steps = len(containers)
+        steps = len(containers)
 
-            for index, container in enumerate(containers):
-                CLI.step(index + 1, steps, f'Starting {container}')
-                self.docker(f'container start {container}')
+        for index, container in enumerate(containers):
+            CLI.step(index + 1, steps, f'Starting {container}')
+            self.docker(f'container start {container}')
 
     def run(self, params):
-        CLI.info('Run...')
-        steps = 1
-
-        CLI.step(1, steps, f'Running {params}...')
+        CLI.info(f'Running {params}...')
         self.docker_compose(f'--project-name={self.PROJECT_NAME} run {params}')
 
-    def up(self, params):
-        CLI.info('Up...')
-        steps = 1
+    def up(self, params=''):
+        CLI.info(f'Starting up {params}...')
+        self.docker_compose(f'--project-name={self.PROJECT_NAME} up {params} -d')
 
-        CLI.step(1, steps, f'Upping {params}...')
-        self.docker_compose(f'--project-name={self.PROJECT_NAME} up {params}')
+    def down(self, params=''):
+        CLI.info(f'Running down {params}...')
+        self.docker_compose(f'--project-name={self.PROJECT_NAME} down {params}')
 
     def remove(self, params=''):
-        if self.SWARM:  # todo remove containers as well ?
-            CLI.info('Removing services...')
-            self.cmd(f'docker stack rm {self.PROJECT_NAME}')
-
-        else:
-            CLI.info('Removing containers...')
+        CLI.info('Removing containers...')
 
-            containers = self.get_containers() if params == '' else params.split(' ')
+        containers = self.get_containers() if params == '' else params.split(' ')
 
-            steps = len(containers)
+        steps = len(containers)
 
-            for index, container in enumerate(containers):
-                CLI.step(index + 1, steps, f'Removing {container}')
-                self.docker(f'container rm {container}')
+        for index, container in enumerate(containers):
+            CLI.step(index + 1, steps, f'Removing {container}')
+            self.docker(f'container rm {container}')
 
     def clean(self):  # todo clean on all nodes
         CLI.info('Cleaning...')
-        steps = 1
-
-        CLI.step(1, steps, 'Prune Docker images and volumes')
         # self.docker(f'builder prune')
         self.docker(f'system prune --volumes --force')
         # self.docker(f'container prune')
@@ -845,35 +815,19 @@ class DefaultManager(object):
         CLI.info('Reloading webserver...')
         self.docker(f'exec -it {self.CONTAINER_WEBSERVER} {self.WEBSERVER} -s reload')
 
-    # TODO: Extension
-    def restart_proxy(self):
-        CLI.info('Restarting proxy...')
-        steps = 1
-
-        CLI.step(1, steps, 'Reloading proxy container...')
-        self.cmd(f'{self.docker_connection} docker compose -f configs/{self.configs_compose_folder}/docker-compose.proxy.yml --project-name=reverse up -d')
-
     def status(self):
-        if self.SWARM:  # todo remove containers as well ?
-            CLI.info('Getting status...')
-            self.cmd(f'docker stack services {self.PROJECT_NAME}')
-
-        else:
-            CLI.info('Getting status...')
-            steps = 2
+        CLI.info('Getting status...')
+        steps = 2
 
-            CLI.step(1, steps, 'List of Docker images')
-            self.docker(f'image ls')
+        CLI.step(1, steps, 'List of Docker images')
+        self.docker(f'image ls')
 
-            CLI.step(2, steps, 'Docker containers')
-            self.docker(f'container ls -a --size')
+        CLI.step(2, steps, 'Docker containers')
+        self.docker(f'container ls -a --size')
 
     def networks(self):
-        # todo for swarm
         CLI.info('Getting networks...')
-        steps = 1
-
-        CLI.step(1, steps, 'List of Docker networks')
+        CLI.warning('List of Docker networks')
 
         networks = self.docker('network ls', return_output=True)
         networks = networks.strip().split('\n')
@@ -890,27 +844,15 @@ class DefaultManager(object):
                 print(f'{network}\t{containers}'.strip())
 
     def logs(self, params=None):
-        if self.SWARM:
-            CLI.info('Reading logs...')
+        CLI.info('Reading logs...')
 
-            services = params.split(' ') if params else self.get_services()
-            lines = '--tail 100 -f' if params else '--tail 10'
-            steps = len(services)
+        containers = params.split(' ') if params else self.get_containers()
+        lines = '--tail 1000 -f' if params else '--tail 10'
+        steps = len(containers)
 
-            for index, service in enumerate(services):
-                CLI.step(index + 1, steps, f'{service} logs')
-                self.cmd(f'docker service logs {service} {lines}')
-
-        else:
-            CLI.info('Reading logs...')
-
-            containers = params.split(' ') if params else self.get_containers()
-            lines = '--tail 1000 -f' if params else '--tail 10'
-            steps = len(containers)
-
-            for index, container in enumerate(containers):
-                CLI.step(index + 1, steps, f'{container} logs')
-                self.docker(f'logs {container} {lines}')
+        for index, container in enumerate(containers):
+            CLI.step(index + 1, steps, f'{container} logs')
+            self.docker(f'logs {container} {lines}')
 
     def bash(self, params):
         CLI.info('Running bash...')
@@ -930,15 +872,9 @@ class DefaultManager(object):
         containers = self.docker(f'container ls -a --format \'{{{{.Names}}}}\'', return_output=True)
         print(containers)
         containers = containers.strip().split('\n')
-        containers = list(filter(lambda x: x.startswith(self.CONTAINER_PREFIX), containers))
+        # containers = list(filter(lambda x: x.startswith(self.CONTAINER_PREFIX), containers))
         return containers
 
-    def get_services(self):
-        services = os.popen(f'docker stack services {self.SWARM_STACK} --format \'{{{{.Name}}}}\'').read()
-        services = services.strip().split('\n')
-        services = list(filter(lambda x: x.startswith(self.CONTAINER_PREFIX), services))
-        return services
-
     def get_containers_starting_with(self, start_with):
         return [i for i in self.get_containers() if i.startswith(start_with)]
 

{mantis-cli-9.0.0 → mantis-cli-9.0.2/mantis_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: mantis-cli
-Version: 9.0.0
+Version: 9.0.2
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský

mantis-cli-9.0.0/mantis/__init__.py

@@ -1 +0,0 @@
-VERSION = '9.0.0'