Skip to content

Commit

Permalink
metadata cleanup (#3746)
Browse files Browse the repository at this point in the history
* remove unused patch entries in Cargo.toml (referring to a 1 year old
commit in opentelemetry)
* remove exemptions for the chrono security advisories (they are fixed
now)
  • Loading branch information
Geal authored Sep 5, 2023
1 parent a9bbe0f commit 818199f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
6 changes: 6 additions & 0 deletions .changesets/maint_geal_metadata_cleanup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
### Metadata cleanup ([PR #3746](https://github.com/apollographql/router/pull/3746))

* remove unused patch entries in Cargo.toml
* remove exemptions for the chrono security advisories (they are fixed now)

By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/3746
7 changes: 0 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,3 @@ incremental = false
inherits = "release"
debug = 1

[patch.crates-io]
# TODO: to delete
# opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "e5ef3552efab2bdbf2f838023c37461cd799ab2c"}
# opentelemetry-http = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "e5ef3552efab2bdbf2f838023c37461cd799ab2c"}
# opentelemetry-jaeger = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "e5ef3552efab2bdbf2f838023c37461cd799ab2c"}
# opentelemetry-zipkin = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "e5ef3552efab2bdbf2f838023c37461cd799ab2c"}
# opentelemetry-datadog = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "e5ef3552efab2bdbf2f838023c37461cd799ab2c"}
6 changes: 1 addition & 5 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,9 @@ git-fetch-with-cli = true
# A list of advisory IDs to ignore. Note that ignored advisories will still
# output a note when they are encountered.

# while https://github.com/chronotope/chrono/issues/499 is open.
# We need to keep track of this issue, and make sure `tracing-subscriber` is updated
# We will then be able to remove this
#
# RUSTSEC-2023-0052 and RUSTSEC-2023-0053 are pending a webpki update that is tracked by https://github.com/apollographql/router/issues/3645
# and will be fixed by https://github.com/apollographql/router/pull/3643
ignore = ["RUSTSEC-2020-0159", "RUSTSEC-2020-0071", "RUSTSEC-2023-0053", "RUSTSEC-2023-0052"]
ignore = ["RUSTSEC-2023-0053", "RUSTSEC-2023-0052"]

# This section is considered when running `cargo deny check licenses`
# More documentation for the licenses section can be found here:
Expand Down

0 comments on commit 818199f

Please sign in to comment.