Added feature-flags #48

src/bot/config/appsettings.development.json

@@ -17,7 +17,7 @@
       "de"
     ]
   },
-  "FeatureFlag": {
+  "FeatureFlags": {
     "AdminModule": true,
     "BaseModule": true,
     "BootLogModule": true,

src/bot/config/appsettings.edrafts-pc-ubuntu.json

@@ -19,7 +19,7 @@
     "Token": "OTk4MTYwNDI3Njg5MTgxMjM3.GI7h67.BqD6Lu1Tz0MuG8iktYrcLnHi1pNozyMiWFGTKI",
     "Prefix": "!ke "
   },
-  "FeatureFlag": {
+  "FeatureFlags": {
     "AdminModule": true,
     "BaseModule": true,
     "BootLogModule": true,

src/bot/config/appsettings.production.json

@@ -28,7 +28,7 @@
     "Buffered": "true",
     "AuthPlugin": "mysql_native_password"
   },
-  "FeatureFlag": {
+  "FeatureFlags": {
     "AdminModule": true,
     "BaseModule": true,
     "BootLogModule": true,

src/bot/config/appsettings.staging.json

@@ -17,7 +17,7 @@
       "de"
     ]
   },
-  "FeatureFlag": {
+  "FeatureFlags": {
     "AdminModule": true,
     "BaseModule": true,
     "BootLogModule": true,

src/bot/main.py

@@ -8,6 +8,7 @@ from bot.application import Application
 from bot.startup import Startup
 from bot.startup_discord_extension import StartupDiscordExtension
 from bot.startup_migration_extension import StartupMigrationExtension
+from bot.startup_settings_extension import StartupSettingsExtension
 from modules.boot_log.boot_log_extension import BootLogExtension
 from modules.database.database_extension import DatabaseExtension
 
@@ -18,12 +19,13 @@ class Program:
         self.app: Optional[Application] = None
 
     async def start(self):
-        app_builder = ApplicationBuilder(Application)
-        app_builder.use_extension(StartupDiscordExtension)
-        app_builder.use_extension(StartupMigrationExtension)
-        app_builder.use_extension(BootLogExtension)
-        app_builder.use_extension(DatabaseExtension)
-        app_builder.use_startup(Startup)
+        app_builder = ApplicationBuilder(Application) \
+            .use_extension(StartupSettingsExtension) \
+            .use_extension(StartupDiscordExtension) \
+            .use_extension(StartupMigrationExtension) \
+            .use_extension(BootLogExtension) \
+            .use_extension(DatabaseExtension) \
+            .use_startup(Startup)
         self.app: Application = await app_builder.build_async()
         await self.app.run_async()
 

src/bot/startup.py

@@ -1,5 +1,3 @@
-import os
-from datetime import datetime
 from typing import Optional
 
 from cpl_core.application import StartupABC
@@ -37,22 +35,10 @@ class Startup(StartupABC):
 
     def __init__(self):
         StartupABC.__init__(self)
-        self._start_time = datetime.now()
-
         self._config: Optional[ConfigurationABC] = None
         self._feature_flags: Optional[FeatureFlagsSettings] = None
 
     def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
-        environment.set_working_directory(os.path.dirname(os.path.realpath(__file__)))
-        configuration.add_environment_variables('KDB_')
-        configuration.add_environment_variables('DISCORD_')
-
-        configuration.add_json_file(f'config/appsettings.json', optional=False)
-        configuration.add_json_file(f'config/appsettings.{environment.environment_name}.json', optional=True)
-        configuration.add_json_file(f'config/appsettings.{environment.host_name}.json', optional=True)
-
-        configuration.add_configuration('Startup_StartTime', str(self._start_time))
-
         self._config = configuration
         self._feature_flags = configuration.get_configuration(FeatureFlagsSettings)
         return configuration

src/bot/startup_settings_extension.py

@@ -0,0 +1,28 @@
+import os
+from datetime import datetime
+
+from cpl_core.application import StartupExtensionABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceCollectionABC
+from cpl_core.environment import ApplicationEnvironmentABC
+
+
+class StartupSettingsExtension(StartupExtensionABC):
+
+    def __init__(self):
+        self._start_time = datetime.now()
+
+    def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironmentABC):
+        # this shit has to be done here because we need settings in subsequent startup extensions
+        environment.set_working_directory(os.path.dirname(os.path.realpath(__file__)))
+        configuration.add_environment_variables('KDB_')
+        configuration.add_environment_variables('DISCORD_')
+
+        configuration.add_json_file(f'config/appsettings.json', optional=False)
+        configuration.add_json_file(f'config/appsettings.{environment.environment_name}.json', optional=True)
+        configuration.add_json_file(f'config/appsettings.{environment.host_name}.json', optional=True)
+
+        configuration.add_configuration('Startup_StartTime', str(self._start_time))
+
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+        pass