chore: release (#18)

* doc: correct image link * chore: upgrade deps * chore: upgrade depsq --------- Co-authored-by: Thomas Hoppe <[email protected]>
restorecommerce · Oct 30, 2024 · f7eed59 · f7eed59
1 parent b3d8881
commit f7eed59
Show file tree

Hide file tree

Showing 11 changed files with 864 additions and 764 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,35 +1,35 @@
 [package]
 name = "pdf-rendering-srv"
-version = "0.1.0"
+version = "0.1.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread", "rt", "full"] }
-prost = "0.12.3"
-headless_chrome = "1.0.9"
-tonic = "0.11.0"
-prost-types = "0.12.3"
-tokio-stream = "0.1.15"
+tokio = { version = "1.41.0", features = ["macros", "rt-multi-thread", "rt", "full"] }
+prost = "0.13.3"
+headless_chrome = "1.0.15"
+tonic = "0.12.3"
+prost-types = "0.13.3"
+tokio-stream = "0.1.16"
 tiny_http = "0.12.0"
-tonic-reflection = "0.11.0"
-tonic-health = "0.11.0"
-anyhow = "1.0.75"
-log = "0.4.20"
-env_logger = "0.11.3"
-config = "0.14.0"
-aws-sdk-s3 = "1.22.0"
-aws-sdk-config = "1.20.0"
-aws-smithy-runtime-api = "1.3.0"
-lopdf = "0.32.0"
-serde_json = "1.0.116"
-serde = { version = "1.0.198", features = ["derive"] }
-prost-wkt-types = "0.5.1"
-ulid = "1.1.2"
+tonic-reflection = "0.12.3"
+tonic-health = "0.12.3"
+anyhow = "1.0.91"
+log = "0.4.22"
+env_logger = "0.11.5"
+config = "0.14.1"
+aws-sdk-s3 = "1.58.0"
+aws-sdk-config = "1.49.0"
+aws-smithy-runtime-api = "1.7.2"
+lopdf = "0.34.0"
+serde_json = "1.0.132"
+serde = { version = "1.0.214", features = ["derive"] }
+prost-wkt-types = "0.6.0"
+ulid = "1.1.3"
 
 [build-dependencies]
-tonic-build = "0.11.0"
-reqwest = { version = "0.12.0", features = ["blocking", "json"] }
-flate2 = "1.0.28"
-tar = "0.4.40"
+tonic-build = "0.12.3"
+reqwest = { version = "0.12.9", features = ["blocking", "json"] }
+flate2 = "1.0.34"
+tar = "0.4.42"
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM lukemathwalker/cargo-chef:latest-rust-1.77-alpine AS planner
+FROM lukemathwalker/cargo-chef:latest-rust-1.82-alpine AS planner
 WORKDIR /app
 COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
 
-FROM rust:1.77.2-alpine as build
+FROM rust:1.82-alpine as build
 
 RUN rustup target add x86_64-unknown-linux-musl
 RUN apk add --no-cache build-base pkgconfig dbus-dev libressl-dev protoc protobuf-dev

diff --git a/TODO.md b/TODO.md
@@ -5,9 +5,11 @@
 - PDF/A support
 - Proxy support for downloads
 - Content caching
-- Add docs also explaining how to add fonts
+- ~~Add docs also explaining how to add fonts~~
 - ~~Info endpoint that provides chrome version~~
 - ~~Modify PDF meta data~~
 - Emit Kafka event on successful render/ upload
 - ~~Batch rendering of multiple documents~~
 - ~~Add logging~~
+- Store objects via Ostorage service instead of S3 directly
+- return the actual URL instead of n/a when the object is stored
diff --git a/build.rs b/build.rs
@@ -38,7 +38,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .extern_path(".google.protobuf", "::prost_wkt_types")
         .type_attribute(".", "#[derive(serde::Serialize, serde::Deserialize)]")
         .file_descriptor_set_path(Path::new(&out_dir).join("proto_fd.bin"))
-        .compile(
+        .compile_protos(
             &[Path::new(&proto_path).join("pdf_rendering.proto").clone()],
             &[Path::new(&relative_path).join("package/")],
         )?;
@@ -80,7 +80,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         )
         .extern_path(".google.protobuf", "::prost_wkt_types")
         .type_attribute(".", "#[derive(serde::Serialize, serde::Deserialize)]")
-        .compile(&paths, &[Path::new(&relative_path).join("package/")])?;
+        .compile_protos(&paths, &[Path::new(&relative_path).join("package/")])?;
 
     Ok(())
 }
diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
@@ -34,7 +34,7 @@ A microservice for rendering PDFs from HTML using the Chromium browser.
 ----
 
 renders like this in PDF:
-link:https://github.com/restorecommerce/pdf-rendering-srv/blob/master/docs/modules/ROOT/assets/images/fonts.png[fonts.png].
+image:https://github.com/restorecommerce/pdf-rendering-srv/blob/master/docs/modules/ROOT/assets/images/fonts.png[fonts.png].
 
 [#usage]
 == Usage

diff --git a/src/main.rs b/src/main.rs
@@ -42,7 +42,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     let reflection_service = tonic_reflection::server::Builder::configure()
         .register_encoded_file_descriptor_set(proto::pdf_rendering::FILE_DESCRIPTOR_SET)
-        .build()
+        .build_v1()
         .unwrap();
 
     let (mut health_reporter, health_service) = tonic_health::server::health_reporter();

diff --git a/src/pdf_utils.rs b/src/pdf_utils.rs
@@ -216,7 +216,7 @@ pub fn add_pdf_metadata(file: Vec<u8>, meta: Option<MetaData>) -> std::io::Resul
 
             document
                 .save_to(&mut memory_cursor)
-                .expect("failed saving pdf");
+                .expect("failed saving PDF");
 
             memory_cursor.flush().expect("failed flushing");
 

diff --git a/src/s3.rs b/src/s3.rs
@@ -89,7 +89,7 @@ pub async fn upload_to_s3(
 }
 
 #[derive(Debug, Default, Serialize)]
-struct Resource {
+pub struct Resource {
     id: String,
     key: String,
     bucket: String,

diff --git a/src/server.rs b/src/server.rs
@@ -127,7 +127,7 @@ impl PDFServer {
                             status: Some(status::Status {
                                 id: None,
                                 code: Some(400),
-                                message: Some(format!("render failed: {}", err)),
+                                message: Some(format!("rendering failed: {}", err)),
                             }),
                             payload: None,
                         });
@@ -160,7 +160,7 @@ impl PDFServer {
 
         Response::new(RenderingResponse {
             operation_status: Some(OperationStatus {
-                code: Some(0),
+                code: Some(200),
                 message: Some("success".to_string()),
             }),
             response: Some(rendering_response::Response::Individual(
@@ -188,7 +188,7 @@ impl PDFServer {
                         Err(err) => {
                             panic!("missing pdf: {}", err)
                         }
-                        Ok(response) => Document::load_mem(response).expect("failed parsing pdf"),
+                        Ok(response) => Document::load_mem(response).expect("failed parsing PDF"),
                     },
                 })
                 .collect(),
@@ -202,7 +202,7 @@ impl PDFServer {
 
         Response::new(RenderingResponse {
             operation_status: Some(OperationStatus {
-                code: Some(0),
+                code: Some(200),
                 message: Some("success".to_string()),
             }),
             response: Some(rendering_response::Response::Combined(
@@ -235,7 +235,7 @@ impl PDFServer {
                 Ok(_) => ResponsePayloadWithStatus {
                     status: Some(status::Status {
                         id: None,
-                        code: Some(0),
+                        code: Some(200),
                         message: Some("success".to_string()),
                     }),
                     payload: Some(ResponsePayload {
@@ -260,7 +260,7 @@ impl PDFServer {
             ResponsePayloadWithStatus {
                 status: Some(status::Status {
                     id: None,
-                    code: Some(0),
+                    code: Some(200),
                     message: Some("success".to_string()),
                 }),
                 payload: Some(ResponsePayload {

diff --git a/src/types.rs b/src/types.rs
@@ -14,6 +14,7 @@ pub struct RendererResponse {
     pub order: usize,
 }
 
+#[derive(Copy, Clone)]
 pub struct IDExtension {
     pub id: ulid::Ulid,
 }