Merge pull request #1065 from cloudflare/alewis/naming-is-hard

s/text/vars/
cloudflare · Feb 14, 2020 · eea1137 · eea1137
2 parents 94e117c + 4e9ceb0
commit eea1137
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/commands/kv/bucket/mod.rs b/src/commands/kv/bucket/mod.rs
@@ -271,7 +271,7 @@ mod tests {
             target_type: TargetType::JavaScript,
             webpack_config: None,
             site: Some(site),
-            text: None,
+            vars: None,
         }
     }
 

diff --git a/src/commands/kv/mod.rs b/src/commands/kv/mod.rs
@@ -145,7 +145,7 @@ mod tests {
             target_type: TargetType::Webpack,
             webpack_config: None,
             site: None,
-            text: None,
+            vars: None,
         };
         assert!(kv::get_namespace_id(&target_with_dup_kv_bindings, "").is_err());
     }

diff --git a/src/commands/publish/upload_form/mod.rs b/src/commands/publish/upload_form/mod.rs
@@ -31,8 +31,8 @@ pub fn build(
     let mut plain_texts: Vec<PlainText> = Vec::new();
     let mut wasm_modules: Vec<WasmModule> = Vec::new();
 
-    if let Some(text) = &target.text {
-        for (key, value) in text.iter() {
+    if let Some(vars) = &target.vars {
+        for (key, value) in vars.iter() {
             plain_texts.push(PlainText::new(key.clone(), value.clone())?)
         }
     }

diff --git a/src/settings/toml/environment.rs b/src/settings/toml/environment.rs
@@ -23,7 +23,7 @@ pub struct Environment {
     pub site: Option<Site>,
     #[serde(rename = "kv-namespaces")]
     pub kv_namespaces: Option<Vec<KvNamespace>>,
-    pub text: Option<HashMap<String, String>>,
+    pub vars: Option<HashMap<String, String>>,
 }
 
 impl Environment {

diff --git a/src/settings/toml/manifest.rs b/src/settings/toml/manifest.rs
@@ -41,7 +41,7 @@ pub struct Manifest {
     #[serde(rename = "kv-namespaces")]
     pub kv_namespaces: Option<Vec<KvNamespace>>,
     pub env: Option<HashMap<String, Environment>>,
-    pub text: Option<HashMap<String, String>>,
+    pub vars: Option<HashMap<String, String>>,
 }
 
 impl Manifest {
@@ -190,7 +190,7 @@ impl Manifest {
             name: self.name.clone(),                   // MAY inherit
             kv_namespaces: self.kv_namespaces.clone(), // MUST NOT inherit
             site: self.site.clone(),                   // MUST NOT inherit
-            text: self.text.clone(),                   // MAY inherit
+            vars: self.vars.clone(),                   // MAY inherit
         };
 
         let environment = self.get_environment(environment_name)?;
@@ -203,11 +203,11 @@ impl Manifest {
             if let Some(webpack_config) = &environment.webpack_config {
                 target.webpack_config = Some(webpack_config.clone());
             }
-            if let Some(target_text) = &mut target.text.clone() {
-                if let Some(env_text) = environment.text.clone() {
-                    target_text.extend(env_text);
-                    let new_text = target_text.clone();
-                    target.text.replace(new_text);
+            if let Some(target_vars) = &mut target.vars.clone() {
+                if let Some(env_vars) = environment.vars.clone() {
+                    target_vars.extend(env_vars);
+                    let new_vars = target_vars.clone();
+                    target.vars.replace(new_vars);
                 }
             }
 

diff --git a/src/settings/toml/target.rs b/src/settings/toml/target.rs
@@ -19,7 +19,7 @@ pub struct Target {
     pub target_type: TargetType,
     pub webpack_config: Option<String>,
     pub site: Option<Site>,
-    pub text: Option<HashMap<String, String>>,
+    pub vars: Option<HashMap<String, String>>,
 }
 
 impl Target {