Merge branch 'googleapis:main' into fix/bigquery-12885-retry-503

Author: goutamadwant

.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:
 
@@ -57,12 +57,16 @@ jobs:
     - name: Run librarian install
       run: |
         librarian install
-        echo "$HOME/java_tools/bin" >> $GITHUB_PATH
+        echo "$HOME/.cache/librarian/bin/java_tools/bin" >> $GITHUB_PATH
     - name: Run librarian generate
       env:
         PYTHONPATH: ${{ github.workspace }}/sdk-platform-java/hermetic_build/library_generation/owlbot
       run: |
         librarian generate --all
     - name: Check for generated code changes
       run: |
-        git diff --exit-code
+        if [ -n "$(git status --porcelain)" ]; then
+          git status
+          echo "Regeneration produced code changes! Please run 'librarian generate --all' to update the generated files."
+          exit 1
+        fi

.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_generation_config.yaml

@@ -15,8 +15,6 @@
 # downstream client libraries before they are released.
 name: Update generation configuration
 on:
-  schedule:
-  - cron: '0 2 * * *'
   workflow_dispatch:
 jobs:
   update-generation-config:

.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
+        echo "$HOME/.cache/librarian/bin/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"

CONTRIBUTING.md

@@ -124,7 +124,7 @@ feat(storage): add new storage bucket feature
 
 A new feature is added to storage.
 
-Fixes \#238
+Fixes #238
 ```
 
 ### First line

DEVELOPMENT.md

@@ -1,6 +1,6 @@
 # Monorepo Scoped Development Guide
 
-This document outlines development workflows and build strategies when working with specific client libraries or modules in the `google-cloud-java` monorepo.
+This document outlines development workflows, build strategies, and code generation processes when working with or managing client libraries in the `google-cloud-java` monorepo.
 
 ---
 
@@ -51,3 +51,20 @@ mvn compile
 ```
 
 Your IDE such as Intellij should also be able to import all the upstream dependencies at this moment. You can perform the same operations as you would in a normal project such as running unit tests, debugging and so on. 
+
+---
+
+## 3. Code Generation (Librarian)
+
+This repository uses **[Librarian](https://github.com/googleapis/librarian)** to generate code from API specifications.
+
+The configuration for Librarian in this repository is defined in the [librarian.yaml](librarian.yaml) file at the root.
+
+### Documentation & Guides
+
+For more information on how to use Librarian, configure generation, or troubleshoot issues, refer to the following guides:
+
+*   **[Librarian GitHub Repository](https://github.com/googleapis/librarian)**: The main repository for the Librarian tool.
+*   **[Librarian Command Reference](https://pkg.go.dev/github.com/googleapis/librarian/cmd/librarian)**: Detailed documentation of `librarian` CLI commands.
+*   **[Librarian Configuration Schema](https://github.com/googleapis/librarian/blob/main/doc/config-schema.md)**: Guide to the structure and options available in `librarian.yaml`.
+*   **[go/g3doc-sdk-librarian](https://go/g3doc-sdk-librarian)** (Internal): Internal documentation for code generation schedules and local development workflows.