Skip to content

Commit

Permalink
En/117 Upgrade proxy to aws 7.0 api (#118)
Browse files Browse the repository at this point in the history
* Updated dependencies to latest versions

* Cleaned up build rs

* Refactor for hyper

* Removed deprecated base64 calls

* Refactored hyper client to use legacy libs

* moderation normalization updates for rekcognition 7.1

* Fix npm audit warnings

* Force ipv4 localhost address for e2e tests

* Updated nsfw test url

* Added new labels to npm lib

* Refactored rekognition normalization for clarity

* npm lib version bump

* Misc changes
  • Loading branch information
bhaskarkishore authored Mar 12, 2024
1 parent b12b64b commit 49f6060
Show file tree
Hide file tree
Showing 19 changed files with 1,797 additions and 1,294 deletions.
2,565 changes: 1,524 additions & 1,041 deletions Cargo.lock

Large diffs are not rendered by default.

30 changes: 16 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,50 +1,52 @@
[package]
name = "nft_image_proxy"
version = "2.0.0"
version = "1.5.0"
repository = "https://github.com/Cryptonomic/ImageProxy"
authors = ["Cryptonomic Inc."]
edition = "2018"
build = "build.rs"
include = [ "src/" ]

[build-dependencies]
built = { version = "0.5", features = ["git2"] }
built = { version = "0.7.1", features = ["git2"] }

[dependencies]
hyper = { version = "0.14", features = ["full"] }
hyper-timeout = "0.4"
hyper = { version = "1.2.0", features = ["full"] }
http-body-util = "0.1"
hyper-util = { version = "0.1", features = ["full"] }
hyper-timeout = "0.5.1"
tokio = { version = "1", features = ["full"] }
log = "0.4"
log4rs = "1"
hocon = "0.9"
sha2 = "0.10"
base64 = "0.13"
hyper-tls = "0.5"
base64 = "0.22.0"
hyper-tls = "0.6.0"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
chrono = "0.4"
uuid = { version = "1.1", features = ["serde", "v4"] }
uuid = { version = "1.7.0", features = ["serde", "v4"] }
prometheus = { version = "0.13", features = ["process"] }
lazy_static = "1.4"
async-trait = "0.1"
image = "0.24"
dns-lookup = "1"
dns-lookup = "2.0.4"
anyhow = "1.0"
moka = "0.8"
moka = {version="0.12.5", features = ["sync", "future"]}

# deps for db support
bb8 = "0.8"
bb8-postgres = "0.8"
deadpool-postgres = "0.10"
deadpool-postgres = "0.12.1"
postgres-native-tls = "0.5"
native-tls = "0.2"
tokio-postgres = { version="0.7", features=["with-chrono-0_4"] }

# deps for aws
aws-config = "0.12"
aws-sdk-rekognition = "0.12"
aws-sdk-s3 = "0.12"
aws-types = "0.12"
aws-config = { version = "1.1.7", features = ["behavior-version-latest"] }
aws-sdk-rekognition = "1.16.0"
aws-sdk-s3 = "1.17.0"
aws-types = "1.1.7"

[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator = { version="0.5", features=[ "background_threads_runtime_support", "background_threads"] }
Expand Down
9 changes: 1 addition & 8 deletions build.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
fn main() {
let mut opts = built::Options::default();
opts.set_git(true);

let src = std::env::var("CARGO_MANIFEST_DIR").unwrap();
let dst = std::path::Path::new(&std::env::var("OUT_DIR").unwrap()).join("built.rs");

built::write_built_file_with_opts(&opts, src.as_ref(), &dst)
.expect("Failed to acquire build-time information");
built::write_built_file().expect("Failed to acquire build-time information");
}
Loading

0 comments on commit 49f6060

Please sign in to comment.