Merge branch 'main' into fix-testbench-localhost-hang

Author: Dhriti07

.github/workflows/librarian_generation_check.yaml

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-name: Librarian generate diff check on pull requests
+name: Librarian - Generate diff check on pull requests
 on:
   pull_request:
 

.github/workflows/showcase-version-check.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Showcase Version Check
+name: Librarian - Showcase Version Check
 
 on:
   schedule:

.github/workflows/update_librarian_googleapis.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: Update librarian googleapis commitish
+name: Librarian - Update googleapis commitish and generate all
 on:
   schedule:
   - cron: '0 3 * * *' # Run once a day at 3:00 AM UTC
@@ -85,6 +85,7 @@ jobs:
           echo "has_changes=true" >> $GITHUB_OUTPUT
         fi
     - name: Install protoc
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
         set -e
         VERSION="33.2"
@@ -93,42 +94,37 @@ jobs:
         sudo unzip -o /tmp/protoc.zip
         protoc --version
     - uses: actions/setup-java@v4
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       with:
         java-version: "17"
         distribution: "temurin"
         cache: "maven"
     - name: Verify Java and Maven installation
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
         java -version
         if ! command -v mvn &> /dev/null; then
           sudo apt-get update && sudo apt-get install -y maven
         fi
         mvn -version
     - uses: actions/setup-python@v5
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       with:
         python-version: "3.12"
         cache: 'pip'
     - name: Run librarian install
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       run: |
         go run github.com/googleapis/librarian/cmd/librarian@latest install
         echo "$HOME/java_tools/bin" >> $GITHUB_PATH
       env:
         PYTHONPATH: ${{ github.workspace }}/sdk-platform-java/hermetic_build/library_generation/owlbot
     - name: Generate Libraries
       if: steps.detect_librarian.outputs.has_changes == 'true'
-      id: generate
       run: |
         go run github.com/googleapis/librarian/cmd/librarian@latest generate --all
-        git add .
-        changed_files=$(git diff --cached --name-only)
-        if [[ "${changed_files}" == "" ]]; then
-          echo "has_changes=false" >> $GITHUB_OUTPUT
-          echo "No changes in libraries"
-        else
-          echo "has_changes=true" >> $GITHUB_OUTPUT
-        fi
     - name: Commit and Create PR
-      if: steps.detect_librarian.outputs.has_changes == 'true' || steps.generate.outputs.has_changes == 'true'
+      if: steps.detect_librarian.outputs.has_changes == 'true'
       env:
         GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
         PR_TITLE: "chore: update googleapis commitish to ${{ steps.commit.outputs.short_commit }}"
@@ -139,7 +135,7 @@ jobs:
         if [ "${{ github.event_name }}" = "pull_request" ]; then
           echo "=== PR Test: DRY RUN MODE ACTIVE ==="
           echo "Would have checked out branch: update-librarian-googleapis-main"
-          echo "Would have committed with title: $PR_TITLE"
+          echo "Would have committed configs with title: $PR_TITLE"
           echo "Would have pushed branch and created PR."
           exit 0
         fi
@@ -153,8 +149,22 @@ jobs:
         # Create and switch to the branch (force checkout -B to discard any local state on this branch name if it existed)
         git checkout -B "${current_branch}"
         
-        # Commit the changes (they are already staged by the Detect Changes step!)
-        git commit -m "${PR_TITLE}"
+        # 1. Commit Config Changes
+        # Ensure they are staged
+        git add librarian.yaml generation_config.yaml
+        if ! git diff --cached --quiet; then
+          git commit -m "${PR_TITLE}"
+        else
+          echo "No config changes to commit"
+        fi
+        
+        # 2. Commit Generated Code
+        git add .
+        if ! git diff --cached --quiet; then
+          git commit -m "chore: generate libraries"
+        else
+          echo "No generated code changes to commit"
+        fi
         
         # Push to remote (force push to overwrite any stale branch on remote)
         git remote add remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${{ github.repository }}.git" || git remote set-url remote_repo https://cloud-java-bot:"${GH_TOKEN}@github.com/${{ github.repository }}.git"

generation_config.yaml

@@ -1442,7 +1442,7 @@ libraries:
   GAPICs:
   - proto_path: google/iam/admin/v1
 - api_shortname: iam-policy
-  name_pretty: IAM
+  name_pretty: Cloud IAM Policy
   product_documentation: n/a
   api_description: n/a
   release_level: stable

java-iam-policy/.repo-metadata.json

@@ -1,6 +1,6 @@
 {
   "api_shortname": "iam-policy",
-  "name_pretty": "Google Cloud IAM Policy",
+  "name_pretty": "Cloud IAM Policy",
   "product_documentation": "n/a",
   "api_description": "n/a",
   "client_documentation": "https://cloud.google.com/java/docs/reference/proto-google-iam-v1/latest/history",

java-iam-policy/README.md

@@ -1,6 +1,6 @@
-# Google IAM Client for Java
+# Google Cloud IAM Policy Client for Java
 
-Java idiomatic client for [IAM][product-docs].
+Java idiomatic client for [Cloud IAM Policy][product-docs].
 
 [![Maven][maven-version-image]][maven-version-link]
 ![Stability][stability-image]
@@ -64,14 +64,14 @@ See the [Authentication][authentication] section in the base directory's README.
 
 ## Authorization
 
-The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired IAM APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the IAM API calls.
+The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired Cloud IAM Policy APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the Cloud IAM Policy API calls.
 
 ## Getting Started
 
 ### Prerequisites
 
-You will need a [Google Cloud Platform Console][developer-console] project with the IAM [API enabled][enable-api].
-You will need to [enable billing][enable-billing] to use Google IAM.
+You will need a [Google Cloud Platform Console][developer-console] project with the Cloud IAM Policy [API enabled][enable-api].
+You will need to [enable billing][enable-billing] to use Google Cloud IAM Policy.
 [Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by
 [installing the Google Cloud Command Line Interface][cloud-cli] and running the following commands in command line:
 `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`.
@@ -81,13 +81,13 @@ You will need to [enable billing][enable-billing] to use Google IAM.
 You'll need to obtain the `google-iam-policy` library.  See the [Quickstart](#quickstart) section
 to add `google-iam-policy` as a dependency in your code.
 
-## About IAM
+## About Cloud IAM Policy
 
 
-[IAM][product-docs] n/a
+[Cloud IAM Policy][product-docs] n/a
 
-See the [IAM client library docs][javadocs] to learn how to
-use this IAM Client Library.
+See the [Cloud IAM Policy client library docs][javadocs] to learn how to
+use this Cloud IAM Policy Client Library.
 
 
 
@@ -100,7 +100,7 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr
 
 ## Transport
 
-IAM uses both gRPC and HTTP/JSON for the transport layer.
+Cloud IAM Policy uses both gRPC and HTTP/JSON for the transport layer.
 
 ## Supported Java Versions
 

librarian.yaml

@@ -2146,7 +2146,7 @@ libraries:
         - google-iam-policy
         - proto-google-iam-v1
       released_version: 1.90.0
-      name_pretty_override: IAM
+      name_pretty_override: Cloud IAM Policy
       product_documentation_override: n/a
   - name: iamcredentials
     version: 2.93.0