Skip to content

Commit 49f6060

Browse files
En/117 Upgrade proxy to aws 7.0 api (#118)
* 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
1 parent b12b64b commit 49f6060

19 files changed

+1797
-1294
lines changed

Cargo.lock

+1,524-1,041
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,52 @@
11
[package]
22
name = "nft_image_proxy"
3-
version = "2.0.0"
3+
version = "1.5.0"
44
repository = "https://github.com/Cryptonomic/ImageProxy"
55
authors = ["Cryptonomic Inc."]
66
edition = "2018"
77
build = "build.rs"
88
include = [ "src/" ]
99

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

1313
[dependencies]
14-
hyper = { version = "0.14", features = ["full"] }
15-
hyper-timeout = "0.4"
14+
hyper = { version = "1.2.0", features = ["full"] }
15+
http-body-util = "0.1"
16+
hyper-util = { version = "0.1", features = ["full"] }
17+
hyper-timeout = "0.5.1"
1618
tokio = { version = "1", features = ["full"] }
1719
log = "0.4"
1820
log4rs = "1"
1921
hocon = "0.9"
2022
sha2 = "0.10"
21-
base64 = "0.13"
22-
hyper-tls = "0.5"
23+
base64 = "0.22.0"
24+
hyper-tls = "0.6.0"
2325
serde = { version = "1", features = ["derive"] }
2426
serde_json = "1"
2527
chrono = "0.4"
26-
uuid = { version = "1.1", features = ["serde", "v4"] }
28+
uuid = { version = "1.7.0", features = ["serde", "v4"] }
2729
prometheus = { version = "0.13", features = ["process"] }
2830
lazy_static = "1.4"
2931
async-trait = "0.1"
3032
image = "0.24"
31-
dns-lookup = "1"
33+
dns-lookup = "2.0.4"
3234
anyhow = "1.0"
33-
moka = "0.8"
35+
moka = {version="0.12.5", features = ["sync", "future"]}
3436

3537
# deps for db support
3638
bb8 = "0.8"
3739
bb8-postgres = "0.8"
38-
deadpool-postgres = "0.10"
40+
deadpool-postgres = "0.12.1"
3941
postgres-native-tls = "0.5"
4042
native-tls = "0.2"
4143
tokio-postgres = { version="0.7", features=["with-chrono-0_4"] }
4244

4345
# deps for aws
44-
aws-config = "0.12"
45-
aws-sdk-rekognition = "0.12"
46-
aws-sdk-s3 = "0.12"
47-
aws-types = "0.12"
46+
aws-config = { version = "1.1.7", features = ["behavior-version-latest"] }
47+
aws-sdk-rekognition = "1.16.0"
48+
aws-sdk-s3 = "1.17.0"
49+
aws-types = "1.1.7"
4850

4951
[target.'cfg(not(target_env = "msvc"))'.dependencies]
5052
tikv-jemallocator = { version="0.5", features=[ "background_threads_runtime_support", "background_threads"] }

build.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
fn main() {
2-
let mut opts = built::Options::default();
3-
opts.set_git(true);
4-
5-
let src = std::env::var("CARGO_MANIFEST_DIR").unwrap();
6-
let dst = std::path::Path::new(&std::env::var("OUT_DIR").unwrap()).join("built.rs");
7-
8-
built::write_built_file_with_opts(&opts, src.as_ref(), &dst)
9-
.expect("Failed to acquire build-time information");
2+
built::write_built_file().expect("Failed to acquire build-time information");
103
}

0 commit comments

Comments
 (0)