From 32565ea9118db7c41b42c18fee591f0d66f413fc Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Fri, 17 Apr 2026 14:52:06 -0400 Subject: [PATCH 1/4] build: update Sonar tokens and project keys in workflow Fixes: #12821. --- .github/workflows/sdk-platform-java-sonar.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index 24133d69110d..12c3fc36b1ad 100644 --- a/.github/workflows/sdk-platform-java-sonar.yaml +++ b/.github/workflows/sdk-platform-java-sonar.yaml @@ -70,19 +70,20 @@ jobs: - name: Build and analyze for full test coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FOR_GENERATOR }} run: | mvn -B verify -Pquick-build \ -DenableFullTestCoverage \ -Penable-integration-tests \ org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ - -Dsonar.projectKey=googleapis_gapic-generator-java \ + -Dsonar.projectKey=googleapis_google-cloud-java_generator \ -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io + -Dsonar.projectBaseDir=sdk-platform-java - name: Build and analyze Showcase Integration Tests Coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FOR_SHOWCASE }} run: | mvn -B clean verify -Pquick-build \ -DskipUnitTests \ @@ -92,4 +93,5 @@ jobs: -Dsonar.projectKey=googleapis_gapic-generator-java_integration_tests \ -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.projectName=java_showcase_integration_tests + -Dsonar.projectName=googleapis_google-cloud-java_showcase + -Dsonar.projectBaseDir=sdk-platform-java From 1a48159698394f7cafaffbe7b3b51c2b9e60269f Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Fri, 17 Apr 2026 14:59:44 -0400 Subject: [PATCH 2/4] Add workflow filter for sonar.yaml --- .github/workflows/sdk-platform-java-sonar.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index 12c3fc36b1ad..93290bf22903 100644 --- a/.github/workflows/sdk-platform-java-sonar.yaml +++ b/.github/workflows/sdk-platform-java-sonar.yaml @@ -20,6 +20,7 @@ jobs: filters: | library: - 'sdk-platform-java/**' + - '.github/workflows/sdk-platform-java-sonar.yaml' build: needs: filter if: needs.filter.outputs.library == 'true' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request') From 3f4ee44f251719bedf17a6d01ac4ca2bfe305164 Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Fri, 17 Apr 2026 15:59:19 -0400 Subject: [PATCH 3/4] impl: isolate sonar build to sdk-platform-java --- .../workflows/sdk-platform-java-sonar.yaml | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index 93290bf22903..397fabd8f816 100644 --- a/.github/workflows/sdk-platform-java-sonar.yaml +++ b/.github/workflows/sdk-platform-java-sonar.yaml @@ -47,13 +47,18 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Install modules to local maven - run: | - mvn install -T 1C -DskipTests -ntp -B - cd java-showcase - mvn install -T 1C -DskipTests -ntp -B + - name: Install sdk-platform-modules + shell: bash + run: .kokoro/build.sh + env: + BUILD_SUBDIR: sdk-platform-java + JOB_TYPE: install + - name: Install java-showcase + shell: bash + run: mvn install -T 1C -DskipTests -ntp -B + working-directory: sdk-platform-java/java-showcase - name: Parse showcase version - working-directory: java-showcase/gapic-showcase + working-directory: sdk-platform-java/java-showcase/gapic-showcase run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV" - name: Install showcase server run: | @@ -69,6 +74,7 @@ jobs: # step for a few tests (env var tests) may be overkill and should be better covered # when we can upgrade to JUnit 5 (https://github.com/googleapis/sdk-platform-java/issues/1611#issuecomment-1970079325) - name: Build and analyze for full test coverage + working-directory: sdk-platform-java env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FOR_GENERATOR }} @@ -80,8 +86,8 @@ jobs: -Dsonar.projectKey=googleapis_google-cloud-java_generator \ -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io - -Dsonar.projectBaseDir=sdk-platform-java - name: Build and analyze Showcase Integration Tests Coverage + working-directory: sdk-platform-java env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FOR_SHOWCASE }} @@ -95,4 +101,3 @@ jobs: -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.projectName=googleapis_google-cloud-java_showcase - -Dsonar.projectBaseDir=sdk-platform-java From b93fd25ceadb7f414342dd4badd088a90b3fa2ae Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Fri, 17 Apr 2026 16:39:42 -0400 Subject: [PATCH 4/4] correct sonar.projectKey for showcase --- .github/workflows/sdk-platform-java-sonar.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index 397fabd8f816..23063c3cdb1a 100644 --- a/.github/workflows/sdk-platform-java-sonar.yaml +++ b/.github/workflows/sdk-platform-java-sonar.yaml @@ -97,7 +97,6 @@ jobs: -Penable-integration-tests \ -DenableShowcaseTestCoverage \ org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ - -Dsonar.projectKey=googleapis_gapic-generator-java_integration_tests \ + -Dsonar.projectKey=googleapis_google-cloud-java_showcase \ -Dsonar.organization=googleapis \ - -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.projectName=googleapis_google-cloud-java_showcase + -Dsonar.host.url=https://sonarcloud.io