Skip to content

Commit 430d40c

Browse files
authored
Use sonatype guide dependency audit (#2812)
1 parent 1e3ec70 commit 430d40c

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

.github/repository-settings.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ private admin repo.
2222

2323
- `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
2424
- `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
25-
- `SONATYPE_OSS_INDEX_USER` - owned by [@trask](https://github.com/trask)
26-
- `SONATYPE_OSS_INDEX_PASSWORD` - owned by [@trask](https://github.com/trask)
25+
- `SONATYPE_GUIDE_PAT` - owned by [@trask](https://github.com/trask)
2726
- `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
2827
- `SONATYPE_USER` - owned by [@trask](https://github.com/trask)
2928

.github/workflows/oss-index-audit-daily.yml renamed to .github/workflows/sonatype-guide-dependency-audit-daily.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# the benefit of this over renovate is that this also analyzes transitive dependencies
22
# while renovate (at least currently) only analyzes top-level dependencies
3-
name: OSS Index dependency audit (daily)
3+
name: Sonatype Guide dependency audit (daily)
44

55
on:
66
schedule:
@@ -29,14 +29,13 @@ jobs:
2929
run: ./gradlew ossIndexAudit --no-configuration-cache --no-parallel
3030
continue-on-error: true
3131
env:
32-
SONATYPE_OSS_INDEX_USER: ${{ secrets.SONATYPE_OSS_INDEX_USER }}
33-
SONATYPE_OSS_INDEX_PASSWORD: ${{ secrets.SONATYPE_OSS_INDEX_PASSWORD }}
32+
SONATYPE_GUIDE_PAT: ${{ secrets.SONATYPE_GUIDE_PAT }}
3433
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3534

3635
- name: Print vulnerability report
3736
if: steps.audit.outcome == 'failure'
3837
run: |
39-
echo "=== OSS Index Vulnerability Report ==="
38+
echo "=== Sonatype Guide Vulnerability Report ==="
4039
find . -name "oss-index-cyclonedx-bom.json" | xargs cat
4140
exit 1
4241

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ ossIndexAudit {
221221
isExcludeCompileOnly = true
222222
outputFormat = org.sonatype.gradle.plugins.scan.ossindex.OutputFormat.JSON_CYCLONE_DX_1_4
223223

224-
username = System.getenv("SONATYPE_OSS_INDEX_USER")
225-
password = System.getenv("SONATYPE_OSS_INDEX_PASSWORD")
224+
// Guide PAT authentication ignores this, but the scan plugin requires it.
225+
username = "unused"
226+
password = System.getenv("SONATYPE_GUIDE_PAT") ?: ""
226227
}

0 commit comments

Comments
 (0)