diff --git a/.github/repository-settings.md b/.github/repository-settings.md index 8ae938b1109..85b2a9053a4 100644 --- a/.github/repository-settings.md +++ b/.github/repository-settings.md @@ -10,8 +10,7 @@ private admin repo. - `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password - `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password -- `SONATYPE_OSS_INDEX_USER` - owned by [@jack-berg](https://github.com/jack-berg) -- `SONATYPE_OSS_INDEX_PASSWORD` - owned by [@jack-berg](https://github.com/jack-berg) +- `SONATYPE_GUIDE_PAT` - owned by [@jack-berg](https://github.com/jack-berg) - `SONATYPE_KEY` - owned by [@jack-berg](https://github.com/jack-berg) - `SONATYPE_USER` - owned by [@jack-berg](https://github.com/jack-berg) diff --git a/.github/workflows/oss-index-audit-daily.yml b/.github/workflows/sonatype-guide-dependency-audit-daily.yml similarity index 85% rename from .github/workflows/oss-index-audit-daily.yml rename to .github/workflows/sonatype-guide-dependency-audit-daily.yml index 723f89cbdef..8070d970b16 100644 --- a/.github/workflows/oss-index-audit-daily.yml +++ b/.github/workflows/sonatype-guide-dependency-audit-daily.yml @@ -1,6 +1,6 @@ # the benefit of this over renovate is that this also analyzes transitive dependencies # while renovate (at least currently) only analyzes top-level dependencies -name: OSS Index dependency audit (daily) +name: Sonatype Guide dependency audit (daily) on: schedule: @@ -29,14 +29,13 @@ jobs: id: audit continue-on-error: true env: - SONATYPE_OSS_INDEX_USER: ${{ secrets.SONATYPE_OSS_INDEX_USER }} - SONATYPE_OSS_INDEX_PASSWORD: ${{ secrets.SONATYPE_OSS_INDEX_PASSWORD }} + SONATYPE_GUIDE_PAT: ${{ secrets.SONATYPE_GUIDE_PAT }} DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - name: Print vulnerability report if: steps.audit.outcome == 'failure' run: | - echo "=== OSS Index Vulnerability Report ===" + echo "=== Sonatype Guide Vulnerability Report ===" find . -name "oss-index-cyclonedx-bom.json" | xargs cat exit 1 diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 703b9aa73bc..41bfb1516ea 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -49,8 +49,9 @@ checkstyle { } ossIndexAudit { - username = System.getenv("SONATYPE_OSS_INDEX_USER") ?: "" - password = System.getenv("SONATYPE_OSS_INDEX_PASSWORD") ?: "" + // Guide PAT authentication ignores this, but the scan plugin requires it. + username = "unused" + password = System.getenv("SONATYPE_GUIDE_PAT") ?: "" outputFormat = org.sonatype.gradle.plugins.scan.ossindex.OutputFormat.JSON_CYCLONE_DX_1_4 isPrintBanner = false }