jlengrand/engine
1
0
Fork 0
mirror of https://github.com/jlengrand/engine.git synced 2026-05-17 00:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify code ridibility on redis part

Browse Source
This commit is contained in:
Pierre Mavro
2020-11-27 11:58:42 +01:00
committed by Pierre Mavro
parent 08f959b65b
commit 751e6c8f5d
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cloud_provider/aws/databases/redis.rs
View File

@@ -171,10 +171,10 @@ impl Redis {
return Ok(());
}
let context = match self.tera_context(*kubernetes, *environment) {
Ok(c) => c,
Err(e) => return Err(e),
};
let context = self.tera_context(*kubernetes, *environment)?;
// deploy before destroy to avoid missing elements
self.on_create(target)?;
let _ = cast_simple_error_to_engine_error(
self.engine_error_scope(),
@@ -296,10 +296,7 @@ impl Create for Redis {
DeploymentTarget::ManagedServices(kubernetes, environment) => {
// use terraform
info!("deploy Redis on AWS Elasticcache for {}", self.name());
let context = match self.tera_context(*kubernetes, *environment) {
Ok(c) => c,
Err(e) => return Err(e),
};
let context = self.tera_context(*kubernetes, *environment)?;
let workspace_dir = self.workspace_directory();
@@ -350,10 +347,7 @@ impl Create for Redis {
// use helm
info!("deploy Redis on Kubernetes for {}", self.name());
let context = match self.tera_context(*kubernetes, *environment) {
Ok(c) => c,
Err(e) => return Err(e),
};
let context = self.tera_context(*kubernetes, *environment)?;
let workspace_dir = self.workspace_directory();
let aws = kubernetes

2
src/cloud_provider/aws/databases/utilities.rs
View File

@@ -3,7 +3,7 @@ use crate::cloud_provider::environment::Environment;
use crate::cloud_provider::kubernetes::Kubernetes;
use crate::cmd::kubectl::{kubectl_exec_create_namespace, kubectl_exec_delete_secret};
use crate::constants::{AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY};
use crate::error::{EngineError, EngineErrorCause, EngineErrorScope, SimpleError, StringError};
use crate::error::{SimpleError, StringError};
use std::collections::HashMap;
// unfortunately some proposed versions are not SemVer like Elasticache (6.x)