chore(deps): bump async-nats to v0.37 (#21504)

* chore(deps): bump async-nats to v0.37 * chore: switch async-nats to aws-lc-rs with FIPS * cargo update -p async-nats * cargo update -p async-nats * cargo update -p async-nats * dd-rust-license-tool write * cargo update -p async-nats * add goland to bootstrap scripts * install the latest Go version * use latest version * another try * add ninja * add -y --------- Co-authored-by: Pavlos Rontidis <[email protected]>
vectordotdev · Jan 17, 2025 · defd3ac · defd3ac
1 parent 543e609
commit defd3ac
Show file tree

Hide file tree

Showing 8 changed files with 218 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -339,7 +339,7 @@ lru = { version = "0.12.5", default-features = false, optional = true }
 maxminddb = { version = "0.24.0", default-features = false, optional = true }
 md-5 = { version = "0.10", default-features = false, optional = true }
 mongodb = { version = "2.8.2", default-features = false, features = ["tokio-runtime"], optional = true }
-async-nats = { version = "0.33.0", default-features = false, optional = true }
+async-nats = { version = "0.37.0", default-features = false, features = ["fips"], optional = true }
 nkeys = { version = "0.4.4", default-features = false, optional = true }
 nom = { version = "7.1.3", default-features = false, optional = true }
 notify = { version = "7.0.0", default-features = false, features = ["macos_fsevent"] }

diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
@@ -50,6 +50,9 @@ atomic-waker,https://github.com/smol-rs/atomic-waker,Apache-2.0 OR MIT,"Stjepan
 aws-config,https://github.com/smithy-lang/smithy-rs,Apache-2.0,"AWS Rust SDK Team <[email protected]>, Russell Cohen <[email protected]>"
 aws-credential-types,https://github.com/smithy-lang/smithy-rs,Apache-2.0,AWS Rust SDK Team <[email protected]>
 aws-http,https://github.com/smithy-lang/smithy-rs,Apache-2.0,"AWS Rust SDK Team <[email protected]>, Russell Cohen <[email protected]>"
+aws-lc-fips-sys,https://github.com/aws/aws-lc-rs,ISC AND (Apache-2.0 OR ISC) AND OpenSSL,AWS-LC
+aws-lc-rs,https://github.com/aws/aws-lc-rs,ISC AND (Apache-2.0 OR ISC),AWS-LibCrypto
+aws-lc-sys,https://github.com/aws/aws-lc-rs,ISC AND (Apache-2.0 OR ISC) AND OpenSSL,AWS-LC
 aws-runtime,https://github.com/smithy-lang/smithy-rs,Apache-2.0,AWS Rust SDK Team <[email protected]>
 aws-sdk-cloudwatch,https://github.com/awslabs/aws-sdk-rust,Apache-2.0,"AWS Rust SDK Team <[email protected]>, Russell Cohen <[email protected]>"
 aws-sdk-cloudwatchlogs,https://github.com/awslabs/aws-sdk-rust,Apache-2.0,"AWS Rust SDK Team <[email protected]>, Russell Cohen <[email protected]>"
@@ -653,6 +656,7 @@ triomphe,https://github.com/Manishearth/triomphe,MIT OR Apache-2.0,"Manish Goreg
 trust-dns-proto,https://github.com/bluejekyll/trust-dns,MIT OR Apache-2.0,Benjamin Fry <[email protected]>
 trust-dns-resolver,https://github.com/bluejekyll/trust-dns,MIT OR Apache-2.0,Benjamin Fry <[email protected]>
 try-lock,https://github.com/seanmonstar/try-lock,MIT,Sean McArthur <[email protected]>
+tryhard,https://github.com/EmbarkStudios/tryhard,MIT OR Apache-2.0,Embark <[email protected]>
 tungstenite,https://github.com/snapview/tungstenite-rs,MIT OR Apache-2.0,"Alexey Galakhov, Daniel Abramov"
 twox-hash,https://github.com/shepmaster/twox-hash,MIT,Jake Goulding <[email protected]>
 typed-builder,https://github.com/idanarye/rust-typed-builder,MIT OR Apache-2.0,"IdanArye <[email protected]>, Chris Morgan <[email protected]>"

diff --git a/scripts/cross/bootstrap-ubuntu.sh b/scripts/cross/bootstrap-ubuntu.sh
@@ -3,11 +3,16 @@ set -o errexit
 
 echo 'Acquire::Retries "5";' > /etc/apt/apt.conf.d/80-retries
 
+# Required for building aws-lc-rs
+apt install -y software-properties-common
+add-apt-repository ppa:longsleep/golang-backports
+
 apt-get update
 apt-get install -y \
   apt-transport-https \
   gnupg \
-  wget
+  wget \
+  golang-go
 
 # we need LLVM >= 3.9 for onig_sys/bindgen
 

diff --git a/scripts/environment/bootstrap-macos.sh b/scripts/environment/bootstrap-macos.sh
@@ -15,6 +15,9 @@ brew install ruby@3 coreutils cue-lang/tap/cue protobuf
 # future
 brew reinstall rustup
 
+# Required for building aws-lc-rs
+brew install go
+
 gem install bundler
 
 echo "export PATH=\"/usr/local/opt/ruby/bin:\$PATH\"" >> "$HOME/.bash_profile"

diff --git a/scripts/environment/bootstrap-ubuntu-20.04.sh b/scripts/environment/bootstrap-ubuntu-20.04.sh
@@ -21,6 +21,12 @@ apt-get install --yes \
   apt-transport-https
 
 # Deps
+
+# Required for building aws-lc-rs
+add-apt-repository ppa:longsleep/golang-backports
+apt update
+apt install --yes --no-install-recommends golang-go
+
 apt-get install --yes --no-install-recommends \
     awscli \
     build-essential \

diff --git a/scripts/environment/bootstrap-windows-2022.ps1 b/scripts/environment/bootstrap-windows-2022.ps1
@@ -19,6 +19,10 @@ $env:NUGET_ENABLE_ENHANCED_HTTP_RETRY = "true"
 choco install make
 choco install protoc
 
+# required by aws-lc-rs
+choco install ninja
+choco install nasm
+
 # Set a specific override path for libclang.
 echo "LIBCLANG_PATH=$( (gcm clang).source -replace "clang.exe" )" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 

diff --git a/scripts/integration/Dockerfile b/scripts/integration/Dockerfile
@@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     zlib1g-dev \
     unzip \
     git \
+    golang \
   && rm -rf /var/lib/apt/lists/*
 
 RUN rustup run "${RUST_VERSION}" cargo install cargo-nextest --version 0.9.72 --locked