Skip to content

Commit 01429bb

Browse files
authored
Drop the fips feature (#179)
## Description ### Why is this change being made? 1. rustls dropped the `fips` feature in rustls/rustls@13da394 ### What is changing? 1. Remove the feature and associated documentation. This is technically a breaking change. ### Related Links - **Issue #, if available**: --- ## Testing ### How was this tested? 1. ### When testing locally, provide testing artifact(s): 1. --- ## Reviewee Checklist **Update the checklist after submitting the PR** - [x] I have reviewed, tested and understand all changes *If not, why:* - [x] I have filled out the Description and Testing sections above *If not, why:* - [x] Build and Unit tests are passing *If not, why:* - [x] Unit test coverage check is passing *If not, why:* - [ ] Integration tests pass locally *If not, why:* Running them in GH actions - [x] I have updated integration tests (if needed) *If not, why:* - [x] I have ensured no sensitive information is leaking (i.e., no logging of sensitive fields, or otherwise) *If not, why:* - [x] I have added explanatory comments for complex logic, new classes/methods and new tests *If not, why:* - [x] I have updated README/documentation (if needed) *If not, why:* - [x] I have clearly called out breaking changes (if any) *If not, why:* --- ## Reviewer Checklist **All reviewers please ensure the following are true before reviewing:** - Reviewee checklist has been accurately filled out - Code changes align with stated purpose in description - Test coverage adequately validates the changes --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 7932392 commit 01429bb

5 files changed

Lines changed: 21 additions & 123 deletions

File tree

.github/workflows/rust.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,6 @@ jobs:
4343
run: |
4444
which cargo-llvm-cov || cargo install cargo-llvm-cov
4545
which cargo-deny || cargo install cargo-deny
46-
- name: Install ninja-build tool for aws-lc-fips-sys on Windows
47-
if: runner.os == 'Windows'
48-
uses: seanmiddleditch/gha-setup-ninja@v6
49-
- name: Install NASM for aws-lc-fips-sys on Windows
50-
if: runner.os == 'Windows'
51-
uses: ilammy/setup-nasm@v1
52-
- name: Install golang for aws-lc-fips-sys on macos
53-
if: runner.os == 'MacOS'
54-
uses: actions/setup-go@v6
55-
with:
56-
go-version: "stable"
5746
- name: Check licenses
5847
run: cargo-deny check licenses
5948
- name: Build

Cargo.lock

Lines changed: 14 additions & 95 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,15 @@ To download the source code, see [https://github\.com/aws/aws\-secretsmanager\-a
3131
- [\[ curl \]](#-curl--1)
3232
- [\[ Python \]](#-python--1)
3333
- [Configure the Secrets Manager Agent](#configure-the-secrets-manager-agent)
34-
- [Optional features](#optional-features)
3534
- [Logging](#logging)
3635
- [Security considerations](#security-considerations)
37-
- [Running Integration Tests Locally](#integration-tests-local)
36+
- [Running Integration Tests Locally](#running-integration-tests-locally)
37+
- [Prerequisites](#prerequisites)
38+
- [Required AWS Permissions](#required-aws-permissions)
39+
- [Running Tests](#running-tests)
40+
- [Option 1: Using the test script](#option-1-using-the-test-script)
41+
- [Option 2: Manual execution](#option-2-manual-execution)
42+
- [Test Organization](#test-organization)
3843

3944
## Step 1: Build the Secrets Manager Agent binary<a name="secrets-manager-agent-build"></a>
4045

@@ -46,10 +51,6 @@ To build the Secrets Manager Agent binary natively, you need the standard develo
4651

4752
Example: `git clone --branch <git tag> https://github.com/aws/aws-secretsmanager-agent.git`
4853

49-
**NOTE:** Building the agent with the `fips` feature enabled on macOS currently requires the following workaround:
50-
51-
- Create an environment variable called `SDKROOT` which is set to the result of running `xcrun --show-sdk-path`
52-
5354
#### [ RPM\-based systems ]
5455

5556
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
468469
+ **path\_prefix** – The URI prefix used to determine if the request is a path based request\. The default is "/v1/"\.
469470
+ **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\.
470471

471-
## Optional features<a name="secrets-manager-agent-features"></a>
472-
473-
The Secrets Manager Agent can be built with optional features by passing the `--features` flag to `cargo build`. The available features are:
474-
* `fips`: restricts the cipher suites used by the agent to only FIPS-approved ciphers
475-
476472
## Logging<a name="secrets-manager-agent-log"></a>
477473

478474
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\.

aws_secretsmanager_agent/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,3 @@ aws-smithy-runtime = { version = "1", features = ["test-util"] }
3737
tokio = { version = "1", features = ["test-util", "rt-multi-thread", "net", "macros"] }
3838
http = "0.2.9"
3939
aws-smithy-types = "1"
40-
41-
[features]
42-
fips = ["aws_secretsmanager_caching/fips"]

aws_secretsmanager_caching/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ tokio-test = "0.4.4"
3232
criterion = { version = "0.7.0", features = ["async_tokio", "html_reports"] }
3333
rand = "0.9.2"
3434

35-
[features]
36-
fips = ["rustls/fips"]
37-
3835
[[bench]]
3936
name = "benchmark"
4037
harness = false

0 commit comments

Comments
 (0)