Merge pull request #93 from syedriko/syedriko_log_2734

LOG-2734: A test exists to verify there are no ring dependencies
syedriko · Jul 10, 2022 · a4f3195 · a4f3195
2 parents 348a8a5 + b092682
commit a4f3195
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -14,4 +14,5 @@
 !8.6-compose.repo
 !thirdparty
 !patch
-!.cargo
+!.cargo
+!deny.toml
diff --git a/Dockerfile.unit b/Dockerfile.unit
@@ -26,5 +26,9 @@ RUN mkdir -p /src
 
 WORKDIR /src
 COPY . /src
+
 RUN chmod -R 777 /src $CARGO_HOME
-RUN mkdir -p ~/.cargo/bin && ln -s /src/thirdparty/cargo-nextest/cargo-nextest-linux-$(arch) ~/.cargo/bin/cargo-nextest
+RUN mkdir -p ~/.cargo/bin && \
+    for plugin in nextest deny; do \
+        ln -s /src/thirdparty/cargo-${plugin}/cargo-${plugin}-linux-$(arch) ~/.cargo/bin/cargo-${plugin}; \
+	done
diff --git a/deny.toml b/deny.toml
@@ -50,7 +50,7 @@ ignore = [
 ]
 
 [bans]
+multiple-versions = "allow"
 deny = [
-    # https://github.com/vectordotdev/vector/issues/11257
-    { name = "tokio-util", version = ">=0.6.9" },
+    { name = "ring", wrappers = ["azure_storage"] },
 ]
diff --git a/thirdparty/cargo-deny/cargo-deny-linux-x86_64 b/thirdparty/cargo-deny/cargo-deny-linux-x86_64