Merge pull request #92 from jayvdb/allow-no-http

feat: Allow disabling http feature

Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/kstasik/schema-tools"
 version = "0.14.0"
 
 [workspace.dependencies]
-reqwest = { version = "0.11.12", default-features = false, features = ["blocking"] }
+reqwest = { version = "0.11.12", default-features = false, features = ["default-tls", "blocking"] }
 serde_json = { version = "1", features = ["preserve_order"] }
 serde_yaml = "0.9.14"
 log = "0.4"

crates/cli/Cargo.toml

@@ -7,16 +7,16 @@ repository.workspace = true
 version.workspace = true
 
 [features]
-default = ["codegen", "git2", "json-patch"]
+default = ["codegen", "git2", "http", "json-patch"]
 codegen = ["schematools/codegen"]
 git2 = ["schematools/git2"]
+http = ["schematools/http"]
 json-patch = ["schematools/json-patch"]
 semver = ["schematools/semver"]
 
 [dependencies]
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
-reqwest = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 

crates/cli/src/commands/chain.rs

@@ -1,6 +1,6 @@
 use clap::{Parser, Subcommand};
 
-use reqwest::blocking::Client;
+use schematools::Client;
 
 use schematools::storage::SchemaStorage;
 use schematools::{discovery::Discovery, schema::Schema};

crates/cli/src/commands/codegen.rs

@@ -1,5 +1,5 @@
-use reqwest::blocking::Client;
 use schematools::codegen::jsonschema::JsonSchemaExtractOptions;
+use schematools::Client;
 use serde_json::Value;
 use std::{fmt::Display, time::Instant};
 

crates/cli/src/commands/mod.rs

@@ -4,7 +4,7 @@ use std::io::prelude::*;
 
 use clap::{Parser, ValueEnum};
 use env_logger::Builder as LoggerBuilder;
-use reqwest::blocking::Client;
+use schematools::Client;
 use serde_json::Value;
 
 pub mod chain;

crates/cli/src/commands/process/mod.rs

@@ -2,9 +2,9 @@ use std::fmt::Display;
 
 use crate::commands::GetSchemaCommand;
 use clap::{Parser, Subcommand};
-use reqwest::blocking::Client;
 use schematools::storage::SchemaStorage;
 use schematools::tools;
+use schematools::Client;
 
 use crate::error::Error;
 use schematools::process::{dereference, merge_allof, merge_openapi, name};

crates/cli/src/commands/validate.rs

@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 use clap::Parser;
-use reqwest::blocking::Client;
+use schematools::Client;
 
 use crate::error::Error;
 use schematools::schema::{path_to_url, Schema};

crates/cli/src/main.rs

@@ -1,4 +1,5 @@
 use clap::{Parser, Subcommand};
+use schematools::Client;
 
 pub mod commands;
 pub mod error;
@@ -29,7 +30,7 @@ enum Command {
 
 fn main() {
     let opts: Opts = Opts::parse();
-    let client = reqwest::blocking::Client::new();
+    let client = Client::new();
 
     let result = match opts.command {
         Command::Process(opts) => commands::process::execute(opts, &client),

crates/schematools/Cargo.toml

@@ -8,26 +8,27 @@ repository.workspace = true
 version.workspace = true
 
 [features]
-default = ["codegen", "git2", "json-patch"]
+default = ["codegen", "git2", "http", "json-patch"]
 codegen = ["tera", "semver"]
+http = ["jsonschema/resolve-http", "reqwest"]
 
 [dependencies]
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
-reqwest = { workspace = true }
+reqwest = { workspace = true, optional = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 
 url = "2"
 lazy_static = "1.4.0"
 regex = "1"
-jsonschema = { version = "0.14", default-features = false, features = ["reqwest", "reqwest-rustls-tls"] }
+jsonschema = { version = "0.17", default-features = false, features = ["resolve-file"] }
 tera = { version = "1", default-features = false, optional = true }
 serde = { version = "1.0", features = ["derive"] }
 walkdir = "2"
-json-patch = { version = "0.2.6", optional = true }
+json-patch = { version = "0.2.7", optional = true }
 semver = { version = "1.0", optional = true }
-git2 = { version = "0.16", optional = true }
+git2 = { version = "0.17", optional = true }
 md5 = "0.7.0"
 Inflector = "0.11"
 digest = "0.10.1"

crates/schematools/src/lib.rs

@@ -14,4 +14,16 @@ pub mod storage;
 pub mod tools;
 pub mod validate;
 
+#[cfg(feature = "http")]
+pub use reqwest::blocking::Client;
+/// A dummy client to be used when the http feature is disabled
+#[cfg(not(feature = "http"))]
+pub struct Client;
+#[cfg(not(feature = "http"))]
+impl Client {
+    pub fn new() -> Client {
+        Client {}
+    }
+}
+
 pub const VERSION: &str = "0.14.0";

crates/schematools/src/process/dereference.rs

@@ -6,8 +6,8 @@ use crate::schema::Schema;
 use crate::scope::SchemaScope;
 use crate::storage::{ref_to_url, SchemaStorage};
 
-use reqwest::Url;
 use serde_json::Value;
+use url::Url;
 
 pub struct Dereferencer;
 
@@ -244,7 +244,7 @@ fn process_discriminator(root: &mut Value, ctx: &mut DereferencerContext) {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use reqwest::Url;
+    use crate::Client;
     use serde_json::json;
 
     fn spec_from_file(file: &str) -> Schema {
@@ -257,7 +257,7 @@ mod tests {
     fn test_infinite_ref() {
         let mut spec = spec_from_file("resources/test/json-schemas/07-with-infinite-ref.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
 
         Dereferencer::options()
@@ -270,7 +270,7 @@ mod tests {
     fn test_string_reference() {
         let mut spec = spec_from_file("resources/test/json-schemas/16-string-reference.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
 
         Dereferencer::options().process(&mut spec, &ss);
@@ -302,7 +302,7 @@ mod tests {
     fn test_discriminator() {
         let mut spec = spec_from_file("resources/test/json-schemas/22-discriminator-root.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
 
         Dereferencer::options()
@@ -372,7 +372,7 @@ mod tests {
     fn test_with_local_reference() {
         let mut spec = spec_from_file("resources/test/json-schemas/06-with-local-reference.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
         Dereferencer::options().process(&mut spec, &ss);
 
@@ -422,7 +422,7 @@ mod tests {
     fn test_create_internal_references() {
         let mut spec = spec_from_file("resources/test/json-schemas/20-local-reference.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
 
         Dereferencer::options()
@@ -521,11 +521,12 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "http")]
     fn test_with_nested_remote_external_reference() {
         let mut spec =
             spec_from_file("resources/test/json-schemas/05-with-nested-remote-external-ref.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
 
         Dereferencer::options().process(&mut spec, &ss);
@@ -556,7 +557,7 @@ mod tests {
         let mut spec =
             spec_from_file("resources/test/json-schemas/04-with-nested-external-ref.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
 
         Dereferencer::options().process(&mut spec, &ss);
@@ -605,11 +606,12 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "http")]
     fn test_skip_references() {
         let mut spec =
             spec_from_file("resources/test/json-schemas/05-with-nested-remote-external-ref.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
 
         Dereferencer::options()
@@ -633,11 +635,12 @@ mod tests {
     }
 
     #[test]
+    #[cfg(feature = "http")]
     fn test_simple_with_external_reference() {
         let mut spec =
             spec_from_file("resources/test/json-schemas/03-simple-with-external-ref.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
 
         Dereferencer::options().process(&mut spec, &ss);
@@ -667,7 +670,7 @@ mod tests {
     fn test_simple_with_reference() {
         let mut spec = spec_from_file("resources/test/json-schemas/02-simple-with-reference.json");
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&spec, &client);
 
         Dereferencer::options().process(&mut spec, &ss);

crates/schematools/src/process/merge_allof.rs

@@ -157,6 +157,7 @@ fn merge_values(a: &mut Value, b: Value) {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::Client;
     use serde_json::json;
 
     #[test]
@@ -242,7 +243,7 @@ mod tests {
 
         let mut schema = Schema::from_json(value);
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&schema, &client);
 
         Merger::options().process(&mut schema, &ss);
@@ -296,7 +297,7 @@ mod tests {
 
         let mut schema = Schema::from_json(value);
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&schema, &client);
 
         Merger::options().process(&mut schema, &ss);
@@ -338,7 +339,7 @@ mod tests {
 
         let mut schema = Schema::from_json(value);
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&schema, &client);
 
         Merger::options().process(&mut schema, &ss);
@@ -390,7 +391,7 @@ mod tests {
 
         let mut schema = Schema::from_json(value);
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&schema, &client);
 
         Merger::options().process(&mut schema, &ss);
@@ -462,7 +463,7 @@ mod tests {
 
         let mut schema = Schema::from_json(value);
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&schema, &client);
 
         Merger::options().process(&mut schema, &ss);
@@ -587,7 +588,7 @@ mod tests {
 
         let mut schema = Schema::from_json(value);
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&schema, &client);
 
         Merger::options().process(&mut schema, &ss);
@@ -631,7 +632,7 @@ mod tests {
 
         let mut schema = Schema::from_json(value);
 
-        let client = reqwest::blocking::Client::new();
+        let client = Client::new();
         let ss = SchemaStorage::new(&schema, &client);
 
         Merger::options().process(&mut schema, &ss);

crates/schematools/src/process/mod.rs

@@ -8,8 +8,8 @@ pub mod merge_openapi;
 pub mod name;
 pub mod patch;
 
-use reqwest::Url;
 use serde_json::Value;
+use url::Url;
 
 // this function should probably be removed in favor of schema registry
 pub fn rel_to_absolute_refs(_url: &Url, mut _data: Value) -> Value {
@@ -86,7 +86,6 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use reqwest::Url;
     use serde_json::json;
 
     #[test]

crates/schematools/src/resolver.rs

@@ -1,6 +1,6 @@
 use crate::{error::Error, storage::SchemaStorage};
-use reqwest::Url;
 use serde_json::Value;
+use url::Url;
 
 use crate::{schema::Schema, scope::SchemaScope};
 
@@ -137,7 +137,6 @@ impl<'a> SchemaResolver<'a> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use reqwest::Url;
 
     #[test]
     fn test_when_file_and_spec_are_valid() {