Merge branch 'main' into test_librariangen_change

Author: suztomo

.github/workflows/ci.yaml

@@ -3,11 +3,23 @@ on:
     branches:
       - main
   pull_request:
-    paths-ignore:
-      - 'internal/librariangen/**'
 name: ci
 jobs:
+  changes:
+    runs-on: ubuntu-latest
+    outputs:
+      should_run: ${{ steps.filter.outputs.should_run }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+      id: filter
+      with:
+        filters: |
+          should_run:
+            - '!internal/librariangen/**'
   build:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -61,6 +73,8 @@ jobs:
           ./gradlew clean build publishToMavenLocal sourcesJar allJars
           popd
   build-java-21:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     name: "build(21) except self-service clients"
     # Support for Java 21 is available for all use cases except self-service clients.
     runs-on: ubuntu-22.04
@@ -94,6 +108,8 @@ jobs:
         run: |
           bazelisk --batch test //test/integration/...
   build-java-25:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     name: "build(25) except self-service clients"
     # Support for Java 25 is available for all use cases except self-service clients.
     runs-on: ubuntu-22.04
@@ -128,6 +144,8 @@ jobs:
         run: |
           bazelisk --batch test //test/integration/... --jvmopt=-Dcom.google.testing.junit.runner.shouldInstallTestSecurityManager=false
   build-java8-except-gapic-generator-java:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     name: "build(8) except for gapic-generator-java"
     runs-on: ubuntu-22.04
     steps:
@@ -174,6 +192,8 @@ jobs:
           GOOGLE_SDK_JAVA_LOGGING: true
 
   build-java8-gapic-generator-java:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     name: "build(8) for gapic-generator-java"
     runs-on: ubuntu-22.04
     steps:
@@ -221,6 +241,8 @@ jobs:
           popd
 
   lint:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -235,6 +257,8 @@ jobs:
         run: mvn -B -ntp fmt:check
 
   compatibility:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -250,6 +274,8 @@ jobs:
         run: mvn package clirr:check -DskipTests -Dfmt.skip
 
   build-java8-showcase:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     name: "build(8) for showcase"
     runs-on: ubuntu-22.04
     steps:
@@ -306,6 +332,8 @@ jobs:
             --batch-mode \
             --no-transfer-progress
   showcase:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
     strategy:
       matrix:
@@ -376,7 +404,8 @@ jobs:
             --no-transfer-progress
 
   showcase-clirr:
-    if: ${{ github.base_ref != '' }} # Only execute on pull_request trigger event
+    needs: changes
+    if: ${{ github.base_ref != '' && needs.changes.outputs.should_run == 'true' }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout @ target branch
@@ -407,6 +436,8 @@ jobs:
           mvn clirr:check -B -ntp -Dclirr.skip=false -DcomparisonVersion=$SHOWCASE_CLIENT_VERSION
 
   gapic-generator-java-bom:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
@@ -424,6 +455,8 @@ jobs:
         bom-path: gapic-generator-java-bom/pom.xml
 
   unmanaged_dependency_check:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
@@ -447,6 +480,8 @@ jobs:
         bom-path: gapic-generator-java-bom/pom.xml
 
   dependency_analyzer_unit_test:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
@@ -460,4 +495,4 @@ jobs:
     - name: Unit Tests
       run: |
         mvn test --batch-mode --no-transfer-progress
-      working-directory: java-shared-dependencies/dependency-analyzer
+      working-directory: java-shared-dependencies/dependency-analyzer

.github/workflows/dependency_compatibility_test.yaml

@@ -4,8 +4,6 @@ on:
   pull_request:
     branches:
       - 'main'
-    paths-ignore:
-      - 'internal/librariangen/**'      
   workflow_dispatch:
     inputs:
       dependencies-list:
@@ -17,7 +15,21 @@ on:
         default: ''
 
 jobs:
+  changes:
+    runs-on: ubuntu-latest
+    outputs:
+      should_run: ${{ steps.filter.outputs.should_run }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+      id: filter
+      with:
+        filters: |
+          should_run:
+            - '!internal/librariangen/**'
   dependency-compatibility-test:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -75,4 +87,4 @@ jobs:
           else
             ../.github/scripts/test_dependency_compatibility.sh -f ../dependencies.txt
           fi
-        working-directory: java-showcase
+        working-directory: java-showcase

.github/workflows/hermetic_library_generation.yaml

@@ -16,8 +16,6 @@
 name: Hermetic library generation upon generation config change through pull requests
 on:
   pull_request:
-    paths-ignore:
-      - 'internal/librariangen/**'
 
 env:
   REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}

.github/workflows/java_compatibility_check.yaml

@@ -15,11 +15,23 @@
 # downstream client libraries before they are released.
 on:
   pull_request:
-    paths-ignore:
-      - 'internal/librariangen/**'  
 name: Java 8 compatibility check
 jobs:
+  changes:
+    runs-on: ubuntu-latest
+    outputs:
+      should_run: ${{ steps.filter.outputs.should_run }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+      id: filter
+      with:
+        filters: |
+          should_run:
+            - '!internal/librariangen/**'
   java8-compatibility-check:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -45,4 +57,4 @@ jobs:
             exit 1
           fi
         done
-        echo "All class files are compatible with Java 8."
+        echo "All class files are compatible with Java 8."

.github/workflows/sonar.yaml

@@ -5,10 +5,22 @@ on:
       - main
   pull_request:
     types: [opened, synchronize, reopened]
-    paths-ignore:
-      - 'internal/librariangen/**'
 jobs:
+  changes:
+    runs-on: ubuntu-latest
+    outputs:
+      should_run: ${{ steps.filter.outputs.should_run }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+      id: filter
+      with:
+        filters: |
+          should_run:
+            - '!internal/librariangen/**'
   build:
+    needs: changes
+    if: needs.changes.outputs.should_run == 'true'
     name: Build
     runs-on: ubuntu-22.04
     steps:
@@ -78,4 +90,4 @@ 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=java_showcase_integration_tests

.github/workflows/verify_library_generation.yaml

@@ -1,7 +1,5 @@
 on:
   pull_request:
-    paths-ignore:
-      - 'internal/librariangen/**'
 
 name: verify_library_generation
 jobs:

internal/librariangen/generate/generator.go

@@ -27,15 +27,15 @@ import (
 
 	"cloud.google.com/java/internal/librariangen/bazel"
 	"cloud.google.com/java/internal/librariangen/execv"
+	"cloud.google.com/java/internal/librariangen/message"
 	"cloud.google.com/java/internal/librariangen/protoc"
-	"cloud.google.com/java/internal/librariangen/request"
 )
 
 // Test substitution vars.
 var (
 	bazelParse   = bazel.Parse
 	execvRun     = execv.Run
-	requestParse = request.ParseLibrary
+	requestParse = message.ParseLibrary
 	protocBuild  = protoc.Build
 )
 
@@ -113,7 +113,7 @@ func Generate(ctx context.Context, cfg *Config) error {
 // invokeProtoc handles the protoc GAPIC generation logic for the 'generate' CLI command.
 // It reads a request file, and for each API specified, it invokes protoc
 // to generate the client library. It returns the module path and the path to the service YAML.
-func invokeProtoc(ctx context.Context, cfg *Config, generateReq *request.Library) error {
+func invokeProtoc(ctx context.Context, cfg *Config, generateReq *message.Library) error {
 	for _, api := range generateReq.APIs {
 		apiServiceDir := filepath.Join(cfg.SourceDir, api.Path)
 		slog.Info("processing api", "service_dir", apiServiceDir)
@@ -135,7 +135,7 @@ func invokeProtoc(ctx context.Context, cfg *Config, generateReq *request.Library
 // readGenerateReq reads generate-request.json from the librarian-tool input directory.
 // The request file tells librariangen which library and APIs to generate.
 // It is prepared by the Librarian tool and mounted at /librarian.
-func readGenerateReq(librarianDir string) (*request.Library, error) {
+func readGenerateReq(librarianDir string) (*message.Library, error) {
 	reqPath := filepath.Join(librarianDir, "generate-request.json")
 	slog.Debug("librariangen: reading generate request", "path", reqPath)
 
@@ -264,4 +264,4 @@ func unzip(src, dest string) error {
 		}
 	}
 	return nil
-}
+}

internal/librariangen/request/request.go internal/librariangen/message/message.gointernal/librariangen/request/request.go renamed to internal/librariangen/message/message.go

@@ -12,14 +12,30 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package request
+// Package message defines data types which the Librarian CLI and language
+// containers exchange.
+// There shouldn't be CLI-specific data type or language container-specific
+// data types in this package.
+// TODO(b/447404382): Move this package to the https://github.com/googleapis/librarian
+// GitHub repository once the interface is finalized.
+package message
 
 import (
 	"encoding/json"
 	"fmt"
 	"os"
 )
 
+// ReleaseInitRequest is the structure of the release-init-request.json file.
+type ReleaseInitRequest struct {
+	Libraries []*Library `json:"libraries"`
+}
+
+// ReleaseInitResponse is the structure of the release-init-response.json file.
+type ReleaseInitResponse struct {
+	Error string `json:"error,omitempty"`
+}
+
 // Library is the combination of all the fields used by CLI requests and responses.
 // Each CLI command has its own request/response type, but they all use Library.
 type Library struct {
@@ -75,4 +91,4 @@ func ParseLibrary(path string) (*Library, error) {
 	}
 
 	return &req, nil
-}
+}

…nal/librariangen/request/request_test.go …nal/librariangen/message/message_test.gointernal/librariangen/request/request_test.go renamed to internal/librariangen/message/message_test.go internal/librariangen/request/request_test.go renamed to internal/librariangen/message/message_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package request
+package message
 
 import (
 	"os"
@@ -95,4 +95,4 @@ func TestParseLibrary_FileNotFound(t *testing.T) {
 	if err == nil {
 		t.Error("Parse() expected error for non-existent file, got nil")
 	}
-}
+}