Replaced main.disable_services by "enabled" flags in every service

Author: Pedro Crespo

services/web/server/src/simcore_service_webserver/application_config.py

@@ -42,7 +42,6 @@ def create_schema():
             "client_outdir": T.String(),
             "log_level": T.Enum(*logging._nameToLevel.keys()), # pylint: disable=protected-access
             "testing": T.Bool(),
-            T.Key("disable_services", default=[], optional=True): T.List(T.String()), # TODO: optional enable function in every section
         }),
         db_config.CONFIG_SECTION_NAME: db_config.schema,
         director_config.CONFIG_SECTION_NAME: director_config.schema,

services/web/server/src/simcore_service_webserver/computation.py

@@ -21,13 +21,12 @@
 def setup(app: web.Application):
     log.debug("Setting up %s [service: %s] ...", __name__, SERVICE_NAME)
 
-    disable_services = app[APP_CONFIG_KEY].get("main", {}).get("disable_services",[])
-    if SERVICE_NAME in disable_services:
+    cfg = app[APP_CONFIG_KEY][CONFIG_SECTION_NAME]
+
+    if not cfg["enabled"]:
         log.warning("Service '%s' explicitly disabled in config", SERVICE_NAME)
         return
 
-    assert CONFIG_SECTION_NAME in app[APP_CONFIG_KEY]
-
     # subscribe to rabbit upon startup
     # TODO: REmoved temporarily!
     # TODO: Define connection policies (e.g. {on-startup}, lazy). Could be defined in config-file

services/web/server/src/simcore_service_webserver/computation_config.py

@@ -5,10 +5,12 @@
 """
 from simcore_sdk.config.rabbit import CONFIG_SCHEMA as _RABBIT_SCHEMA
 
-#import trafaret as T
+import trafaret as T
 
 SERVICE_NAME = 'rabbit'
 CONFIG_SECTION_NAME = SERVICE_NAME
 
 
-schema = _RABBIT_SCHEMA
+schema = _RABBIT_SCHEMA.merge(T.Dict({
+    T.Key("enabled", default=True, optional=True): T.Bool()
+}))

services/web/server/src/simcore_service_webserver/config/host-dev-config.yaml

@@ -5,8 +5,8 @@ main:
   log_level: INFO
   port: 8080
   testing: true
-  disable_services: []
 db:
+  enabled: True
   init_tables: True
   postgres:
     database: simcoredb
@@ -21,6 +21,7 @@ director:
   host: director
   port: 8001
 rabbit:
+  enabled: True
   channels:
     log: comp.backend.channels.log
     progress: comp.backend.channels.progress

services/web/server/src/simcore_service_webserver/config/server-defaults.yaml

@@ -5,7 +5,6 @@ main:
   log_level: DEBUG
   port: 8080
   testing: true
-  disable_services: []
 director:
   host: director
   port: 8001

services/web/server/src/simcore_service_webserver/db.py

@@ -93,17 +93,15 @@ async def is_service_responsive(app:web.Application):
         return False
 
 def setup(app: web.Application):
+    log.debug("Setting up %s [service: %s] ...", __name__, THIS_SERVICE_NAME)
 
-    disable_services = app[APP_CONFIG_KEY]["main"]["disable_services"]
+    cfg = app[APP_CONFIG_KEY][CONFIG_SECTION_NAME]
 
-    if THIS_SERVICE_NAME in disable_services:
+    if not cfg["enabled"]:
         app[APP_DB_ENGINE_KEY] = app[APP_DB_SESSION_KEY] = None
-        log.warning("Service '%s' explicitly disabled in cfgig", THIS_SERVICE_NAME)
+        log.warning("Service '%s' explicitly disabled in config", THIS_SERVICE_NAME)
         return
 
-    # app is created at this point but not yet started
-    log.debug("Setting up %s [service: %s] ...", __name__, THIS_SERVICE_NAME)
-
     # ensures keys exist
     app[APP_DB_ENGINE_KEY] = None
     app[APP_DB_SESSION_KEY] = None

services/web/server/src/simcore_service_webserver/db_config.py

@@ -13,5 +13,5 @@
 schema = T.Dict({
     T.Key("postgres"): _PG_SCHEMA,
     T.Key("init_tables", default=False): T.Bool(),
-    T.Key("disable", default=False, optional=True): T.Bool()
+    T.Key("enabled", default=True, optional=True): T.Bool()
 })

services/web/server/src/simcore_service_webserver/director/__init__.py

@@ -16,7 +16,11 @@
 def setup(app: web.Application):
     logger.debug("Setting up %s ...", __name__)
 
-    assert CONFIG_SECTION_NAME in app[APP_CONFIG_KEY]
+    cfg = app[APP_CONFIG_KEY][CONFIG_SECTION_NAME]
+
+    if not cfg["enabled"]:
+        logger.warning("'%s' explicitly disabled in config", __name__)
+        return
 
 
     # TODO: implement!!!

services/web/server/src/simcore_service_webserver/director/config.py

@@ -9,6 +9,7 @@
 CONFIG_SECTION_NAME = 'director'
 
 schema = T.Dict({
+    T.Key("enabled", default=True, optional=True): T.Bool(),
     "host": T.String(),
     "port": T.Int()
 })

services/web/server/src/simcore_service_webserver/login/__init__.py

@@ -23,6 +23,7 @@
 
 
 async def pg_pool(app: web.Application):
+
     smtp_config = app[APP_CONFIG_KEY][SMTP_SECTION]
     config = {"SMTP_{}".format(k.upper()): v for k, v in smtp_config.items()}
     #'SMTP_SENDER': None,
@@ -50,6 +51,13 @@ def setup(app: web.Application):
 
     # TODO: requires rest ready!
     assert SMTP_SECTION in app[APP_CONFIG_KEY]
+    assert DB_SECTION in app[APP_CONFIG_KEY]
+
+    # TODO: automatize dependencies
+    enabled = all( app[APP_CONFIG_KEY].get(mod, {}).get("enabled", True) for mod in (SMTP_SECTION, DB_SECTION) )
+    if not enabled:
+        log.warning("Disabling '%s' since %s or %s were explictily disabled in config", __name__, SMTP_SECTION, DB_SECTION)
+        return
 
     # routes
     specs = app[APP_OPENAPI_SPECS_KEY]

services/web/server/tests/login/config.yaml

@@ -5,8 +5,8 @@ main:
   log_level: DEBUG
   port: 8080
   testing: true
-  disable_services: ['rabbit', 'director', 's3']
 director:
+  enabled: False
   host: director
   port: 8001
 db:
@@ -21,12 +21,14 @@ db:
     minsize: 1
     endpoint: postgres:5432
 rabbit:
+  enabled: False
   channels:
     log: comp.backend.channels.log
     progress: comp.backend.channels.progress
   password: simcore
   user: simcore
 # s3:
+#   enabled: False
 #   access_key: 'Q3AM3UQ867SPQQA43P2F'
 #   bucket_name: simcore
 #   endpoint: play.minio.io:9000

services/web/server/tests/unit/mock/configs/light-test.yaml

@@ -7,13 +7,11 @@ main:
   client_outdir: ../../../client/source-output
   log_level: DEBUG
   testing: True
-  disable_services:
-  - postgres
-  - rabbit
 director:
   host: localhost
   port: 8001
 db:
+  enabled: False
   postgres:
     database: test_db
     user: test_user
@@ -23,6 +21,7 @@ db:
     # DEPRECATE OR add postgresql+psycopg2:// otherwise will fail sqlalchemy.exc.ArgumentError: Could not parse rfc1738 URL from string 'localhost:5432'
     endpoint: localhost:5432
 rabbit:
+  enabled: False
   host: ${RABBIT_HOST}
   password: simcore
   user: simcore

services/web/server/tests/unit/mock/configs/minimum.yaml

@@ -7,13 +7,11 @@ main:
   client_outdir: client/source-output
   log_level: DEBUG
   testing: True
-  disable_services:
-  - postgres
-  - rabbit
 director:
   host: localhost
   port: 8001
 db:
+  enabled: False
   postgres:
     database: test_db
     user: test_user
@@ -23,6 +21,7 @@ db:
     # DEPRECATE OR add postgresql+psycopg2:// otherwise will fail sqlalchemy.exc.ArgumentError: Could not parse rfc1738 URL from string 'localhost:5432'
     endpoint: localhost:5432
 rabbit:
+  enabled: False
   host: foo
   password: simcore
   user: simcore