Apply service companion templates

aixigo · Jan 31, 2019 · be5362dc4e847b9ae0c309e69482331800d9dfdd · be5362d
1 parent 747e4d5
commit be5362dc4e847b9ae0c309e69482331800d9dfdd
diff --git a/api/src/apps.rs b/api/src/apps.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/commands/create_app_command.rs b/api/src/commands/create_app_command.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/commands/delete_app_command.rs b/api/src/commands/delete_app_command.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/commands/list_apps_command.rs b/api/src/commands/list_apps_command.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/commands/list_tickets_command.rs b/api/src/commands/list_tickets_command.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/commands/mod.rs b/api/src/commands/mod.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/main.rs b/api/src/main.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/models/mod.rs b/api/src/models/mod.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/models/request_info.rs b/api/src/models/request_info.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/models/service.rs b/api/src/models/service.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/models/ticket_info.rs b/api/src/models/ticket_info.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/models/web_hook_info.rs b/api/src/models/web_hook_info.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/services/apps_service.rs b/api/src/services/apps_service.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,7 +27,9 @@
 use crate::models::service::{ContainerType, Service, ServiceConfig, ServiceError};
 use crate::services::config_service::{Config, ConfigError};
 use crate::services::docker::docker_infrastructure::DockerInfrastructure;
-  
-use crate::services::service_templating::apply_templating_for_application_companion;
+  
+use crate::services::service_templating::{
+  
+    apply_templating_for_application_companion, apply_templating_for_service_companion,
+  
+};
 use crate::services::{
    images_service::{ImagesService, ImagesServiceError},
    infrastructure::Infrastructure,
@@ -89,6 +91,8 @@ impl AppsService {
            }
        }
+  
+        // TODO: when replication resolves port mapping this could be performed before replicating
+  
+        // serivce configurations
        let images_service = ImagesService::new();
        let mappings = images_service.resolve_image_ports(&configs)?;
        for config in configs.iter_mut() {
@@ -97,6 +101,21 @@ impl AppsService {
            }
        }
+  
+        let mut service_companions = Vec::new();
+  
+        for config in &configs {
+  
+            let companions = self.config.get_service_companion_configs()?;
+  
+
+  
+            service_companions.extend(
+  
+                companions
+  
+                    .iter()
+  
+                    .map(|c| apply_templating_for_service_companion(config, app_name, c))
+  
+                    .filter_map(|r| r.ok())
+  
+                    .collect::<Vec<ServiceConfig>>(),
+  
+            );
+  
+        }
+  
+
+  
+        configs.extend(service_companions);
+  
+
        for app_companion_config in self.config.get_application_companion_configs()? {
            let applied_template_config = apply_templating_for_application_companion(
                &app_companion_config,

diff --git a/api/src/services/config_service.rs b/api/src/services/config_service.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -111,33 +111,38 @@ impl Config {
    }
    pub fn get_service_companion_configs(&self) -> Result<Vec<ServiceConfig>, ConfigError> {
-  
-        Ok(self.get_companion_configs(|companion| companion.companion_type == CompanionType::Service)?)
+  
+        Ok(self.get_companion_configs(|companion| {
+  
+            companion.companion_type == CompanionType::Service
+  
+        })?)
    }
    pub fn get_application_companion_configs(&self) -> Result<Vec<ServiceConfig>, ConfigError> {
-  
-        Ok(self.get_companion_configs(|companion| companion.companion_type == CompanionType::Application)?)
+  
+        Ok(self.get_companion_configs(|companion| {
+  
+            companion.companion_type == CompanionType::Application
+  
+        })?)
    }
    fn get_companion_configs<P>(&self, predicate: P) -> Result<Vec<ServiceConfig>, ConfigError>
-  
-        where P: FnMut(&&Companion) -> bool, {
-  
-
+  
+    where
+  
+        P: FnMut(&&Companion) -> bool,
+  
+    {
        let mut companions = Vec::new();
        for companion in self
            .companions
            .iter()
            .flat_map(|companions| companions.values())
            .filter(predicate)
-  
-            {
-  
-                let mut config = ServiceConfig::try_from(companion)?;
+  
+        {
+  
+            let mut config = ServiceConfig::try_from(companion)?;
-  
-                config.set_container_type(match &companion.companion_type {
-  
-                    CompanionType::Application => ContainerType::ApplicationCompanion,
-  
-                    CompanionType::Service => ContainerType::ServiceCompanion,
-  
-                });
+  
+            config.set_container_type(match &companion.companion_type {
+  
+                CompanionType::Application => ContainerType::ApplicationCompanion,
+  
+                CompanionType::Service => ContainerType::ServiceCompanion,
+  
+            });
-  
-                companions.push(config);
-  
-            }
+  
+            companions.push(config);
+  
+        }
        Ok(companions)
    }
@@ -297,7 +302,6 @@ mod tests {
        });
    }
-  
-
    #[test]
    fn should_return_application_companions_as_service_configs_with_volumes() {
        let config_str = r#"

diff --git a/api/src/services/docker/docker_infrastructure.rs b/api/src/services/docker/docker_infrastructure.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/services/docker/mod.rs b/api/src/services/docker/mod.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/services/images_service.rs b/api/src/services/images_service.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/services/infrastructure.rs b/api/src/services/infrastructure.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/api/src/services/mod.rs b/api/src/services/mod.rs
@@ -10,10 +10,10 @@
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-  
- * 
+  
+ *
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-  
- * 
+  
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE