diff options
author | notgne2 | 2020-10-10 10:31:58 -0700 |
---|---|---|
committer | notgne2 | 2020-10-10 10:31:58 -0700 |
commit | 4a2b677e892845b121d353864d54aec92a411e48 (patch) | |
tree | 39de25748b17ee9d2236a74e297b9bd7c33f6e28 /src | |
parent | db8301a45796cd919cbfa085f85ac6288e73a8db (diff) | |
parent | 219d55e99e792a093c12dbc045bed88a4bfe1916 (diff) |
Merge branch 'master' of github.com:notgne2/deploy-rs into master
Diffstat (limited to '')
-rw-r--r-- | src/main.rs | 14 | ||||
-rw-r--r-- | src/utils/mod.rs | 25 |
2 files changed, 0 insertions, 39 deletions
diff --git a/src/main.rs b/src/main.rs index 04d7868..b28a520 100644 --- a/src/main.rs +++ b/src/main.rs @@ -349,20 +349,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { hostname: opts.hostname, }; - match (cmd_overrides.purity(), deploy_flake.node, deploy_flake.profile) { - (utils::OverridePurity::ErrorProfile, _, None) => good_panic!( - "You have specified an override not suitible for deploying to multiple profiles, please specify your target profile explicitly" - ), - (utils::OverridePurity::Error, None, _) => good_panic!( - "You have specified an override not suitible for deploying to multiple nodes, please specify your target node explicitly" - ), - - (utils::OverridePurity::Warn, None, _) => warn!( - "Certain overrides you have provided might be dangerous when used on multiple nodes or profiles, be cautious" - ), - _ => (), - }; - let supports_flakes = test_flake_support().await?; let data = diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 51f977f..672a9ba 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -28,31 +28,6 @@ pub struct CmdOverrides { pub hostname: Option<String>, } -pub enum OverridePurity { - ErrorProfile, - Error, - Warn, - Pure, -} - -impl CmdOverrides { - pub fn purity(&self) -> OverridePurity { - if self.profile_user.is_some() { - return OverridePurity::ErrorProfile; - } - - if self.hostname.is_some() || self.ssh_user.is_some() { - return OverridePurity::Error; - } - - if self.ssh_opts.is_some() || self.fast_connection.is_some() { - return OverridePurity::Warn; - } - - OverridePurity::Pure - } -} - #[derive(PartialEq, Debug)] pub struct DeployFlake<'a> { pub repo: &'a str, |