Skip to content

Commit

Permalink
Merge pull request #49 from icann/dev
Browse files Browse the repository at this point in the history
Code for v0.0.15
  • Loading branch information
anewton1998 authored Dec 18, 2023
2 parents 8b8478c + a3e7075 commit 5f945c8
Show file tree
Hide file tree
Showing 47 changed files with 3,091 additions and 1,355 deletions.
1,901 changes: 1,185 additions & 716 deletions Cargo.lock

Large diffs are not rendered by default.

44 changes: 21 additions & 23 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ members = [
"icann-rdap-common",
"icann-rdap-srv"
]
resolver = "2"

[workspace.package]
version = "0.0.14"
version = "0.0.15"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/icann/icann-rdap"
Expand All @@ -22,32 +23,33 @@ anyhow = "1.0"
async-trait = "0.1"

# axum (web server)
axum = { version = "0.6", features = ["headers"] }
axum-macros = "0.3"
axum = { version = "0.7" }
axum-extra = { version = "0.9", features = [ "typed-header" ] }
axum-macros = "0.4"

# client IP address extractor
axum-client-ip = "0.3.0"
axum-client-ip = "0.5"

# b-tree with ranges
btree-range-map = "0.5.1"
btree-range-map = "0.7.2"

# macros for the builder pattern
buildstructor = "0.5"

# CIDR utilities
cidr-utils = "0.5"
cidr-utils = "0.6"

# command line options parser
clap = { version = "4.3.19", features = [ "std", "derive", "env", "unstable-styles" ] }
clap = { version = "4.4", features = [ "std", "derive", "env", "unstable-styles" ] }

# chrono (time and date library)
chrono = { version = "0.4", features = ["alloc", "std", "clock", "serde"], default-features = false }

# compile time constants formatting
const_format = "0.2.30"
const_format = "0.2"

# cross-platform application directories
directories = "5.0.0"
directories = "5.0"

# loads environment variables from the a file
dotenv = "0.15.0"
Expand All @@ -68,22 +70,19 @@ git-version = "0.3"
lazy_static = "1.4"

# headers (http headers)
headers = "0.3"
headers = "0.4"

# http constructs
http = "0.2"
http = "1.0"

# hyper (http implementation used by axum)
hyper = { version = "0.14", features = ["full"] }
hyper = { version = "1.0", features = ["full"] }

# for use prefixmap
ipnet = { version = "2.7", features = ["json"] }

# using terminal helper
is-terminal = "0.4"
ipnet = { version = "2.9", features = ["json"] }

# embedded pager
minus = {version = "5.4", features = ["dynamic_output", "search"] }
minus = {version = "5.5", features = ["dynamic_output", "search"] }

# percent encoding
pct-str = "1.2"
Expand All @@ -92,7 +91,7 @@ pct-str = "1.2"
prefix-trie = "0.2.4"

# regular expresions
regex = "1.7"
regex = "1.10"

# http client library
reqwest = {version = "0.11", features = ["json", "stream", "native-tls-vendored"]}
Expand All @@ -104,31 +103,30 @@ serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"

# sqlx (async db)
sqlx = { version = "0.6", features = [
sqlx = { version = "0.7", features = [
"runtime-tokio-rustls",
"postgres",
"chrono",
"macros",
"json",
"offline",
] }

# enum utilities
strum = "0.24"
strum_macros = "0.24"

# terminal markdown generator
termimad = "0.23"
termimad = "0.26"

# error macros
thiserror = "1.0"

# tokio async runtime
tokio = { version = "1.29", features = [ "full" ] }
tokio = { version = "1.35", features = [ "full" ] }

# tower (tokio/axum middleware)
tower = { version = "0.4", features = ["timeout", "util"] }
tower-http = { version = "0.3.3", features = [
tower-http = { version = "0.5", features = [
"add-extension",
"trace",
"cors",
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,13 @@ Unless you explicitly state otherwise, any contribution, as defined in the Apach
intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license,
shall be dual licensed pursuant to the Apache License, Version 2.0 or the MIT License referenced
as above, at ICANN’s option, without any additional terms or conditions.

How To Contribute
-----------------

Before working on a Pull Request (PR), seek advice from the maintainers regarding the acceptance
of the PR. To do this, submit an issue outlining the idea for the PR. If the maintainers agree
that the contribution would be welcome, they will assign the issue to you.

When submitting the PR, submit it against the 'dev' branch (not the 'main' branch).

8 changes: 5 additions & 3 deletions icann-rdap-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ path = "src/main.rs"

[dependencies]

icann-rdap-client = { version = "0.0.14", path = "../icann-rdap-client" }
icann-rdap-common = { version = "0.0.14", path = "../icann-rdap-common" }
icann-rdap-client = { version = "0.0.15", path = "../icann-rdap-client" }
icann-rdap-common = { version = "0.0.15", path = "../icann-rdap-common" }

anyhow.workspace = true
clap.workspace = true
Expand All @@ -24,7 +24,6 @@ const_format.workspace = true
directories.workspace = true
dotenv.workspace = true
ipnet.workspace = true
is-terminal.workspace = true
lazy_static.workspace = true
minus.workspace = true
pct-str.workspace = true
Expand All @@ -51,6 +50,9 @@ cidr-utils = "0.5"
# fixture testings
rstest = "0.17.0"

# serial testings
serial_test = "2.0.0"

# test directories
test_dir = "0.2.0"

Expand Down
Loading

0 comments on commit 5f945c8

Please sign in to comment.