Merge branch 'master' into develop

Author: avara1986

.coveragerc

@@ -1,6 +1,5 @@
 [run]
 include=
     *project/*
-    *pyms/*
 omit =
     venv/*

.travis.yml

@@ -3,7 +3,13 @@ sudo: false
 cache: false
 python:
     - '3.6'
-
+addons:
+  apt:
+    sources:
+      - deadsnakes
+    packages:
+    - python3.5
+    - python3.5-dev
 install:
   - pip install -rrequirements-tests.txt
 

AUTHORS

@@ -0,0 +1,3 @@
+Alberto Vara <[email protected]>
+Hugo Camino <[email protected]>
+José Manuel <[email protected]>

Dockerfile

@@ -1,17 +1,24 @@
 FROM python:3.6.4-alpine3.7
 
-RUN apk add --update curl gcc g++ git libffi-dev openssl-dev python3-dev \
+RUN apk add --update curl gcc g++ git libffi-dev openssl-dev python3-dev build-base linux-headers \
     && rm -rf /var/cache/apk/*
 RUN ln -s /usr/include/locale.h /usr/include/xlocale.h
 
 ENV PYTHONUNBUFFERED=1 ENVIRONMENT=pre APP_HOME=/microservice/
-RUN mkdir $APP_HOME && adduser -S -D -H python
+ENV DATABASE_DIR=database
+ENV CONFIGMAP_FILE="$APP_HOME"config-docker.yml
 
+RUN mkdir $APP_HOME && adduser -S -D -H python
 RUN chown -R python $APP_HOME
 WORKDIR $APP_HOME
+
 ADD requirement*.txt $APP_HOME
+RUN pip install --upgrade pip
 RUN pip install -r requirements-docker.txt
+
 ADD . $APP_HOME
+RUN mkdir $DATABASE_DIR
+RUN chmod 777 $DATABASE_DIR
 
 EXPOSE 5000
 USER python

README.md

@@ -4,6 +4,8 @@ Barebones Python Microservices
 [![Build Status](https://travis-ci.org/python-microservices/microservices-scaffold.svg?branch=master)](https://travis-ci.org/python-microservices/microservices-scaffold)
 [![Coverage Status](https://coveralls.io/repos/github/python-microservices/microservices-scaffold/badge.svg?branch=master)](https://coveralls.io/github/python-microservices/microservices-scaffold?branch=master)
 [![Requirements Status](https://requires.io/github/python-microservices/microservices-scaffold/requirements.svg?branch=master)](https://requires.io/github/python-microservices/microservices-scaffold/requirements/?branch=master)
+[![Updates](https://pyup.io/repos/github/python-microservices/microservices-scaffold/shield.svg)](https://pyup.io/repos/github/python-microservices/microservices-scaffold/)
+[![Python 3](https://pyup.io/repos/github/python-microservices/microservices-scaffold/python-3-shield.svg)](https://pyup.io/repos/github/python-microservices/microservices-scaffold/)
 
 
 

config-docker.yml

@@ -0,0 +1,9 @@
+ms:
+  DEBUG: false
+  TESTING: false
+  APP_NAME: Template
+  APPLICATION_ROOT : /template
+  SQLALCHEMY_TRACK_MODIFICATIONS: true
+  SECRET_KEY: "gjr39dkjn344_!67#"
+  DATABASE: db.sqlite3
+  SQLALCHEMY_DATABASE_URI: sqlite:////microservice/database/db.sqlite3

config.yml

@@ -0,0 +1,9 @@
+ms:
+  DEBUG: false
+  TESTING: false
+  APP_NAME: Template
+  APPLICATION_ROOT : /template
+  SQLALCHEMY_TRACK_MODIFICATIONS: true
+  SECRET_KEY: "gjr39dkjn344_!67#"
+  DATABASE: db.sqlite3
+  SQLALCHEMY_DATABASE_URI: sqlite:////microservice/database/db.sqlite3

manage.py

@@ -3,22 +3,9 @@
 
 from project import create_app
 
-app, db = create_app()
+app = create_app()
 
 manager = Manager(app)
 
-
-@manager.command
-def create_db():
-    """Creates the db tables."""
-    db.create_all()
-
-
-@manager.command
-def drop_db():
-    """Drops the db tables."""
-    db.drop_all()
-
-
 if __name__ == '__main__':
     manager.run()

project/__init__.py

@@ -1,63 +1,23 @@
-# encoding: utf-8
+from pyms.flask.app import Microservice
 
-import logging
-import os
-
-import connexion
-from flask_injector import FlaskInjector
-from injector import Injector
-
-from project.config import CONFIG
-from pyms.healthcheck import healthcheck_blueprint
-from pyms.logger import CustomJsonFormatter
-from pyms.models import db
-from pyms.tracer.main import TracerModule
+from project.models.init_db import db
 
 __author__ = "Alberto Vara"
 __email__ = "[email protected]"
-__version__ = "0.2"
+__version__ = "0.3.1"
 
-logger = logging.getLogger('jaeger_tracing')
-logger.setLevel(logging.DEBUG)
 
-ENVIRONMENT = os.environ.get("ENVIRONMENT", "default")
+class MyMicroservice(Microservice):
+    def init_libs(self, app):
+        db.init_app(app)
+        with app.test_request_context():
+            db.create_all()
 
 
 def create_app():
     """Initialize the Flask app, register blueprints and intialize all libraries like Swagger, database, the trace system...
     return the app and the database objects.
     :return:
     """
-    environment = os.environ.get("ENVIRONMENT", "default")
-
-    app = connexion.App(__name__, specification_dir='./swagger/')
-    # app.app.json_encoder = encoder.JSONEncoder
-
-    app.add_api('swagger.yaml',
-                arguments={'title': 'Swagger Example Project'},
-                base_path=CONFIG[environment].APPLICATION_ROOT)
-
-    application = app.app
-    application.config.from_object(CONFIG[environment])
-    db.init_app(application)
-
-    # Initialize Blueprints
-    application.register_blueprint(healthcheck_blueprint)
-
-    # Inject Modules
-    if not application.config["TESTING"] and not application.config["DEBUG"]:
-        log_handler = logging.StreamHandler()
-        formatter = CustomJsonFormatter('(timestamp) (level) (name) (module) (funcName) (lineno) (message)')
-        formatter.add_service_name(application.config["APP_NAME"])
-        tracer = TracerModule(application)
-        injector = Injector([tracer])
-        FlaskInjector(app=application, injector=injector)
-        formatter.add_trace_span(tracer.tracer)
-        log_handler.setFormatter(formatter)
-        application.logger.addHandler(log_handler)
-        application.logger.setLevel(logging.INFO)
-
-    with application.test_request_context():
-        db.create_all()
-
-    return application, db
+    ms = MyMicroservice(service="ms", path=__file__)
+    return ms.create_app()