chore(gax): changes to the monorepo to support GAX

Author: bshaffer

.github/run-package-tests.sh

@@ -63,6 +63,7 @@ for DIR in ${DIRS}; do
     cp "${DIR}/composer.json" "${DIR}/composer-local.json"
     # Update composer to use local packages
     PACKAGE_DEPENDENCIES=(
+        "Gax,gax"
         "CommonProtos,common-protos,4.100"
         "BigQuery,cloud-bigquery"
         "Core,cloud-core"

.github/workflows/conformance-tests-gax-showcase.yaml

@@ -0,0 +1,38 @@
+name: Run GAX Conformance Tests With Showcase
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+permissions:
+  contents: read
+jobs:
+    gapic-showcase:
+        runs-on: ubuntu-latest
+        env:
+            GAPIC_SHOWCASE_VERSION: 0.36.2
+            OS: linux
+            ARCH: amd64
+        name: GAPIC Showcase Conformance Tests
+        steps:
+        - name: Checkout code
+          uses: actions/checkout@v6
+
+        - name: Setup PHP
+          uses: shivammathur/setup-php@v2
+          with:
+            php-version: '8.1'
+            extensions: grpc
+
+        - name: Install and run GAPIC Showcase
+          run: |
+            curl -L https://github.com/googleapis/gapic-showcase/releases/download/v${GAPIC_SHOWCASE_VERSION}/gapic-showcase-${GAPIC_SHOWCASE_VERSION}-${OS}-${ARCH}.tar.gz | tar -zx
+            ./gapic-showcase run &
+
+        - name: Install dependencies
+          run: |
+            composer update --prefer-dist --no-interaction --no-suggest -d Gax/
+
+        - name: Run PHPUnit
+          run: Gax/vendor/bin/phpunit -c Gax/phpunit-conformance.xml.dist
+

.github/workflows/unit-tests.yaml

@@ -12,14 +12,22 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, windows-latest]
-        php: [ "8.1", "8.2", "8.3", "8.4", "8.5" ]
-        extensions: ["grpc-1.54.0"]
+        php: [ "8.2", "8.3", "8.4", "8.5" ]
+        extensions: ["grpc-1.78.0"]
         type: ["Unit Test"]
         include:
           - platform: "ubuntu-latest"
             php: "8.1"
-            extensions: "protobuf,grpc-1.54.0"
+            extensions: "grpc-1.78.0"
+            type: "Unit Test"
+          - platform: "ubuntu-latest"
+            php: "8.1"
+            extensions: "protobuf,grpc"
             type: "Unit Test + protobuf extension"
+          - platform: "ubuntu-latest"
+            php: "8.1"
+            extensions: ""
+            type: "Unit Test (no gRPC)"
     name: PHP ${{ matrix.php }} ${{ matrix.type }} (${{ matrix.platform }})
     runs-on: ${{ matrix.platform }}
     continue-on-error: true
@@ -30,7 +38,7 @@ jobs:
       uses: shivammathur/cache-extensions@v1
       with:
         php-version: ${{ matrix.php }}
-        extensions: sodium,${{ matrix.extensions }}
+        extensions: sodium,sysvshm,${{ matrix.extensions }}
         key: cache-key-1 # increment to bust the cache
     - name: Cache extensions
       uses: actions/cache@v5
@@ -42,7 +50,7 @@ jobs:
       uses: shivammathur/setup-php@verbose
       with:
         php-version: ${{ matrix.php }}
-        extensions: sodium,${{ matrix.extensions }}
+        extensions: sodium,sysvshm,${{ matrix.extensions }}
     - name: Install Dependencies
       uses: nick-invision/retry@v4
       with:

.kokoro/docs/publish.sh

@@ -42,15 +42,6 @@ do
         $VERBOSITY_FLAG
 done
 
-# Add GAX repo
-GAX_DIR=$PROJECT_DIR/dev/vendor/google/gax
-$PROJECT_DIR/dev/google-cloud docfx \
-    --path $GAX_DIR \
-    --out gax-out \
-    --metadata-version $(cat $GAX_DIR/VERSION) \
-    $STAGING_FLAG \
-    $VERBOSITY_FLAG
-
 # Add Auth repo
 AUTH_DIR=$PROJECT_DIR/dev/vendor/google/auth
 $PROJECT_DIR/dev/google-cloud docfx \

.repo-metadata-full.json

@@ -805,6 +805,14 @@
         "library_type": "GAPIC_AUTO",
         "api_shortname": "cloudfunctions"
     },
+    "Gax": {
+        "language": "php",
+        "distribution_name": "google/gax",
+        "release_level": "stable",
+        "client_documentation": "https://cloud.google.com/php/docs/reference/gax/latest",
+        "library_type": "CORE",
+        "api_shortname": ""
+    },
     "GSuiteAddOns": {
         "language": "php",
         "distribution_name": "google/cloud-gsuite-addons",

CommonProtos/renovate.json

@@ -47,7 +47,9 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Google\\Cloud\\Core\\Tests\\": "tests"
+            "Google\\Cloud\\Core\\Tests\\": "tests",
+            "Google\\ApiCore\\Testing\\": "tests/Unit/generated",
+            "GPBMetadata\\ApiCore\\Testing\\": "tests/Unit/metadata"
         }
     }
 }

Core/composer.json

@@ -18,6 +18,7 @@
 namespace Google\Cloud\Core\Testing\Snippet;
 
 use Google\Cloud\Core\Testing\CheckForClassTrait;
+use Google\Cloud\Core\Testing\GrpcTestTrait;
 use Google\Cloud\Core\Testing\Snippet\Container;
 use Google\Cloud\Core\Testing\Snippet\Parser\Snippet;
 use PHPUnit\Framework\TestCase;
@@ -35,6 +36,7 @@ class SnippetTestCase extends TestCase
     const PROJECT = 'my-awesome-project';
 
     use CheckForClassTrait;
+    use GrpcTestTrait;
 
     private static $coverage;
     private static $parser;

Core/src/Testing/Snippet/SnippetTestCase.php

@@ -54,6 +54,7 @@ public function testClass()
         $this->checkAndSkipTest([
             SpannerClient::class,
         ]);
+        $this->checkAndSkipGrpcTests();
         $res = $snippet->invoke('iam');
 
         $this->assertInstanceOf(IamManager::class, $res->returnVal());