Merge pull request #111 from ebridges/feature/deploy-refinements

feature/deploy refinements

.gitignore

@@ -38,4 +38,4 @@ temp-requirements.txt
 project/test-db.sqlite3
 requirements.txt
 .doit.db
-build-tmp/
+deploy-tmp/

.gitmodules

@@ -5,7 +5,3 @@
 [submodule "application/js/javascript-load-image"]
 	path = application/js/javascript-load-image
 	url = https://github.com/blueimp/JavaScript-Load-Image.git
-
-[submodule "functions/thumbnails"]
-	path = functions/thumbnails
-	url = https://github.com/ebridges/thumbnailer.git

application/elektrum/build/build.py → application/elektrum/deploy/deploy.py

@@ -7,7 +7,7 @@
 from doit.action import CmdAction
 from doit.tools import result_dep
 
-from elektrum.build.task_actions import (
+from elektrum.deploy.task_actions import (
     envfile,
     environment,
     config_action,
@@ -17,10 +17,10 @@
     ApplicationServiceInfo,
 )
 
-VERBOSITY = 1
+DOIT_CONFIG = {'verbosity': 1}
 
-
-# Hack @todo -- still needed?
+# HACK: Handles first time case where envfile does not exist,
+#       causes config tasks to be run 2x
 if not isfile(envfile()):
     actions = config_action()
     for action in actions:
@@ -42,14 +42,14 @@ def task_config():
         'targets': [envfile()],
         'file_dep': file_deps,
         'actions': action,
-        'verbosity': VERBOSITY,
+        'verbosity': 2,
     }
 
 
 def task_application_service_version():
     """Returns version of application for current environment."""
     i = ApplicationServiceInfo()
-    return {'actions': [environment, i.version], 'verbosity': 1}
+    return {'actions': [environment, i.version]}
 
 
 def task_application_service_deploy():
@@ -58,7 +58,6 @@ def task_application_service_deploy():
     return {
         'file_dep': i.deploy_deps(),
         'actions': i.deploy_actions(),
-        'verbosity': 1,
         'uptodate': [result_dep('application_service_version')],
     }
 
@@ -85,7 +84,7 @@ def task_application_service_migrations():
 def task_thumbnail_service_version():
     """Returns version of thumbnailer for current environment."""
     i = ThumbnailServiceInfo()
-    return {'actions': [environment, i.version], 'verbosity': 1}
+    return {'actions': [environment, i.version]}
 
 
 def task_thumbnail_service_deploy():
@@ -94,15 +93,14 @@ def task_thumbnail_service_deploy():
     return {
         'file_dep': i.deploy_deps(),
         'actions': i.deploy_actions(),
-        'verbosity': 1,
         'uptodate': [result_dep('thumbnail_service_version')],
     }
 
 
 def task_processor_service_version():
     """Returns version of processor for current environment."""
     i = ProcessorServiceInfo()
-    return {'actions': [environment, i.version], 'verbosity': 1}
+    return {'actions': [environment, i.version]}
 
 
 def task_processor_service_deploy():
@@ -111,7 +109,6 @@ def task_processor_service_deploy():
     return {
         'file_dep': i.deploy_deps(),
         'actions': i.deploy_actions(),
-        'verbosity': 1,
         'uptodate': [result_dep('processor_service_version')],
     }
 
@@ -123,5 +120,4 @@ def task_processor_service_config():
         'task_dep': ['processor_service_deploy'],
         'file_dep': i.config_deps(),
         'actions': i.config_action(),
-        'verbosity': VERBOSITY,
     }

application/elektrum/build/task_actions.py → application/elektrum/deploy/task_actions.py

@@ -7,9 +7,9 @@
 
 from doit.action import CmdAction
 
-from elektrum.build_util import download_github_release, slurp, get_encrypted_field, decrypt_value
+from elektrum.deploy_util import download_github_release, slurp, get_encrypted_field, decrypt_value
 
-ELEKTRUM_APPLICATION_VERSION = {'development': '0.1.0', 'staging': '0.1.0', 'production': '0.1.0'}
+ELEKTRUM_APPLICATION_VERSION = {'development': '0.2.1', 'staging': '0.2.1', 'production': '0.2.1'}
 ELEKTRUM_PROCESSOR_VERSION = {'development': '1.1.2', 'staging': '1.1.2', 'production': '1.1.2'}
 ELEKTRUM_THUMBNAIL_VERSION = {'development': '1.2.3', 'staging': '1.2.3', 'production': '1.2.3'}
 
@@ -49,7 +49,7 @@ def config_action(tags='iam,vpc,rds,sss,acm,cdn,dns,ses,cfg'):
 class ApplicationServiceInfo:
     def __init__(self):
         self.name = f'{service()}-application'
-        self.downloaddir = f'./build-tmp/{self.name}'
+        self.downloaddir = f'./deploy-tmp/{self.name}'
         self.archive = f'{self.name}-{environment()}-{self.version()}.zip'
         self.target = f'{self.downloaddir}/{self.archive}'
         self.github_auth_token = environ['GITHUB_OAUTH_TOKEN']
@@ -122,7 +122,7 @@ def static_actions(self):
         return [CmdAction('make static', cwd='application')]
 
     def static_deps(self):
-        deps = [f for f in glob(f'{self.appdir}/static/**', recursive=True) if isfile(f)]
+        deps = [f for f in glob(f'application/static/**', recursive=True) if isfile(f)]
         return deps
 
     def migration_actions(self):
@@ -132,7 +132,7 @@ def migration_actions(self):
 class ProcessorServiceInfo:
     def __init__(self):
         self.name = f'{service()}-processor'
-        self.downloaddir = f'./build-tmp/{self.name}'
+        self.downloaddir = f'./deploy-tmp/{self.name}'
         self.archive = f'{self.name}-{self.version()}.zip'
         self.target = f'{self.downloaddir}/{self.archive}'
         self.github_auth_token = environ['GITHUB_OAUTH_TOKEN']
@@ -186,7 +186,7 @@ def config_action(self):
 class ThumbnailServiceInfo:
     def __init__(self):
         self.name = 'thumbnailer'
-        self.downloaddir = f'./build-tmp/{self.name}'
+        self.downloaddir = f'./deploy-tmp/{self.name}'
         self.archive = f'{service()}-thumbnails-{self.version()}.zip'
         self.target = f'{self.downloaddir}/{self.archive}'
         self.github_auth_token = environ['GITHUB_OAUTH_TOKEN']

application/media_items/tests/test_media_item_upload.py

@@ -15,8 +15,8 @@
 from users.tests.factories import USER_PASSWORD
 from media_items.models import MediaItem
 from base.tests.util import match_image_key
-from elektrum.build_util import download_github_release
-from elektrum.build.task_actions import ELEKTRUM_PROCESSOR_VERSION
+from elektrum.deploy_util import download_github_release
+from elektrum.deploy.task_actions import ELEKTRUM_PROCESSOR_VERSION
 import sys
 
 

build → deploy

@@ -29,4 +29,4 @@ export PYTHONPATH="$(pwd)/${root_dir}:$PYTHONPATH"
 export PATH=${PATH}:${VIRTUAL_ENV}/bin
 export ANSIBLE_FORCE_COLOR=1
 
-doit --file=${root_dir}/elektrum/build/build.py --dir=$(pwd) --failure-verbosity=2 ${@}
+doit --file=${root_dir}/elektrum/deploy/deploy.py --dir=$(pwd) --failure-verbosity=2 ${@}