Merge pull request #26 from fastly/version-041

Release version `0.4.1`
fastly · Jul 9, 2024 · 93e802b · 93e802b
2 parents c7f34e7 + 33636d3
commit 93e802b
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 28 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,3 +5,9 @@ members = [
     "examples/esi_example_minimal",
     "examples/esi_example_advanced_error_handling"
 ]
+
+[workspace.package]
+version = "4.1.0"
+authors = ["Kailan Blanks <kblanks@fastly.com>"]
+license = "MIT"
+edition = "2018"
diff --git a/esi/Cargo.toml b/esi/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 name = "esi"
-version = "0.4.1"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
 description = "A streaming parser and executor for Edge Side Includes"
 repository = "https://github.com/fastly/esi"
-license = "MIT"
-authors = ["Kailan Blanks <kblanks@fastly.com>"]
-edition = "2018"
 readme = "./README.md"
 
 [dependencies]
-quick-xml = "0.27.1"
+quick-xml = "0.36.0"
 thiserror = "^1.0"
-fastly = "^0.9"
+fastly = "^0.10"
 log = "^0.4"
 
 [dev-dependencies]
-env_logger = "=0.9.3" # 0.10.0 requires nightly
+env_logger = "^0.11"
diff --git a/esi/src/lib.rs b/esi/src/lib.rs
@@ -144,7 +144,7 @@ impl Processor {
                             debug!("nothing waiting so streaming directly to client");
                             output_writer.write_event(event)?;
                             output_writer
-                                .inner()
+                                .get_mut()
                                 .flush()
                                 .expect("failed to flush output");
                         } else {
@@ -262,7 +262,7 @@ fn poll_elements(
             match element {
                 Element::Raw(raw) => {
                     debug!("writing previously queued other content");
-                    output_writer.inner().write_all(&raw).unwrap();
+                    output_writer.get_mut().write_all(&raw).unwrap();
                 }
                 Element::Fragment(mut request, alt, continue_on_error, pending_request) => {
                     match pending_request.wait() {
@@ -305,11 +305,11 @@ fn poll_elements(
                                 // Response status is success,
                                 // write the response body to the output stream.
                                 output_writer
-                                    .inner()
+                                    .get_mut()
                                     .write_all(&res.into_body_bytes())
                                     .unwrap();
                                 output_writer
-                                    .inner()
+                                    .get_mut()
                                     .flush()
                                     .expect("failed to flush output");
                             }
@@ -331,7 +331,7 @@ fn reader_from_body(body: Body) -> Reader<Body> {
     let mut reader = Reader::from_reader(body);
 
     // TODO: make this configurable
-    reader.check_end_names(false);
+    reader.config_mut().check_end_names = false;
 
     reader
 }
diff --git a/esi/src/parse.rs b/esi/src/parse.rs
@@ -106,7 +106,7 @@ where
     Ok(())
 }
 
-fn parse_include<'a, 'b>(elem: &'a BytesStart) -> Result<Event<'b>> {
+fn parse_include<'a>(elem: &BytesStart) -> Result<Event<'a>> {
     let src = match elem
         .attributes()
         .flatten()

diff --git a/examples/esi_example_advanced_error_handling/Cargo.toml b/examples/esi_example_advanced_error_handling/Cargo.toml
@@ -1,13 +1,14 @@
 [package]
 name = "esi_example_advanced_error_handling"
-version = "0.4.0"
-authors = ["Kailan Blanks <kailan@enviark.com>"]
-edition = "2018"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
 publish = false
 
 [dependencies]
-fastly = "^0.9"
+fastly = "^0.10"
 esi = { path = "../../esi" }
-quick-xml = "0.27.1"
+quick-xml = "0.36.0"
 log = "^0.4"
-env_logger = "=0.9.3" # 0.10.0 requires nightly
+env_logger = "^0.11" # 0.10.0 requires nightly
diff --git a/examples/esi_example_advanced_error_handling/src/main.rs b/examples/esi_example_advanced_error_handling/src/main.rs
@@ -1,3 +1,5 @@
+use std::io::Write;
+
 use fastly::{http::StatusCode, mime, Request, Response};
 use log::{error, info};
 use quick_xml::{Reader, Writer};
@@ -36,7 +38,8 @@ fn main() {
         // Set up an XML writer to write directly to the client output stream.
         let mut xml_writer = Writer::new(output_writer);
 
-        match processor.process_document(
+        // Process the ESI document
+        let result = processor.process_document(
             Reader::from_reader(beresp.take_body()),
             &mut xml_writer,
             Some(&|req| {
@@ -51,15 +54,18 @@ fn main() {
                 );
                 Ok(resp)
             }),
-        ) {
+        );
+
+        match result {
             Ok(()) => {
                 xml_writer.into_inner().finish().unwrap();
             }
             Err(err) => {
                 error!("error processing ESI document: {}", err);
                 xml_writer
-                    .inner()
-                    .write_str(include_str!("error.html.fragment"));
+                    .get_mut()
+                    .write_all(include_bytes!("error.html.fragment"))
+                    .expect("failed to write error response");
                 xml_writer.into_inner().finish().unwrap_or_else(|_| {
                     error!("error flushing error response to client");
                 });

diff --git a/examples/esi_example_minimal/Cargo.toml b/examples/esi_example_minimal/Cargo.toml
@@ -1,12 +1,13 @@
 [package]
 name = "esi_example_minimal"
-version = "0.4.0"
-authors = ["Kailan Blanks <kailan@enviark.com>"]
-edition = "2018"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
 publish = false
 
 [dependencies]
-fastly = "^0.9"
+fastly = "^0.10"
 esi = { path = "../../esi" }
 log = "^0.4"
-env_logger = "=0.9.3" # 0.10.0 requires nightly
+env_logger = "^0.11"
diff --git a/examples/esi_example_minimal/fastly.toml b/examples/esi_example_minimal/fastly.toml
@@ -14,6 +14,7 @@ service_id = ""
 
     [local_server.backends.mock-s3]
       url = "https://mock-s3.edgecompute.app"
+      override_host = "mock-s3.edgecompute.app"
 
 [scripts]
   build = "cargo build --bin esi_example_minimal --release --target wasm32-wasi --color always"