Dump running Drucker service configurations for backup

.gitignore

@@ -109,9 +109,10 @@ app/drucker_pb2_grpc.py
 
 # sqlite
 app/db.sqlite3
+app/db.test.sqlite3
 
 # DB migration
-app/migration/versions/
+app/migrations/
 
 # Kube config
 app/kube-config/

CHANGELOG.md

@@ -0,0 +1,37 @@
+# Change Log
+
+## [v0.3.2](https://github.com/drucker/drucker-dashboard/tree/v0.3.2) (2018-08-22)
+[Full Changelog](https://github.com/drucker/drucker-dashboard/compare/v0.3.1...v0.3.2)
+
+**Merged pull requests:**
+
+- Fix MultipleResultsFound error [\#15](https://github.com/drucker/drucker-dashboard/pull/15) ([keigohtr](https://github.com/keigohtr))
+- \[Hotfix\] Add `JWT\_TOKEN\_KEY` when fetch `rawMultiRequest` [\#13](https://github.com/drucker/drucker-dashboard/pull/13) ([keigohtr](https://github.com/keigohtr))
+- fix invalid datetime [\#12](https://github.com/drucker/drucker-dashboard/pull/12) ([yuki-mt](https://github.com/yuki-mt))
+- Add Service/Model list view [\#11](https://github.com/drucker/drucker-dashboard/pull/11) ([keigohtr](https://github.com/keigohtr))
+
+## [v0.3.1](https://github.com/drucker/drucker-dashboard/tree/v0.3.1) (2018-08-15)
+[Full Changelog](https://github.com/drucker/drucker-dashboard/compare/v0.3.0...v0.3.1)
+
+**Merged pull requests:**
+
+- Add a function that allows you to select a model when booting a new service [\#10](https://github.com/drucker/drucker-dashboard/pull/10) ([keigohtr](https://github.com/keigohtr))
+- Add convert function and fix wrong cpu values [\#9](https://github.com/drucker/drucker-dashboard/pull/9) ([jkw552403](https://github.com/jkw552403))
+- \[Hotfix\] Change code generator [\#8](https://github.com/drucker/drucker-dashboard/pull/8) ([keigohtr](https://github.com/keigohtr))
+- Add `progress\_deadline\_seconds` option [\#6](https://github.com/drucker/drucker-dashboard/pull/6) ([keigohtr](https://github.com/keigohtr))
+
+## [v0.3.0](https://github.com/drucker/drucker-dashboard/tree/v0.3.0) (2018-08-08)
+[Full Changelog](https://github.com/drucker/drucker-dashboard/compare/v0.2.0...v0.3.0)
+
+**Merged pull requests:**
+
+- Add version info [\#5](https://github.com/drucker/drucker-dashboard/pull/5) ([keigohtr](https://github.com/keigohtr))
+- Add `commit\_message` to be a rolling-update trigger [\#4](https://github.com/drucker/drucker-dashboard/pull/4) ([keigohtr](https://github.com/keigohtr))
+- Add favicon [\#3](https://github.com/drucker/drucker-dashboard/pull/3) ([keigohtr](https://github.com/keigohtr))
+- Change text [\#2](https://github.com/drucker/drucker-dashboard/pull/2) ([keigohtr](https://github.com/keigohtr))
+- Add LDAP authentication [\#1](https://github.com/drucker/drucker-dashboard/pull/1) ([sugyan](https://github.com/sugyan))
+
+## [v0.2.0](https://github.com/drucker/drucker-dashboard/tree/v0.2.0) (2018-07-25)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

app/__init__.py

@@ -1,8 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-import os
-import sys
-
-sd = os.path.abspath(os.path.dirname(__file__))
-sys.path.append(sd)

app/apis/__init__.py

@@ -1,12 +1,12 @@
 import traceback
-from flask_restplus import Api, Resource
+from flask_restplus import Api
+from app import logger
 from apis.api_kubernetes import kube_info_namespace
 from apis.api_application import app_info_namespace
 from apis.api_service import srv_info_namespace
 from apis.api_model import mdl_info_namespace
-from apis.common import logger
+from apis.api_misc import misc_info_namespace
 from auth import Auth
-from utils.env_loader import config
 from kubernetes.client.rest import ApiException
 from models import db
 
@@ -19,15 +19,6 @@
 )
 
 
-@api.route('/settings')
-class Settings(Resource):
-    def get(self):
-        result = {
-            'auth': 'auth' in config
-        }
-        return result
-
-
 @api.errorhandler(ApiException)
 def api_exception_handler(error):
     logger.error(str(error))
@@ -49,3 +40,4 @@ def default_error_handler(error):
 api.add_namespace(app_info_namespace, path='/api/applications')
 api.add_namespace(srv_info_namespace, path='/api/applications')
 api.add_namespace(mdl_info_namespace, path='/api/applications')
+api.add_namespace(misc_info_namespace, path='/api')

app/apis/api_application.py

@@ -4,12 +4,12 @@
 
 from flask_restplus import Namespace, fields, Resource, reqparse
 
+from app import logger
 from models import db
 from models.application import Application
 from models.service import Service
-
 from core.drucker_dashboard_client import DruckerDashboardClient
-from apis.common import logger, DatetimeToTimestamp
+from apis.common import DatetimeToTimestamp
 
 
 app_info_namespace = Namespace('applications', description='Application Endpoint.')
@@ -102,13 +102,17 @@ def post(self):
                                description=description)
             db.session.add(aobj)
             db.session.flush()
-        sobj = Service(application_id=aobj.application_id,
-                       service_name=service_name,
-                       display_name=display_name,
-                       service_level=service_level,
-                       host=host,
-                       description=description)
-        db.session.add(sobj)
+        sobj = db.session.query(Service).filter(
+            Service.service_name == service_name).one_or_none()
+        if sobj is None:
+            sobj = Service(application_id=aobj.application_id,
+                           service_name=service_name,
+                           display_name=display_name,
+                           service_level=service_level,
+                           host=host,
+                           description=description)
+            db.session.add(sobj)
+            db.session.flush()
         response_body = {"status": True, "message": "Success."}
         db.session.commit()
         db.session.close()