Fix alembic migrations importing app

Ensure we connect to loaded config db

config_app/config_endpoints/api/suconfig.py

@@ -22,9 +22,6 @@ logger = logging.getLogger(__name__)
 
 def database_is_valid():
     """ Returns whether the database, as configured, is valid. """
-    if app.config['TESTING']:
-        return False
-
     return model.is_valid()
 
 
@@ -103,9 +100,6 @@ class SuperUserConfig(ApiResource):
                     # Link the existing user to the external user.
                     model.attach_federated_login(current_user.username, service_name, result.username)
 
-            # Ensure database is up-to-date with config
-            sync_database_with_config(config_object)
-
             return {
                 'exists': True,
                 'config': config_object
@@ -182,11 +176,12 @@ class SuperUserSetupDatabase(ApiResource):
 
             configure(combined)
             app.config['DB_URI'] = combined['DB_URI']
+            db_uri = app.config['DB_URI']
 
             log_handler = _AlembicLogHandler()
 
             try:
-                run_alembic_migration(log_handler)
+                run_alembic_migration(db_uri, log_handler)
             except Exception as ex:
                 return {
                     'error': str(ex)

config_app/config_endpoints/api/suconfig_models_pre_oci.py

@@ -4,6 +4,8 @@ from config_app.config_endpoints.api.suconfig_models_interface import SuperuserC
 
 
 class PreOCIModel(SuperuserConfigDataInterface):
+    # Note: this method is different than has_users: the user select will throw if the user
+    # table does not exist, whereas has_users assumes the table is valid
     def is_valid(self):
         try:
             list(User.select().limit(1))

config_app/config_endpoints/api/superuser.py

@@ -79,14 +79,13 @@ class SuperUserCustomCertificates(ApiResource):
         cert_views = []
         for extra_cert_path in extra_certs_found:
             try:
-                cert_full_path = config_provider.get_volume_path(EXTRA_CA_DIRECTORY, extra_cert_path)
-                with config_provider.get_volume_file(cert_full_path) as f:
-                    certificate = load_certificate(f.read())
-                    cert_views.append({
-                        'path': extra_cert_path,
-                        'names': list(certificate.names),
-                        'expired': certificate.expired,
-                    })
+                cert = config_provider.get_volume_path(EXTRA_CA_DIRECTORY, extra_cert_path)
+                certificate = load_certificate(cert)
+                cert_views.append({
+                    'path': extra_cert_path,
+                    'names': list(certificate.names),
+                    'expired': certificate.expired,
+                })
             except CertInvalidException as cie:
                 cert_views.append({
                     'path': extra_cert_path,

config_app/config_endpoints/api/tar_config_loader.py

@@ -4,7 +4,9 @@ import cStringIO
 
 from flask import request, make_response
 
-from config_app.c_app import config_provider
+from data.database import configure
+
+from config_app.c_app import app, config_provider
 from config_app.config_endpoints.api import resource, ApiResource, nickname, validate_json_request
 
 logger = logging.getLogger(__name__)
@@ -25,4 +27,10 @@ class TarConfigLoader(ApiResource):
         # TODO(sam): refactor config provider to accept a stream write to avoid loading into memory
         config_provider.load_from_tarball(config)
 
+        # now try to connect to the db provided in their config
+        combined = dict(**app.config)
+        combined.update(config_provider.get_config())
+
+        configure(combined)
+
         return make_response('OK')