Merge pull request #628 from thoth-pub/feature/upgrade_paperclip

Feature/upgrade paperclip
thoth-pub · Sep 11, 2024 · 6d35844 · 6d35844
2 parents eab0663 + 39b4edc
commit 6d35844
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+  - [628](https://github.com/thoth-pub/thoth/pull/628) - Implement OpenAPI v3 schema in export API, served under `/openapi.json`
+  - [628](https://github.com/thoth-pub/thoth/pull/628) - Added terms of service to export API
+
 ### Changed
   - [551](https://github.com/thoth-pub/thoth/issues/551) - Only include chapters in Crossref metadata output if they have DOIs
+  - [628](https://github.com/thoth-pub/thoth/pull/628) - Upgrade `paperclip` to v0.9.1
+  - [628](https://github.com/thoth-pub/thoth/pull/628) - Upgrade rust to `1.81.0` in production and development `Dockerfile`
 
 ### Fixed
   - [565](https://github.com/thoth-pub/thoth/issues/565) - Don't generate Crossref metadata output if no DOIs (work or chapter) are present

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG MUSL_IMAGE=clux/muslrust:1.80.1-stable
+ARG MUSL_IMAGE=clux/muslrust:1.81.0-stable
 
 FROM ${MUSL_IMAGE} as build
 

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,4 +1,4 @@
-ARG RUST_VERSION=1.80.1
+ARG RUST_VERSION=1.81.0
 
 FROM rust:${RUST_VERSION}
 

diff --git a/thoth-export-server/Cargo.toml b/thoth-export-server/Cargo.toml
@@ -23,7 +23,7 @@ futures = "0.3.30"
 lazy_static = "1.5.0"
 log = "0.4.20"
 marc = { version = "3.1.1", features = ["xml"] }
-paperclip = { version = "0.8.2", features = ["actix-base", "actix4", "uuid1", "v2"] }
+paperclip = { version = "0.9.1", features = ["actix4", "uuid1", "v3"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 uuid = { version = "1.10.0", features = ["serde"] }

diff --git a/thoth-export-server/src/lib.rs b/thoth-export-server/src/lib.rs
@@ -31,7 +31,7 @@ struct ApiConfig {
 impl ApiConfig {
     pub fn new(public_url: String) -> Self {
         Self {
-            api_schema: format!("{public_url}/swagger.json"),
+            api_schema: format!("{public_url}/openapi.json"),
         }
     }
 }
@@ -82,6 +82,7 @@ pub async fn start_server(
                     "Obtain Thoth metadata records in various formats and platform specifications"
                         .to_string(),
                 ),
+                terms_of_service: Some("https://thoth.pub/policies/terms-thoth-free".to_string()),
                 contact: Some(Contact {
                     name: Some("Thoth Support".to_string()),
                     url: Some("https://thoth.pub".to_string()),
@@ -107,6 +108,7 @@ pub async fn start_server(
             .configure(platform::route)
             .configure(specification::route)
             .with_json_spec_at("/swagger.json")
+            .with_json_spec_v3_at("/openapi.json")
             .build()
     })
     .workers(threads)