From 134e7889bf23eba69590fed9adb6bd9355219cad Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Wed, 23 Jun 2021 14:14:57 -0400 Subject: [PATCH] Remove unneeded `validate` function It no longer does anything now that the account ID is loaded on demand. --- src/commands/kv/bulk/delete.rs | 4 +--- src/commands/kv/bulk/put.rs | 3 --- src/commands/kv/key/delete.rs | 3 +-- src/commands/kv/key/get.rs | 1 - src/commands/kv/key/list.rs | 1 - src/commands/kv/key/put.rs | 2 -- src/commands/kv/mod.rs | 17 ----------------- src/commands/kv/namespace/delete.rs | 1 - src/commands/kv/namespace/list.rs | 3 --- src/commands/secret.rs | 23 ----------------------- src/sites/sync.rs | 1 - 11 files changed, 2 insertions(+), 57 deletions(-) diff --git a/src/commands/kv/bulk/delete.rs b/src/commands/kv/bulk/delete.rs index 1295c2ff4..d0ee3b008 100644 --- a/src/commands/kv/bulk/delete.rs +++ b/src/commands/kv/bulk/delete.rs @@ -9,16 +9,14 @@ use cloudflare::endpoints::workerskv::write_bulk::KeyValuePair; use anyhow::Result; use indicatif::{ProgressBar, ProgressStyle}; -use crate::commands::kv; use crate::kv::bulk::delete; use crate::kv::bulk::BATCH_KEY_MAX; use crate::settings::global_user::GlobalUser; use crate::settings::toml::Target; use crate::terminal::interactive; use crate::terminal::message::{Message, StdOut}; -pub fn run(target: &Target, user: &GlobalUser, namespace_id: &str, filename: &Path) -> Result<()> { - kv::validate_target(target)?; +pub fn run(target: &Target, user: &GlobalUser, namespace_id: &str, filename: &Path) -> Result<()> { match interactive::confirm(&format!( "Are you sure you want to delete all keys in {}?", filename.display() diff --git a/src/commands/kv/bulk/put.rs b/src/commands/kv/bulk/put.rs index d37aa109b..6d81f174d 100644 --- a/src/commands/kv/bulk/put.rs +++ b/src/commands/kv/bulk/put.rs @@ -9,15 +9,12 @@ use cloudflare::endpoints::workerskv::write_bulk::KeyValuePair; use anyhow::{anyhow, Result}; use indicatif::{ProgressBar, ProgressStyle}; -use crate::commands::kv::validate_target; use crate::kv::bulk::put; use crate::kv::bulk::BATCH_KEY_MAX; use crate::settings::global_user::GlobalUser; use crate::settings::toml::Target; use crate::terminal::message::{Message, StdErr}; pub fn run(target: &Target, user: &GlobalUser, namespace_id: &str, filename: &Path) -> Result<()> { - validate_target(target)?; - let pairs: Vec = match &metadata(filename) { Ok(file_type) if file_type.is_file() => { let data = fs::read_to_string(filename)?; diff --git a/src/commands/kv/key/delete.rs b/src/commands/kv/key/delete.rs index 771829a65..82d1475fd 100644 --- a/src/commands/kv/key/delete.rs +++ b/src/commands/kv/key/delete.rs @@ -3,14 +3,13 @@ use cloudflare::framework::apiclient::ApiClient; use anyhow::Result; -use crate::commands::kv::{format_error, validate_target}; +use crate::commands::kv::format_error; use crate::http; use crate::settings::global_user::GlobalUser; use crate::settings::toml::Target; use crate::terminal::interactive; use crate::terminal::message::{Message, StdOut}; pub fn delete(target: &Target, user: &GlobalUser, id: &str, key: &str) -> Result<()> { - validate_target(target)?; let client = http::cf_v4_client(user)?; match interactive::confirm(&format!("Are you sure you want to delete key \"{}\"?", key)) { diff --git a/src/commands/kv/key/get.rs b/src/commands/kv/key/get.rs index 485b83bea..1040243cf 100644 --- a/src/commands/kv/key/get.rs +++ b/src/commands/kv/key/get.rs @@ -14,7 +14,6 @@ use crate::settings::toml::Target; use std::io::{self, Write}; pub fn get(target: &Target, user: &GlobalUser, id: &str, key: &str) -> Result<()> { - kv::validate_target(target)?; let api_endpoint = format!( "https://api.cloudflare.com/client/v4/accounts/{}/storage/kv/namespaces/{}/values/{}", target.account_id.load()?, diff --git a/src/commands/kv/key/list.rs b/src/commands/kv/key/list.rs index d39da7d60..8b40a903d 100644 --- a/src/commands/kv/key/list.rs +++ b/src/commands/kv/key/list.rs @@ -17,7 +17,6 @@ pub fn list( namespace_id: &str, prefix: Option<&str>, ) -> Result<()> { - kv::validate_target(target)?; let client = http::cf_v4_client(&user)?; let key_list = KeyList::new(target, client, namespace_id, prefix)?; diff --git a/src/commands/kv/key/put.rs b/src/commands/kv/key/put.rs index 0c159629a..ed9ddc03a 100644 --- a/src/commands/kv/key/put.rs +++ b/src/commands/kv/key/put.rs @@ -49,8 +49,6 @@ pub fn parse_metadata(arg: Option<&str>) -> Result> { } pub fn put(target: &Target, user: &GlobalUser, data: KVMetaData) -> Result<()> { - kv::validate_target(target)?; - let api_endpoint = format!( "https://api.cloudflare.com/client/v4/accounts/{}/storage/kv/namespaces/{}/values/{}", target.account_id.load()?, diff --git a/src/commands/kv/mod.rs b/src/commands/kv/mod.rs index 254f78560..d5bd8f422 100644 --- a/src/commands/kv/mod.rs +++ b/src/commands/kv/mod.rs @@ -39,23 +39,6 @@ fn kv_help(error_code: u16) -> &'static str { } } -pub fn validate_target(target: &Target) -> Result<()> { - // let mut missing_fields = Vec::new(); - - // if target.account_id.is_empty() { - // missing_fields.push("account_id") - // }; - - // if !missing_fields.is_empty() { - // anyhow::bail!( - // "Your configuration file is missing the following field(s): {:?}", - // missing_fields - // ) - // } else { - Ok(()) - // } -} - fn check_duplicate_namespaces(target: &Target) -> bool { // HashSet for detecting duplicate namespace bindings let mut binding_names: HashSet = HashSet::new(); diff --git a/src/commands/kv/namespace/delete.rs b/src/commands/kv/namespace/delete.rs index aa6cda586..e08f8a7e3 100644 --- a/src/commands/kv/namespace/delete.rs +++ b/src/commands/kv/namespace/delete.rs @@ -9,7 +9,6 @@ use crate::terminal::message::{Message, StdOut}; use anyhow::Result; pub fn run(target: &Target, user: &GlobalUser, id: &str) -> Result<()> { - kv::validate_target(target)?; let client = http::cf_v4_client(user)?; match interactive::confirm(&format!( diff --git a/src/commands/kv/namespace/list.rs b/src/commands/kv/namespace/list.rs index 5d5b8a1b2..f9b811c1b 100644 --- a/src/commands/kv/namespace/list.rs +++ b/src/commands/kv/namespace/list.rs @@ -1,4 +1,3 @@ -use crate::commands::kv; use crate::http; use crate::kv::namespace::list; use crate::settings::global_user::GlobalUser; @@ -7,8 +6,6 @@ use crate::settings::toml::Target; use anyhow::Result; pub fn run(target: &Target, user: &GlobalUser) -> Result<()> { - kv::validate_target(target)?; - let client = http::cf_v4_client(user)?; let result = list(&client, target); match result { diff --git a/src/commands/secret.rs b/src/commands/secret.rs index 18d75fb6d..75e3d1234 100644 --- a/src/commands/secret.rs +++ b/src/commands/secret.rs @@ -15,24 +15,6 @@ fn format_error(e: ApiFailure) -> String { http::format_error(e, Some(&secret_errors)) } -fn validate_target(target: &Target) -> Result<()> { - // let mut missing_fields = Vec::new(); - - // if target.account_id.is_empty() { - // missing_fields.push("account_id") - // }; - - // if !missing_fields.is_empty() { - // anyhow::bail!( - // "{} Your configuration file is missing the following field(s): {:?}", - // emoji::WARN, - // missing_fields - // ) - // } else { - Ok(()) - // } -} - // secret_errors() provides more detailed explanations of API error codes. fn secret_errors(error_code: u16) -> &'static str { match error_code { @@ -71,8 +53,6 @@ pub fn upload_draft_worker( } pub fn create_secret(name: &str, user: &GlobalUser, target: &Target) -> Result<()> { - validate_target(target)?; - let secret_value = interactive::get_user_input_multi_line(&format!( "Enter the secret text you'd like assigned to the variable {} on the script named {}:", name, target.name @@ -127,8 +107,6 @@ pub fn create_secret(name: &str, user: &GlobalUser, target: &Target) -> Result<( } pub fn delete_secret(name: &str, user: &GlobalUser, target: &Target) -> Result<()> { - validate_target(target)?; - match interactive::confirm(&format!( "Are you sure you want to permanently delete the variable {} on the script named {}?", name, target.name @@ -163,7 +141,6 @@ pub fn delete_secret(name: &str, user: &GlobalUser, target: &Target) -> Result<( } pub fn list_secrets(user: &GlobalUser, target: &Target) -> Result<()> { - validate_target(target)?; let client = http::cf_v4_client(user)?; let response = client.request(&ListSecrets { diff --git a/src/sites/sync.rs b/src/sites/sync.rs index e3d6d4aa9..b9346f8a8 100644 --- a/src/sites/sync.rs +++ b/src/sites/sync.rs @@ -19,7 +19,6 @@ pub fn sync( namespace_id: &str, path: &Path, ) -> Result<(Vec, Vec, AssetManifest)> { - kv::validate_target(target)?; // First, find all changed files in given local directory (aka files that are now stale // in Workers KV).