chore: merge main into generate-libraries-main

Author: cloud-java-bot

.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')
@@ -46,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: |
@@ -68,28 +74,29 @@ 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 }}
+          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
       - 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 }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FOR_SHOWCASE }}
         run: |
           mvn -B clean verify -Pquick-build \
               -DskipUnitTests \
               -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=java_showcase_integration_tests
+              -Dsonar.host.url=https://sonarcloud.io

generation_config.yaml

@@ -1299,12 +1299,13 @@ libraries:
   - proto_path: google/cloud/hypercomputecluster/v1beta
   - proto_path: google/cloud/hypercomputecluster/v1
   requires_billing: true
-- api_shortname: iam
+- api_shortname: iam-policy
   name_pretty: IAM
   product_documentation: n/a
   api_description: n/a
   release_level: stable
   distribution_name: com.google.cloud:google-iam-policy
+  api_id: iam.googleapis.com
   client_documentation: https://cloud.google.com/java/docs/reference/proto-google-iam-v1/latest/history
   excluded_poms: proto-google-iam-v1-bom,google-iam-policy,proto-google-iam-v1
   excluded_dependencies: google-iam-policy

java-iam/.OwlBot-hermetic.yaml java-iam-policy/.OwlBot-hermetic.yamljava-iam/.OwlBot-hermetic.yaml renamed to java-iam-policy/.OwlBot-hermetic.yaml

@@ -1,5 +1,5 @@
 {
-  "api_shortname": "iam",
+  "api_shortname": "iam-policy",
   "name_pretty": "IAM",
   "product_documentation": "n/a",
   "api_description": "n/a",
@@ -8,7 +8,7 @@
   "transport": "both",
   "language": "java",
   "repo": "googleapis/google-cloud-java",
-  "repo_short": "java-iam",
+  "repo_short": "java-iam-policy",
   "distribution_name": "com.google.cloud:google-iam-policy",
   "api_id": "iam.googleapis.com",
   "library_type": "GAPIC_AUTO",