diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1cb508d..3e19ca4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -43,17 +43,6 @@ jobs: run: | which cargo-llvm-cov || cargo install cargo-llvm-cov which cargo-deny || cargo install cargo-deny - - name: Install ninja-build tool for aws-lc-fips-sys on Windows - if: runner.os == 'Windows' - uses: seanmiddleditch/gha-setup-ninja@v6 - - name: Install NASM for aws-lc-fips-sys on Windows - if: runner.os == 'Windows' - uses: ilammy/setup-nasm@v1 - - name: Install golang for aws-lc-fips-sys on macos - if: runner.os == 'MacOS' - uses: actions/setup-go@v6 - with: - go-version: "stable" - name: Check licenses run: cargo-deny check licenses - name: Build diff --git a/Cargo.lock b/Cargo.lock index 1a2681f..8724e12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,27 +152,12 @@ dependencies = [ "zeroize", ] -[[package]] -name = "aws-lc-fips-sys" -version = "0.13.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8bce4948d2520386c6d92a6ea2d472300257702242e5a1d01d6add52bd2e7c1" -dependencies = [ - "bindgen", - "cc", - "cmake", - "dunce", - "fs_extra", - "regex", -] - [[package]] name = "aws-lc-rs" version = "1.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc" dependencies = [ - "aws-lc-fips-sys", "aws-lc-sys", "zeroize", ] @@ -626,26 +611,6 @@ dependencies = [ "vsimd", ] -[[package]] -name = "bindgen" -version = "0.72.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "itertools", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", -] - [[package]] name = "bitflags" version = "2.11.0" @@ -722,9 +687,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.57" +version = "1.2.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" +checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1" dependencies = [ "find-msvc-tools", "jobserver", @@ -732,15 +697,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.4" @@ -792,17 +748,6 @@ dependencies = [ "half", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "4.6.0" @@ -830,9 +775,9 @@ checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "cmake" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" dependencies = [ "cc", ] @@ -1350,12 +1295,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "glob" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" - [[package]] name = "h2" version = "0.3.27" @@ -1886,16 +1825,6 @@ version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" -[[package]] -name = "libloading" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" -dependencies = [ - "cfg-if", - "windows-link", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2001,9 +1930,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", "wasi", @@ -2047,9 +1976,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" +checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" [[package]] name = "num-integer" @@ -2285,16 +2214,6 @@ dependencies = [ "log", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "proc-macro2" version = "1.0.106" @@ -2930,9 +2849,9 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" [[package]] name = "slab" @@ -3415,9 +3334,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-segmentation" -version = "1.12.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" [[package]] name = "unicode-xid" @@ -3472,9 +3391,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.22.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37" +checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/README.md b/README.md index be5400b..0f832b4 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,15 @@ To download the source code, see [https://github\.com/aws/aws\-secretsmanager\-a - [\[ curl \]](#-curl--1) - [\[ Python \]](#-python--1) - [Configure the Secrets Manager Agent](#configure-the-secrets-manager-agent) - - [Optional features](#optional-features) - [Logging](#logging) - [Security considerations](#security-considerations) - - [Running Integration Tests Locally](#integration-tests-local) + - [Running Integration Tests Locally](#running-integration-tests-locally) + - [Prerequisites](#prerequisites) + - [Required AWS Permissions](#required-aws-permissions) + - [Running Tests](#running-tests) + - [Option 1: Using the test script](#option-1-using-the-test-script) + - [Option 2: Manual execution](#option-2-manual-execution) + - [Test Organization](#test-organization) ## Step 1: Build the Secrets Manager Agent binary @@ -46,10 +51,6 @@ To build the Secrets Manager Agent binary natively, you need the standard develo Example: `git clone --branch https://github.com/aws/aws-secretsmanager-agent.git` -**NOTE:** Building the agent with the `fips` feature enabled on macOS currently requires the following workaround: - -- Create an environment variable called `SDKROOT` which is set to the result of running `xcrun --show-sdk-path` - #### [ RPM\-based systems ] 1. On RPM\-based systems such as AL2023, you can install the development tools by using the Development Tools group\. @@ -468,11 +469,6 @@ The following list shows the options you can configure for the Secrets Manager A + **path\_prefix** – The URI prefix used to determine if the request is a path based request\. The default is "/v1/"\. + **max\_conn** – The maximum number of connections from HTTP clients that the Secrets Manager Agent allows, in the range 1 to 1000\. The default is 800\. -## Optional features - -The Secrets Manager Agent can be built with optional features by passing the `--features` flag to `cargo build`. The available features are: -* `fips`: restricts the cipher suites used by the agent to only FIPS-approved ciphers - ## Logging The Secrets Manager Agent logs errors locally to the file `logs/secrets_manager_agent.log` or to stdout/stderr depending on the `log_to_file` config variable\. When your application calls the Secrets Manager Agent to get a secret, those calls appear in the local log\. They do not appear in the CloudTrail logs\. diff --git a/aws_secretsmanager_agent/Cargo.toml b/aws_secretsmanager_agent/Cargo.toml index d3b29a6..b1bdf96 100644 --- a/aws_secretsmanager_agent/Cargo.toml +++ b/aws_secretsmanager_agent/Cargo.toml @@ -37,6 +37,3 @@ aws-smithy-runtime = { version = "1", features = ["test-util"] } tokio = { version = "1", features = ["test-util", "rt-multi-thread", "net", "macros"] } http = "0.2.9" aws-smithy-types = "1" - -[features] -fips = ["aws_secretsmanager_caching/fips"] diff --git a/aws_secretsmanager_caching/Cargo.toml b/aws_secretsmanager_caching/Cargo.toml index f7235bb..afbd1c1 100644 --- a/aws_secretsmanager_caching/Cargo.toml +++ b/aws_secretsmanager_caching/Cargo.toml @@ -32,9 +32,6 @@ tokio-test = "0.4.4" criterion = { version = "0.7.0", features = ["async_tokio", "html_reports"] } rand = "0.9.2" -[features] -fips = ["rustls/fips"] - [[bench]] name = "benchmark" harness = false