chore: use the newly renamed datadog-fips package and add a clippy rule for reqwest::Client::builder

Author: apiarian-datadog

bottlecap/Cargo.lock

@@ -17,7 +17,7 @@ datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog",
 datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae"  }
 dogstatsd = { git = "https://github.com/DataDog/serverless-components", branch = "aleksandr.pasechnik/svls-6242-reqwest-fips-tls-injection", default-features = false }
 datadog-trace-agent = { git = "https://github.com/DataDog/serverless-components", branch = "aleksandr.pasechnik/svls-6242-reqwest-fips-tls-injection" }
-datadog-serverless-fips = { git = "https://github.com/DataDog/serverless-components", branch = "aleksandr.pasechnik/svls-6242-reqwest-fips-tls-injection", default-features = false }
+datadog-fips = { git = "https://github.com/DataDog/serverless-components", branch = "aleksandr.pasechnik/svls-6242-reqwest-fips-tls-injection", default-features = false }
 figment = { version = "0.10", default-features = false, features = ["yaml", "env"] }
 hyper = { version = "1.6", default-features = false, features = ["server"] }
 hyper-util = { version = "0.1.10", features = [
@@ -81,12 +81,12 @@ inherits = "release"
 opt-level = 3
 
 [features]
-default = ["reqwest/rustls-tls", "dogstatsd/default", "datadog-serverless-fips/default" ]
+default = ["reqwest/rustls-tls", "dogstatsd/default", "datadog-fips/default" ]
 fips = [
     "ddcommon/fips",
     "datadog-trace-utils/fips",
     "dogstatsd/fips",
-    "datadog-serverless-fips/fips",
+    "datadog-fips/fips",
     "reqwest/rustls-tls-native-roots-no-provider",
     "rustls/fips",
     "rustls-native-certs",

bottlecap/Cargo.toml

@@ -0,0 +1,3 @@
+disallowed-methods = [
+  { path = "reqwest::Client::builder", reason = "prefer the FIPS-compatible adapter", replacement = "datadog_fips::reqwest_adapter::create_reqwest_client_builder" },
+]

bottlecap/clippy.toml

@@ -48,7 +48,7 @@ use bottlecap::{
     EXTENSION_ID_HEADER, EXTENSION_NAME, EXTENSION_NAME_HEADER, EXTENSION_ROUTE,
     LAMBDA_RUNTIME_SLUG, TELEMETRY_PORT,
 };
-use datadog_serverless_fips::reqwest_adapter::create_reqwest_client_builder;
+use datadog_fips::reqwest_adapter::create_reqwest_client_builder;
 use datadog_trace_obfuscation::obfuscation_config;
 use datadog_trace_utils::send_data::SendData;
 use decrypt::resolve_secrets;

bottlecap/src/bin/bottlecap/main.rs

@@ -1,5 +1,5 @@
 // This module contains all of the things we do a little bit differently when we compile for FIPS
-// mode. This is used in conjunction with the datadog-serverless-fips crate to ensure that when we
+// mode. This is used in conjunction with the datadog-fips crate to ensure that when we
 // compile the extension in FIPS mode, everything is built and configured correctly.
 
 #[cfg(feature = "fips")]

bottlecap/src/fips/mod.rs

@@ -1,6 +1,6 @@
 use crate::config;
 use core::time::Duration;
-use datadog_serverless_fips::reqwest_adapter::create_reqwest_client_builder;
+use datadog_fips::reqwest_adapter::create_reqwest_client_builder;
 use std::error::Error;
 use std::sync::Arc;
 use tracing::error;

bottlecap/src/http_client.rs

@@ -2,7 +2,7 @@ use crate::config::{aws::AwsConfig, Config};
 use crate::fips::compute_aws_api_host;
 use base64::prelude::*;
 use chrono::{DateTime, Utc};
-use datadog_serverless_fips::reqwest_adapter::create_reqwest_client_builder;
+use datadog_fips::reqwest_adapter::create_reqwest_client_builder;
 use hmac::{Hmac, Mac};
 use reqwest::header::{HeaderMap, HeaderValue};
 use reqwest::Client;

bottlecap/src/secrets/decrypt.rs

@@ -1,4 +1,4 @@
-use datadog_serverless_fips::reqwest_adapter::create_reqwest_client_builder;
+use datadog_fips::reqwest_adapter::create_reqwest_client_builder;
 use reqwest::Response;
 use serde_json;
 use std::error::Error;