assemblyline-core 4.5.1.dev441__tar.gz → 4.5.1.dev443__tar.gz

{assemblyline_core-4.5.1.dev441 → assemblyline_core-4.5.1.dev443}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: assemblyline-core
-Version: 4.5.1.dev441
+Version: 4.5.1.dev443
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.5.1.dev443/assemblyline_core/VERSION

@@ -0,0 +1 @@
+4.5.1.dev443

{assemblyline_core-4.5.1.dev441 → assemblyline_core-4.5.1.dev443}/assemblyline_core/scaler/controllers/docker_ctl.py

@@ -189,10 +189,10 @@ class DockerController(ControllerInterface):
         volumes = {row[0]: {'bind': row[1], 'mode': 'ro'} for row in self.global_mounts}
 
         # Define environment variables
-        env = [f'{_e.name}={_e.value}' for _e in cfg.environment]
-        env += [f'{name}={os.environ[name]}' for name in INHERITED_VARIABLES if name in os.environ]
+        env = [f'{name}={os.environ[name]}' for name in INHERITED_VARIABLES if name in os.environ]
         env += [f'LOG_LEVEL={self.log_level}', f'AL_SERVICE_NAME={service_name}']
         env += [f'{_n}={_v}' for _n, _v in self._service_limited_env[service_name].items()]
+        env += [f'{_e.name}={_e.value}' for _e in cfg.environment]
         if prof.privileged:
             env.append('PRIVILEGED=true')
             volumes.update({row[0]: {'bind': row[1], 'mode': 'ro'} for row in self.core_mounts})

{assemblyline_core-4.5.1.dev441 → assemblyline_core-4.5.1.dev443}/assemblyline_core/scaler/scaler_server.py

@@ -70,6 +70,7 @@ DOCKER_CONFIGURATION_PATH = os.getenv('DOCKER_CONFIGURATION_PATH', None)
 DOCKER_CONFIGURATION_VOLUME = os.getenv('DOCKER_CONFIGURATION_VOLUME', None)
 
 SERVICE_API_HOST = os.getenv('SERVICE_API_HOST', None)
+SERVICE_API_KEY = os.getenv('SERVICE_API_KEY', None)
 INTERNAL_ENCRYPT = bool(SERVICE_API_HOST and SERVICE_API_HOST.startswith('https'))
 
 
@@ -303,6 +304,11 @@ class ScalerServer(ThreadedCoreBase):
                 [EnvironmentVariable(dict(name="SERVICE_API_HOST", value=SERVICE_API_HOST))] + \
                 [env for env in service_defaults_config.environment if env.name != "SERVICE_API_HOST"]
 
+        if SERVICE_API_KEY:
+            service_defaults_config.environment = \
+                [EnvironmentVariable(dict(name="SERVICE_API_KEY", value=SERVICE_API_KEY))] + \
+                [env for env in service_defaults_config.environment if env.name != "SERVICE_API_KEY"]
+
         if self.config.core.scaler.additional_labels:
             labels.update({k: v for k, v in (_l.split("=") for _l in self.config.core.scaler.additional_labels)})
 

{assemblyline_core-4.5.1.dev441 → assemblyline_core-4.5.1.dev443}/assemblyline_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: assemblyline-core
-Version: 4.5.1.dev441
+Version: 4.5.1.dev443
 Summary: Assemblyline 4 - Core components
 Home-page: https://github.com/CybercentreCanada/assemblyline-core/
 Author: CCCS Assemblyline development team

assemblyline_core-4.5.1.dev441/assemblyline_core/VERSION

@@ -1 +0,0 @@
-4.5.1.dev441

{assemblyline_core-4.5.1.dev441 → assemblyline_core-4.5.1.dev443}/assemblyline_core/scaler/controllers/kubernetes_ctl.py

@@ -713,8 +713,6 @@ class KubernetesController(ControllerInterface):
             environment_variables += [V1EnvVar(name=_n, value=_v) for _n, _v in self.core_env.items()]
             environment_variables.extend(self.core_secret_env)
             environment_variables.append(V1EnvVar(name='PRIVILEGED', value='true'))
-        # Overwrite them with configured special environment variables
-        environment_variables += [V1EnvVar(name=_e.name, value=_e.value) for _e in container_config.environment]
         # Overwrite those with special hard coded variables
         environment_variables += [
             V1EnvVar(name='AL_SERVICE_NAME', value=service_name),
@@ -723,6 +721,8 @@ class KubernetesController(ControllerInterface):
         # Overwrite ones defined dynamically by dependency container launches
         for name, value in self._service_limited_env[service_name].items():
             environment_variables.append(V1EnvVar(name=name, value=value))
+        # Overwrite them with configured special environment variables
+        environment_variables += [V1EnvVar(name=_e.name, value=_e.value) for _e in container_config.environment]
         image_pull_policy = 'Always' if DEV_MODE else 'IfNotPresent'
         return [V1Container(
             name=deployment_name,