Merge branch 'main' into spanner-occ

Author: purva9413

.github/run-package-tests.sh

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -e
+
 DIRS=$(find * -maxdepth 0 -type d -name '[A-Z]*')
 PREFER_LOWEST=""
 if [ "$#" -eq 1 ]; then
@@ -42,45 +44,57 @@ fi
 export COMPOSER=composer-local.json
 
 FAILED_FILE=$(mktemp -d)/failed
-for DIR in ${DIRS}; do {
-    cp ${DIR}/composer.json ${DIR}/composer-local.json
+for DIR in ${DIRS}; do
+    echo "--- Processing ${DIR} ---"
+    cp "${DIR}/composer.json" "${DIR}/composer-local.json"
     # Update composer to use local packages
-    for i in CommonProtos,common-protos,4.100 BigQuery,cloud-bigquery Core,cloud-core Logging,cloud-logging PubSub,cloud-pubsub Storage,cloud-storage ShoppingCommonProtos,shopping-common-protos GeoCommonProtos,geo-common-protos,0.1; do
-        IFS=","; set -- $i;
-        if grep -q "\"google/$2\":" ${DIR}/composer.json; then
+    PACKAGE_DEPENDENCIES=(
+        "CommonProtos,common-protos,4.100"
+        "BigQuery,cloud-bigquery"
+        "Core,cloud-core"
+        "Logging,cloud-logging"
+        "PubSub,cloud-pubsub"
+        "Storage,cloud-storage"
+        "ShoppingCommonProtos,shopping-common-protos"
+        "GeoCommonProtos,geo-common-protos,0.1"
+    )
+    for i in "${PACKAGE_DEPENDENCIES[@]}"; do
+        IFS="," read -r PKG_DIR PKG_NAME PKG_VERSION <<< "$i"
+        if grep -q "\"google/${PKG_NAME}\":" "${DIR}/composer.json"; then
             # determine local package version
-            if [ "$STRICT" = "true" ]; then VERSION=$(cat $1/VERSION); elif [ -z "$3" ]; then VERSION="1.100"; else VERSION=$3; fi
-            echo "Use local package $1 as google/$2:$VERSION in $DIR"
+            if [ "${STRICT}" = "true" ]; then
+                VERSION=$(cat "${PKG_DIR}/VERSION")
+            elif [ -z "${PKG_VERSION}" ]; then
+                VERSION="1.100"
+            else
+                VERSION=${PKG_VERSION}
+            fi
+            echo "Use local package ${PKG_DIR} as google/${PKG_NAME}:${VERSION} in ${DIR}"
             # "canonical: false" ensures composer will try to install from packagist when the "--prefer-lowest" flag is set.
-            composer config repositories.$2 -d ${DIR} "{\"type\": \"path\", \"url\": \"../$1\", \"options\":{\"versions\":{\"google/$2\":\"$VERSION\"}},\"canonical\":false}"
+            JSON_CONFIG=$(printf '{"type":"path","url":"../%s","options":{"versions":{"google/%s":"%s"}},"canonical":false}' "${PKG_DIR}" "${PKG_NAME}" "${VERSION}")
+            composer config "repositories.${PKG_NAME}" -d "${DIR}" "${JSON_CONFIG}"
         fi
     done
 
-    echo -n "Installing composer in $DIR"
-    if [ "$PREFER_LOWEST" != "" ]; then
-        echo -n " (with $PREFER_LOWEST)"
+    echo -n "Installing composer in ${DIR}"
+    if [ -n "${PREFER_LOWEST}" ]; then
+        echo -n " (with ${PREFER_LOWEST})"
     fi
     echo ""
-    composer -q --no-interaction --no-ansi --no-progress $PREFER_LOWEST update -d ${DIR};
-    if [ $? != 0 ]; then
-        echo "$DIR: composer install failed" >> "${FAILED_FILE}"
+    composer -q --no-interaction --no-ansi --no-progress ${PREFER_LOWEST} update -d "${DIR}" || {
+        echo "${DIR}: composer install failed" >> "${FAILED_FILE}"
         # run again but without "-q" so we can see the error
-        composer --no-interaction --no-ansi --no-progress $PREFER_LOWEST update -d ${DIR};
+        composer --no-interaction --no-ansi --no-progress ${PREFER_LOWEST} update -d "${DIR}"
         continue
-    fi
-    echo "Running $DIR Unit Tests"
-    ${DIR}/vendor/bin/phpunit -c ${DIR}/phpunit.xml.dist;
-    if [ $? != 0 ]; then
-        echo "$DIR: failed" >> "${FAILED_FILE}"
-    fi
+    }
+    echo "Running ${DIR} Unit Tests"
+    "${DIR}/vendor/bin/phpunit" -c "${DIR}/phpunit.xml.dist" || echo "${DIR}: failed" >> "${FAILED_FILE}"
+
     if [ -f "${DIR}/phpunit-snippets.xml.dist" ]; then
-        echo "Running $DIR Snippet Tests"
-        ${DIR}/vendor/bin/phpunit -c ${DIR}/phpunit-snippets.xml.dist;
-        if [ $? != 0 ]; then
-            echo "$DIR (snippets): failed" >> "${FAILED_FILE}"
-        fi
+        echo "Running ${DIR} Snippet Tests"
+        "${DIR}/vendor/bin/phpunit" -c "${DIR}/phpunit-snippets.xml.dist" || echo "${DIR} (snippets): failed" >> "${FAILED_FILE}"
     fi
-}; done
+done
 
 if [ -f "${FAILED_FILE}" ]; then
     echo "--------- Failed tests --------------"

.github/workflows/conformance-tests-bigtable-proxy.yaml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -40,7 +40,7 @@ jobs:
           extensions: grpc
 
       - name: Checkout Bigtable conformance tests
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: googleapis/cloud-bigtable-clients-test
           ref: v0.0.3

.github/workflows/conformance-tests-storage-emulator.yaml

@@ -16,13 +16,13 @@ jobs:
 
     services:
       emulator:
-        image: gcr.io/cloud-devrel-public-resources/storage-testbench:v0.54.0
+        image: gcr.io/cloud-devrel-public-resources/storage-testbench:v0.55.0
         ports:
           - 9000:9000
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/docs.yaml

@@ -12,7 +12,7 @@ jobs:
     env:
       PHPDOC_ENV: prod
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Setup Python
       uses: actions/setup-python@v5
       with:

.github/workflows/lint.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     name: PHP Style Check
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     name: PHPStan Static Analysis
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:

.github/workflows/owlbot-checks.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.user.login == 'gcf-owl-bot[bot]'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: "Install PHP"
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.user.login == 'gcf-owl-bot[bot]' && github.event.pull_request.draft == false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Ensure
         run: |
           directory_to_check="owl-bot-staging"

.github/workflows/release-checks.yaml

@@ -3,13 +3,15 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, edited]
     branches: ['main']
+permissions:
+  contents: read
 jobs:
   # More info at https://github.com/Roave/BackwardCompatibilityCheck.
   backwards-compatibility-check:
     name: Breaking Change Detector
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: "Install PHP"
@@ -38,6 +40,7 @@ jobs:
         uses: pozetroninc/github-action-get-latest-release@master
         with:
           repository: ${{ github.repository }}
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: "Check for BC breaks (Next Release)"
         if: github.event.pull_request.user.login == 'release-please[bot]'
         # We've already approved and justified the breaking changes. Run the check but continue on error
@@ -55,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.user.login == 'release-please[bot]'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Parse allowed major versions
@@ -88,3 +91,34 @@ jobs:
             echo "major version releases for those components"
             exit 1
           fi
+
+  # Ensure that if the release PR contains any NEW components, the new component's corresponding
+  # sub-repo exists
+  new-component-subrepo-check:
+    name: New Component Sub-Repo Check
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'release-please[bot]'
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+      - name: "Verify the subrepos exist for new components"
+        run: |
+          COMPONENTS=$(git diff origin/main --name-only | grep VERSION | xargs dirname)
+          FAIL=""
+          for COMPONENT in ${COMPONENTS}; do {
+            if [[ "$(cat $COMPONENT/VERSION)" == "0.1.0" ]]; then
+              SUBREPO=$(cat $COMPONENT/composer.json | jq -r '.extra.component.target')
+              echo "New component found: $COMPONENT"
+              if curl --head --silent --fail "https://api.github.com/repos/$SUBREPO" -H 'Authorization: Bearer ${{secrets.SPLIT_TOKEN}}' > /dev/null; then
+                  echo "✅ Target Repo '$SUBREPO' exists"
+              else
+                  echo "❌ Target Repo '$SUBREPO' DOES NOT EXIST"
+                  FAIL="true"
+              fi
+            fi
+          }; done
+          if [[ "$FAIL" == "true" ]]; then
+              echo "Missing repositories for one or more new components"
+              exit 1
+          fi

.github/workflows/release.yml

@@ -41,7 +41,7 @@ jobs:
             go build -o splitsh-lite github.com/splitsh/lite
             mv splitsh-lite /usr/local/bin/splitsh-lite
         - name: Checkout google/cloud
-          uses: actions/checkout@v4
+          uses: actions/checkout@v5
           with:
             persist-credentials: false
             fetch-depth: 0

.github/workflows/system-tests-bigtable-emulator.yaml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - run: ./.github/emulator/start-emulator.sh bigtable 419.0.0-emulators
 

.github/workflows/system-tests-datastore-emulator.yaml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - run: ./.github/emulator/start-emulator.sh datastore 419.0.0-emulators