fix: address code review findings

- Pin slsa-github-generator and codeql-action by SHA (not tag)
- Replace anonymous tuple with GroupedActivity struct for readability
- Replace unwrap() with if-let for safety
- Add warning message on attestation failure instead of silent || true
- Fix clippy: map_or -> is_some_and
This commit is contained in:
2026-03-20 22:14:16 +00:00
parent a968016815
commit 12d4a28d34
3 changed files with 42 additions and 29 deletions

View File

@@ -144,7 +144,7 @@ jobs:
- name: Smoke test — verify alpine image starts and responds - name: Smoke test — verify alpine image starts and responds
run: | run: |
docker rm -f nora-smoke 2>/dev/null || true docker rm -f nora-smoke 2>/dev/null || echo "WARNING: attestation failed, continuing without provenance"
docker run --rm -d --name nora-smoke -p 5555:4000 -e NORA_HOST=0.0.0.0 \ docker run --rm -d --name nora-smoke -p 5555:4000 -e NORA_HOST=0.0.0.0 \
${{ env.NORA }}/${{ env.IMAGE_NAME }}:latest ${{ env.NORA }}/${{ env.IMAGE_NAME }}:latest
for i in $(seq 1 10); do for i in $(seq 1 10); do
@@ -226,7 +226,7 @@ jobs:
cat nora-linux-amd64.sha256 cat nora-linux-amd64.sha256
- name: Generate SLSA provenance - name: Generate SLSA provenance
uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@v2.1.0 uses: slsa-framework/slsa-github-generator/.github/actions/generate-builder@f7dd8c54c2067bafc12ca7a55595d5ee9b75204a # v2.1.0
id: provenance-generate id: provenance-generate
continue-on-error: true continue-on-error: true
@@ -234,7 +234,7 @@ jobs:
if: always() if: always()
run: | run: |
# Generate provenance using gh attestation (built-in GitHub feature) # Generate provenance using gh attestation (built-in GitHub feature)
gh attestation create ./nora-linux-amd64 --repo ${{ github.repository }} --signer-workflow ${{ github.server_url }}/${{ github.repository }}/.github/workflows/release.yml 2>/dev/null || true gh attestation create ./nora-linux-amd64 --repo ${{ github.repository }} --signer-workflow ${{ github.server_url }}/${{ github.repository }}/.github/workflows/release.yml 2>/dev/null || echo "WARNING: attestation failed, continuing without provenance"
# Also create a simple provenance file for scorecard # Also create a simple provenance file for scorecard
cat > nora-v${{ github.ref_name }}.provenance.json << 'PROVEOF' cat > nora-v${{ github.ref_name }}.provenance.json << 'PROVEOF'
{ {

View File

@@ -32,7 +32,7 @@ jobs:
repo_token: ${{ secrets.SCORECARD_TOKEN || secrets.GITHUB_TOKEN }} repo_token: ${{ secrets.SCORECARD_TOKEN || secrets.GITHUB_TOKEN }}
- name: Upload Scorecard results to GitHub Security tab - name: Upload Scorecard results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v4 # tag required by scorecard webapp verification uses: github/codeql-action/upload-sarif@256d634097be96e792d6764f9edaefc4320557b1 # v4
with: with:
sarif_file: results.sarif sarif_file: results.sarif
category: scorecard category: scorecard

View File

@@ -75,43 +75,56 @@ pub fn render_dashboard(data: &DashboardResponse, lang: Lang) -> String {
) )
} else { } else {
// Group consecutive identical entries (same action+artifact+registry+source) // Group consecutive identical entries (same action+artifact+registry+source)
let mut grouped: Vec<(String, String, String, String, String, usize)> = Vec::new(); struct GroupedActivity {
time: String,
action: String,
artifact: String,
registry: String,
source: String,
count: usize,
}
let mut grouped: Vec<GroupedActivity> = Vec::new();
for entry in &data.activity { for entry in &data.activity {
let action = entry.action.to_string(); let action = entry.action.to_string();
let last_match = grouped let is_repeat = grouped.last().is_some_and(|last| {
.last() last.action == action
.map(|(_, a, art, reg, src, _)| { && last.artifact == entry.artifact
*a == action && last.registry == entry.registry
&& *art == entry.artifact && last.source == entry.source
&& *reg == entry.registry });
&& *src == entry.source
})
.unwrap_or(false);
if last_match { if is_repeat {
grouped.last_mut().unwrap().5 += 1; if let Some(last) = grouped.last_mut() {
last.count += 1;
}
} else { } else {
let time_ago = format_relative_time(&entry.timestamp); grouped.push(GroupedActivity {
grouped.push(( time: format_relative_time(&entry.timestamp),
time_ago,
action, action,
entry.artifact.clone(), artifact: entry.artifact.clone(),
entry.registry.clone(), registry: entry.registry.clone(),
entry.source.clone(), source: entry.source.clone(),
1, count: 1,
)); });
} }
} }
grouped grouped
.iter() .iter()
.map(|(time, action, artifact, registry, source, count)| { .map(|g| {
let display_artifact = if *count > 1 { let display_artifact = if g.count > 1 {
format!("{} (x{})", artifact, count) format!("{} (x{})", g.artifact, g.count)
} else { } else {
artifact.clone() g.artifact.clone()
}; };
render_activity_row(time, action, &display_artifact, registry, source) render_activity_row(
&g.time,
&g.action,
&display_artifact,
&g.registry,
&g.source,
)
}) })
.collect() .collect()
}; };