Skip to content

Commit 4c441b2

Browse files
chore: review fixes
1 parent 06fa0c0 commit 4c441b2

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ jobs:
4545
shell: bash
4646
run: |
4747
if [[ "${{ matrix.platform }}" == "windows-latest" ]]; then
48-
export AWS_LC_FIPS_SYS_NO_ASM=1;
49-
fi;
48+
export AWS_LC_FIPS_SYS_NO_ASM=1
49+
fi
5050
# shellcheck disable=SC2046
51-
cargo clippy --workspace --all-targets --all-features -- -D warnings $([ ${{ matrix.rust_version }} = 1.78.0 ] || [ ${{ matrix.rust_version }} = stable ] && echo -Aunknown-lints -Ainvalid_reference_casting -Aclippy::redundant-closure-call);
51+
cargo clippy --workspace --all-targets --all-features -- -D warnings $([ ${{ matrix.rust_version }} = 1.78.0 ] || [ ${{ matrix.rust_version }} = stable ] && echo -Aunknown-lints -Ainvalid_reference_casting -Aclippy::redundant-closure-call)
5252
5353
licensecheck:
5454
runs-on: ubuntu-latest

ddcommon/Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,12 @@ cgroup_testing = []
8080
fips = ["https", "hyper-rustls/fips"]
8181

8282
[lints.rust]
83+
# We run coverage checks in our github actions. These checks are run with
84+
# --all-features which is incompatible with our fips feature. The crypto
85+
# provider default needs to be set by the caller in fips mode. For now, we want
86+
# to make sure that the coverage tests use the non-fips version of the crypto
87+
# provider initialization logic, so we added a coverage cfg check on the
88+
# function in src/connector/mod.rs. The coverage config is actually not used in
89+
# normal environments, so we need to let the rust linter know that it is in
90+
# fact a real thing, though one that shows up only in some situations.
8391
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage)'] }

ddcommon/src/connector/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ mod https {
110110
});
111111
}
112112

113-
// This this actually needs to be done by the user somewhere in their own main.
114-
// This will only be active on Unix platforms
113+
// This actually needs to be done by the user somewhere in their own main. This will only
114+
// be active on Unix platforms
115115
#[cfg(all(feature = "fips", not(coverage)))]
116116
fn ensure_crypto_provider_initialized() {}
117117

local-linux.Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ RUN apt-get update && \
1414
docker.io \
1515
sudo \
1616
wget \
17-
&& rm -rf /var/lib/apt/lists/* \
18-
&& wget -O go1.24.2.linux-arm64.tar.gz https://go.dev/dl/go1.24.2.linux-arm64.tar.gz \
17+
&& rm -rf /var/lib/apt/lists/*
18+
19+
# We need go in order to build aws-lc-fips-sys
20+
RUN wget -O go1.24.2.linux-arm64.tar.gz https://go.dev/dl/go1.24.2.linux-arm64.tar.gz \
1921
&& tar -C /usr/local -xzf go1.24.2.linux-arm64.tar.gz
2022

2123
# Docker-in-Docker configuration (necessary for integration tests)

0 commit comments

Comments
 (0)