Merge branch 'fcsonline:master' into pick-for-with-items-range

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Compile and release
-        uses: rust-build/rust-build.action@latest
+        uses: rust-build/rust-build.action@v1.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RUSTTARGET: ${{ matrix.target }}

.gitignore

@@ -11,3 +11,6 @@
 
 # Example server
 example/server/node_modules
+
+# Editor temp files
+.vscode

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drill"
-version = "0.8.2"
+version = "0.8.3"
 authors = ["Ferran Basora <[email protected]>"]
 description = "Drill is a HTTP load testing application written in Rust inspired by Ansible syntax"
 repository = "https://github.com/fcsonline/drill"

README.md

@@ -272,7 +272,7 @@ production environments.
 Full list of cli options, which is available under `drill --help`
 
 ```
-drill 0.8.2
+drill 0.8.3
 HTTP load testing application written in Rust inspired by Ansible syntax
 
 USAGE:

example/server/Dockerfile-example-server

@@ -0,0 +1,6 @@
+FROM node
+WORKDIR /app
+COPY package.json ./
+RUN npm install
+COPY . .
+CMD node server.js

example/server/docker-compose.yml

@@ -0,0 +1,14 @@
+version: "3.9"
+services:
+  drill-server:
+    ports:
+      - "9000:9000"
+    image: drill-example-server:latest
+    build:
+      context: ./
+      dockerfile: Dockerfile-example-server
+      #args:
+      #  buildno: 1
+    environment:
+        OUTPUT: 0
+        DELAY_MS: 100

src/actions/request.rs

@@ -284,14 +284,9 @@ impl Runnable for Request {
           status,
         });
 
-        if response.cookies().count() > 0 {
-          let mut cookies = Map::new();
-
-          for cookie in response.cookies() {
-            cookies.insert(cookie.name().to_string(), json!(cookie.value().to_string()));
-          }
-
-          context.insert("cookies".to_string(), json!(cookies));
+        for cookie in response.cookies() {
+          let cookies = context.entry("cookies").or_insert_with(|| json!({})).as_object_mut().unwrap();
+          cookies.insert(cookie.name().to_string(), json!(cookie.value().to_string()));
         }
 
         let data = if let Some(ref key) = self.assign {

src/interpolator.rs

@@ -10,7 +10,7 @@ static INTERPOLATION_SUFFIX: &str = "}}";
 
 lazy_static! {
   pub static ref INTERPOLATION_REGEX: Regex = {
-    let regexp = format!("{}{}{}", regex::escape(INTERPOLATION_PREFIX), r" *([a-zA-Z]+[a-zA-Z\-\._0-9\[\]]*) *", regex::escape(INTERPOLATION_SUFFIX));
+    let regexp = format!("{}{}{}", regex::escape(INTERPOLATION_PREFIX), r" *([a-zA-Z]+[a-zA-Z\-\._\$0-9\[\]]*) *", regex::escape(INTERPOLATION_SUFFIX));
 
     Regex::new(regexp.as_str()).unwrap()
   };
@@ -107,7 +107,7 @@ mod tests {
     context.insert(String::from("Array"), json!(["a", "b", "c"]));
     context.insert(String::from("Object"), json!({"this": "that"}));
     context.insert(String::from("Nested"), json!({"this": {"that": {"those": [{"wow": 1}, {"so": 2}, {"deee": {"eeee": "eeep"}}]}}}));
-    context.insert(String::from("ArrayNested"), json!([{"a": [{}, {"aa": 2, "aaa": [{"aaaa": 123 }]}]}]));
+    context.insert(String::from("ArrayNested"), json!([{"a": [{}, {"aa": 2, "aaa": [{"aaaa": 123, "$aaaa": "$123"}]}]}]));
 
     let interpolator = Interpolator::new(&context);
 
@@ -119,6 +119,7 @@ mod tests {
     assert_eq!(interpolator.resolve("{{ Object }}", true), "{\"this\":\"that\"}".to_string());
     assert_eq!(interpolator.resolve("{{ Nested.this.that.those[2].deee.eeee }}", true), "eeep".to_string());
     assert_eq!(interpolator.resolve("{{ ArrayNested[0].a[1].aaa[0].aaaa }}", true), "123".to_string());
+    assert_eq!(interpolator.resolve("{{ ArrayNested[0].a[1].aaa[0].$aaaa }}", true), "$123".to_string());
   }
 
   #[test]

src/tags.rs

@@ -11,8 +11,8 @@ pub struct Tags<'a> {
 
 impl<'a> Tags<'a> {
   pub fn new(tags_option: Option<&'a str>, skip_tags_option: Option<&'a str>) -> Self {
-    let tags: Option<HashSet<&str>> = tags_option.map(|m| m.split(',').into_iter().map(|s| s.trim()).collect());
-    let skip_tags: Option<HashSet<&str>> = skip_tags_option.map(|m| m.split(',').into_iter().map(|s| s.trim()).collect());
+    let tags: Option<HashSet<&str>> = tags_option.map(|m| m.split(',').map(|s| s.trim()).collect());
+    let skip_tags: Option<HashSet<&str>> = skip_tags_option.map(|m| m.split(',').map(|s| s.trim()).collect());
 
     if let (Some(t), Some(s)) = (&tags, &skip_tags) {
       if !t.is_disjoint(s) {