From ba34f258d4d4a1c7e01b8f710f148ab1996d2f1c Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Mon, 5 Apr 2021 16:20:07 -0700 Subject: [PATCH 01/44] feat: add deployment tests, remove unused scripts --- .kokoro/deploy_gae.cfg | 19 ++++++++++++ .kokoro/deploy_gcf.cfg | 19 ++++++++++++ .kokoro/deploy_misc.cfg | 19 ++++++++++++ testing/run_dependency_check.sh | 41 ------------------------- testing/run_dependency_update.sh | 51 -------------------------------- testing/run_test_suite.sh | 6 ++++ 6 files changed, 63 insertions(+), 92 deletions(-) create mode 100644 .kokoro/deploy_gae.cfg create mode 100644 .kokoro/deploy_gcf.cfg create mode 100644 .kokoro/deploy_misc.cfg delete mode 100755 testing/run_dependency_check.sh delete mode 100755 testing/run_dependency_update.sh diff --git a/.kokoro/deploy_gae.cfg b/.kokoro/deploy_gae.cfg new file mode 100644 index 0000000000..7b53066472 --- /dev/null +++ b/.kokoro/deploy_gae.cfg @@ -0,0 +1,19 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/php74" +} + +# Run the deployment tests +env_vars: { + key: "RUN_DEPLOYMENT_TESTS" + value: "true" +} + +# Only run deployment tests for App Engine Standard +env_vars: { + key: "TEST_DIRECTORIES" + value: "appengine/standard" +} diff --git a/.kokoro/deploy_gcf.cfg b/.kokoro/deploy_gcf.cfg new file mode 100644 index 0000000000..cb204a4808 --- /dev/null +++ b/.kokoro/deploy_gcf.cfg @@ -0,0 +1,19 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/php74" +} + +# Run the deployment tests +env_vars: { + key: "RUN_DEPLOYMENT_TESTS" + value: "true" +} + +# Only run deployment tests for Cloud Functions +env_vars: { + key: "TEST_DIRECTORIES" + value: "functions" +} diff --git a/.kokoro/deploy_misc.cfg b/.kokoro/deploy_misc.cfg new file mode 100644 index 0000000000..d5dee66881 --- /dev/null +++ b/.kokoro/deploy_misc.cfg @@ -0,0 +1,19 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/php74" +} + +# Run the deployment tests +env_vars: { + key: "RUN_DEPLOYMENT_TESTS" + value: "true" +} + +# Run deployment tests for Cloud Run, EventArc Endpoints +env_vars: { + key: "TEST_DIRECTORIES" + value: "endpoints eventarc run" +} diff --git a/testing/run_dependency_check.sh b/testing/run_dependency_check.sh deleted file mode 100755 index 6b9c5117c4..0000000000 --- a/testing/run_dependency_check.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# Copyright 2016 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# 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. - -set -ex - -# Loop through all directories containing "phpunit.xml*" and run the test suites. -find * -name 'phpunit.xml*' -not -path '*vendor/*' -exec dirname {} \; | while read DIR -do - pushd ${DIR} - if [ -f "composer.json" ]; then - # install composer dependencies - composer install - # verify direct google dependencies are up to date - if composer outdated --direct | grep -q 'google/' ; then - # save out-of-date libraries - OUTPUT=$(composer outdated --direct | grep 'google/') - DEPS=$DEPS$'\n'$DIR$':\n'$OUTPUT$'\n' - fi - fi - popd -done - -if [ ! -e $DEPS ]; then - # Exit and display all deps needing an update. - echo "Some dependencies are out of date in \"$DIR\"" - echo "run \"testing/run_dependency_update.sh\" to update them" - echo $DEPS - exit 1 -fi diff --git a/testing/run_dependency_update.sh b/testing/run_dependency_update.sh deleted file mode 100755 index da6671c3d1..0000000000 --- a/testing/run_dependency_update.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# 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. - -set -ex - -# Find all directories containing composer.json. -directories=$(find . -name "composer.json" -not -path "**/vendor/*" -exec dirname {} \;) - -# Update dependencies in all directories containing composer.json. -for SAMPLE_DIR in $directories; do - printf '\n### Checking dependencies in %s ###\n', "$SAMPLE_DIR" - pushd "$SAMPLE_DIR" - composer install --ignore-platform-reqs --no-dev - - updatePackages=() - outdatedPackages=$(echo \ - "$(composer outdated 'google/*' --direct --format=json | jq '.installed' 2>/dev/null) $(composer outdated 'firebase/*' --direct --format=json | jq '.installed' 2>/dev/null)" \ - | jq -s add) - - if [[ "$outdatedPackages" != "null" ]] && [[ "$outdatedPackages" != "[]" ]] ; then - count=$(echo "$outdatedPackages" | jq length) - - for (( i = 0; i < count; i++ )) - do - name=$(echo "$outdatedPackages" | jq -r --arg i "$i" '.[$i | tonumber].name') - version=$(echo "$outdatedPackages" | jq -r --arg i "$i" '.[$i | tonumber].latest' | sed -e 's/^v//') - if [[ "${version:0:4}" != dev- ]]; then - updatePackages+=( "$name:^$version" ) - fi - done - - if [ ${#updatePackages[@]} -gt 0 ]; then - composer require --ignore-platform-reqs --update-no-dev --update-with-dependencies "${updatePackages[@]}" - fi - fi - - popd -done diff --git a/testing/run_test_suite.sh b/testing/run_test_suite.sh index dd24822d29..abec035318 100755 --- a/testing/run_test_suite.sh +++ b/testing/run_test_suite.sh @@ -105,6 +105,12 @@ if ! type $TESTCMD > /dev/null; then exit 1 fi +if [ "${RUN_DEPLOYMENT_TESTS}" = "true" ]; then + TESTCMD="$TESTCMD --group deploy" +else + TESTCMD="$TESTCMD --exclude-group deploy" +fi + run_tests() { if [[ " ${ALT_PROJECT_TESTS[@]} " =~ " ${DIR} " ]] && [ ! -z "$GOOGLE_ALT_PROJECT_ID" ]; then From 32122f77312b7725c56634d9873e3f3424b96b66 Mon Sep 17 00:00:00 2001 From: ace-n Date: Mon, 5 Apr 2021 19:32:31 -0700 Subject: [PATCH 02/44] Deprecate GOOGLE_CLOUD_PROJECT env var --- functions/helloworld_pubsub/test/DeployTest.php | 2 +- functions/tips_infinite_retries/test/DeployTest.php | 2 +- functions/tips_retry/test/DeployTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/helloworld_pubsub/test/DeployTest.php b/functions/helloworld_pubsub/test/DeployTest.php index fdea505e47..5c733ca661 100644 --- a/functions/helloworld_pubsub/test/DeployTest.php +++ b/functions/helloworld_pubsub/test/DeployTest.php @@ -110,7 +110,7 @@ private function publishMessage(string $name): void */ private static function doDeploy() { - self::$projectId = self::requireEnv('GOOGLE_CLOUD_PROJECT'); + self::$projectId = self::requireEnv('GOOGLE_PROJECT_ID'); self::$topicName = self::requireEnv('FUNCTIONS_TOPIC'); return self::$fn->deploy([], '--trigger-topic=' . self::$topicName); diff --git a/functions/tips_infinite_retries/test/DeployTest.php b/functions/tips_infinite_retries/test/DeployTest.php index b952321a67..e321da96f5 100644 --- a/functions/tips_infinite_retries/test/DeployTest.php +++ b/functions/tips_infinite_retries/test/DeployTest.php @@ -95,7 +95,7 @@ private function publishMessage(): void */ private static function doDeploy() { - self::$projectId = self::requireEnv('GOOGLE_CLOUD_PROJECT'); + self::$projectId = self::requireEnv('GOOGLE_PROJECT_ID'); self::$topicName = self::requireEnv('FUNCTIONS_TOPIC'); return self::$fn->deploy(['--retry' => ''], '--trigger-topic=' . self::$topicName); } diff --git a/functions/tips_retry/test/DeployTest.php b/functions/tips_retry/test/DeployTest.php index 446f88e405..f312be6a0b 100644 --- a/functions/tips_retry/test/DeployTest.php +++ b/functions/tips_retry/test/DeployTest.php @@ -90,7 +90,7 @@ private function publishMessage(): void */ private static function doDeploy() { - self::$projectId = self::requireEnv('GOOGLE_CLOUD_PROJECT'); + self::$projectId = self::requireEnv('GOOGLE_PROJECT_ID'); self::$topicName = self::requireEnv('FUNCTIONS_TOPIC'); /** From 899b9319952cf410a829bc050a349c8fe95d1ab5 Mon Sep 17 00:00:00 2001 From: ace-n Date: Mon, 5 Apr 2021 19:36:01 -0700 Subject: [PATCH 03/44] Add slack env var --- .kokoro/secrets.sh.enc | Bin 8228 -> 8281 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.kokoro/secrets.sh.enc b/.kokoro/secrets.sh.enc index 12acd85b09d93eadd2b0a667fd6ff93395d91795..58c1cd50e3272b953cb4958ad21c052649da121c 100644 GIT binary patch literal 8281 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 XEI#tTN9PTm!K8&w=0`egFxXjanCKvJ literal 8228 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 Date: Tue, 6 Apr 2021 09:09:30 -0700 Subject: [PATCH 04/44] misc updates to fix deployment tests --- eventarc/generic/test/DeployTest.php | 2 +- functions/http_cors/test/DeployTest.php | 4 ++-- run/helloworld/test/DeployTest.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eventarc/generic/test/DeployTest.php b/eventarc/generic/test/DeployTest.php index 461c5b4e50..1dfdd063d1 100644 --- a/eventarc/generic/test/DeployTest.php +++ b/eventarc/generic/test/DeployTest.php @@ -49,7 +49,7 @@ public static function setUpDeploymentVars() { if (is_null(self::$service) || is_null(self::$image)) { $projectId = self::requireEnv('GOOGLE_PROJECT_ID'); - $versionId = self::requireEnv('GOOGLE_VERSION_ID'); + $versionId = getenv('GOOGLE_VERSION_ID') ?: sprintf('eventarc-%s', time()); self::$service = new CloudRun($projectId, ['service' => $versionId]); self::$image = sprintf('gcr.io/%s/%s:latest', $projectId, $versionId); } diff --git a/functions/http_cors/test/DeployTest.php b/functions/http_cors/test/DeployTest.php index 075fb0513f..04196a517a 100644 --- a/functions/http_cors/test/DeployTest.php +++ b/functions/http_cors/test/DeployTest.php @@ -66,13 +66,13 @@ public function testFunction( // Assert headers. $header_names = array_keys($response->getHeaders()); if ($containsHeader) { - $this->assertStringContainsString( + $this->assertContains( $containsHeader, $header_names ); } if ($notContainsHeader) { - $this->assertStringNotContainsString( + $this->assertContains( $notContainsHeader, $header_names ); diff --git a/run/helloworld/test/DeployTest.php b/run/helloworld/test/DeployTest.php index 894bae7373..b6a350859c 100644 --- a/run/helloworld/test/DeployTest.php +++ b/run/helloworld/test/DeployTest.php @@ -50,7 +50,7 @@ class DeloyTest extends TestCase public static function setUpDeploymentVars() { $projectId = self::requireEnv('GOOGLE_PROJECT_ID'); - $versionId = self::requireEnv('GOOGLE_VERSION_ID'); + $versionId = getenv('GOOGLE_VERSION_ID') ?: sprintf('helloworld-%s', time()); self::$service = new CloudRun($projectId, ['service' => $versionId]); self::$image = sprintf('gcr.io/%s/%s:latest', $projectId, $versionId); } From ee0ec3e2ae9a76c1c722e39996232b2b658b3e9c Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 6 Apr 2021 18:25:17 -0700 Subject: [PATCH 05/44] Another round of GCF fixes --- .kokoro/secrets.sh.enc | Bin 8281 -> 8380 bytes functions/http_cors/test/DeployTest.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/secrets.sh.enc b/.kokoro/secrets.sh.enc index 58c1cd50e3272b953cb4958ad21c052649da121c..e821213a8bb9755bd5d181f826721f5cde28797f 100644 GIT binary patch literal 8380 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 XEI#tTN9PTm!K8&w=0`egFxXjanCKvJ diff --git a/functions/http_cors/test/DeployTest.php b/functions/http_cors/test/DeployTest.php index 04196a517a..9fc694038f 100644 --- a/functions/http_cors/test/DeployTest.php +++ b/functions/http_cors/test/DeployTest.php @@ -72,7 +72,7 @@ public function testFunction( ); } if ($notContainsHeader) { - $this->assertContains( + $this->assertNotContains( $notContainsHeader, $header_names ); From a4bbfe4ab69a09823b7dad9604dd0b6abcd9bdb7 Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 6 Apr 2021 21:45:50 -0700 Subject: [PATCH 06/44] GCF slack, take 2 --- functions/slack_slash_command/test/TestCasesTrait.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/functions/slack_slash_command/test/TestCasesTrait.php b/functions/slack_slash_command/test/TestCasesTrait.php index 7c494b4bfe..3f69a028d1 100644 --- a/functions/slack_slash_command/test/TestCasesTrait.php +++ b/functions/slack_slash_command/test/TestCasesTrait.php @@ -22,15 +22,13 @@ function _valid_headers($body): array { // Calculate test case signature $key = getenv('SLACK_SECRET'); - $plaintext = 'v0:0:' . $body; - //var_dump($plaintext); + $plaintext = 'v0:1:' . $body; $hash = 'v0=' . hash_hmac('sha256', $plaintext, $key); - //var_dump($hash); // Return new test case return [ 'plaintext' => $plaintext, - 'X-Slack-Request-Timestamp' => '0', + 'X-Slack-Request-Timestamp' => '1', 'X-Slack-Signature' => $hash, ]; } @@ -71,7 +69,7 @@ public static function cases(): array 'expected' => null, 'statusCode' => '403', 'headers' => [ - 'X-Slack-Request-Timestamp' => '0', + 'X-Slack-Request-Timestamp' => '1', 'X-Slack-Signature' => 'bad_signature' ], From 36aae36cd6de4b152ec69ef7d55c2387b658af9e Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Wed, 7 Apr 2021 13:38:34 -0700 Subject: [PATCH 07/44] fix cloud run deployment test --- run/helloworld/test/DeployTest.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/run/helloworld/test/DeployTest.php b/run/helloworld/test/DeployTest.php index b6a350859c..6a4cbd3625 100644 --- a/run/helloworld/test/DeployTest.php +++ b/run/helloworld/test/DeployTest.php @@ -44,15 +44,16 @@ class DeloyTest extends TestCase /** * Deploy the application. - * - * @beforeClass */ public static function setUpDeploymentVars() { - $projectId = self::requireEnv('GOOGLE_PROJECT_ID'); + if (empty(self::$projectId)) { + self::checkProjectEnvVars(); + } + $versionId = getenv('GOOGLE_VERSION_ID') ?: sprintf('helloworld-%s', time()); - self::$service = new CloudRun($projectId, ['service' => $versionId]); - self::$image = sprintf('gcr.io/%s/%s:latest', $projectId, $versionId); + self::$service = new CloudRun(self::$projectId, ['service' => $versionId]); + self::$image = sprintf('gcr.io/%s/%s:latest', self::$projectId, $versionId); } private static function beforeDeploy() From 53e5464c845f2b817d4ffe6b9cf4b009a52216c2 Mon Sep 17 00:00:00 2001 From: ace-n Date: Fri, 9 Apr 2021 17:29:59 -0700 Subject: [PATCH 08/44] Fix pubsub test --- functions/helloworld_pubsub/test/DeployTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/functions/helloworld_pubsub/test/DeployTest.php b/functions/helloworld_pubsub/test/DeployTest.php index 5c733ca661..cc3fc76893 100644 --- a/functions/helloworld_pubsub/test/DeployTest.php +++ b/functions/helloworld_pubsub/test/DeployTest.php @@ -85,7 +85,6 @@ public function testHelloworldPubsub(string $name, string $expected, string $lab $actual .= $info['textPayload']; } - $expected = 'Hello, ' . $name . '!'; $this->assertStringContainsString($expected, $actual, $label); }); } From 519459dfe60c09d238905abb0449277b857d1ca7 Mon Sep 17 00:00:00 2001 From: ace-n Date: Mon, 12 Apr 2021 19:08:05 -0700 Subject: [PATCH 09/44] Increase firebase remote config sleep time --- functions/firebase_remote_config/test/DeployTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/firebase_remote_config/test/DeployTest.php b/functions/firebase_remote_config/test/DeployTest.php index f72ffc39ec..471b82e72f 100644 --- a/functions/firebase_remote_config/test/DeployTest.php +++ b/functions/firebase_remote_config/test/DeployTest.php @@ -104,7 +104,7 @@ public function testFirebaseRemoteConfig( // Give event and log systems a head start. // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(5); + sleep(10); $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($expected, $label) { From 77bf4adf36a51791b02d20109995e73572e53245 Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 13 Apr 2021 21:38:54 -0700 Subject: [PATCH 10/44] Fix firestore project ID logic --- .../firebase_firestore/test/DeployTest.php | 24 +++++++++++++------ .../test/DeployTest.php | 13 ++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/functions/firebase_firestore/test/DeployTest.php b/functions/firebase_firestore/test/DeployTest.php index 854f3b93e3..79ba5192d8 100644 --- a/functions/firebase_firestore/test/DeployTest.php +++ b/functions/firebase_firestore/test/DeployTest.php @@ -55,6 +55,19 @@ class DeployTest extends TestCase /** @var FirestoreClient */ private static $firestoreClient; + /** + * Override the default project ID set by CloudFunctionDeploymentTrait. + */ + private static function checkProjectEnvVars() + { + if (empty(self::$projectId)) { + self::$projectId = self::requireOneOfEnv([ + 'FIRESTORE_PROJECT_ID', + 'GOOGLE_PROJECT_ID' + ]); + } + } + /** * Deploy the Cloud Function, called from DeploymentTrait::deployApp(). * @@ -62,13 +75,10 @@ class DeployTest extends TestCase */ private static function doDeploy() { - $project = self::requireOneOfEnv([ - 'FIRESTORE_PROJECT_ID', - 'GOOGLE_PROJECT_ID' - ]); - - $resource = - 'projects/' . $project . '/databases/(default)/documents/' . self::$collectionName . '/' . self::$documentName; + $resource = sprintf( + 'projects/%s/databases/(default)/documents/%s/%s/', + self::$projectId, self::$collectionName, self::$documentName + ); $event = 'providers/cloud.firestore/eventTypes/document.write'; return self::$fn->deploy([ diff --git a/functions/firebase_firestore_reactive/test/DeployTest.php b/functions/firebase_firestore_reactive/test/DeployTest.php index 825a36b500..d08d4e9356 100644 --- a/functions/firebase_firestore_reactive/test/DeployTest.php +++ b/functions/firebase_firestore_reactive/test/DeployTest.php @@ -57,6 +57,19 @@ class DeployTest extends TestCase /** @var FirestoreClient */ private static $firestoreClient; + /** + * Override the default project ID set by CloudFunctionDeploymentTrait. + */ + private static function checkProjectEnvVars() + { + if (empty(self::$projectId)) { + self::$projectId = self::requireOneOfEnv([ + 'FIRESTORE_PROJECT_ID', + 'GOOGLE_PROJECT_ID' + ]); + } + } + /** * Deploy the Cloud Function, called from DeploymentTrait::deployApp(). * From bb0c41c227258d2d910cc9a4d473c5259c769218 Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 13 Apr 2021 22:52:30 -0700 Subject: [PATCH 11/44] infinite retries: reduce max event age --- functions/tips_infinite_retries/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/tips_infinite_retries/index.php b/functions/tips_infinite_retries/index.php index 8a2ecfa2c1..dade7c9d7d 100644 --- a/functions/tips_infinite_retries/index.php +++ b/functions/tips_infinite_retries/index.php @@ -34,7 +34,7 @@ function avoidInfiniteRetries(CloudEvent $event): void $eventId = $event->getId(); // The maximum age of events to process. - $maxAge = 60 * 3; // 3 minutes, in seconds + $maxAge = 60; // 1 minute, in seconds // The age of the event being processed. $eventAge = time() - strtotime($event->getTime()); From 76076b77ae44593f80a7cc7352142b6b72ff3219 Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 14 Apr 2021 01:16:10 -0700 Subject: [PATCH 12/44] further reduce max event age --- functions/tips_infinite_retries/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/tips_infinite_retries/index.php b/functions/tips_infinite_retries/index.php index dade7c9d7d..9e99dfcf65 100644 --- a/functions/tips_infinite_retries/index.php +++ b/functions/tips_infinite_retries/index.php @@ -34,7 +34,7 @@ function avoidInfiniteRetries(CloudEvent $event): void $eventId = $event->getId(); // The maximum age of events to process. - $maxAge = 60; // 1 minute, in seconds + $maxAge = 10; // 10 seconds // The age of the event being processed. $eventAge = time() - strtotime($event->getTime()); From 867222f936c22a08041383d1bb0c11dd5484cb2d Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 14 Apr 2021 01:21:16 -0700 Subject: [PATCH 13/44] increase retry count for helloworld_pubsub --- functions/helloworld_pubsub/test/DeployTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/helloworld_pubsub/test/DeployTest.php b/functions/helloworld_pubsub/test/DeployTest.php index 0f2f8c2d48..85ca9bc60c 100644 --- a/functions/helloworld_pubsub/test/DeployTest.php +++ b/functions/helloworld_pubsub/test/DeployTest.php @@ -82,7 +82,7 @@ public function testHelloworldPubsub(string $name, string $expected, string $lab } $this->assertStringContainsString($expected, $actual, $label); - }); + }, 5); } private function publishMessage(string $name): void From a5297b5178380053e1e8f920e38bba82607f8d05 Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 14 Apr 2021 01:31:06 -0700 Subject: [PATCH 14/44] Add required sleep calls back to tests + fix RTDB namespaces --- functions/firebase_rtdb/test/DeployTest.php | 2 +- functions/firebase_rtdb/test/IntegrationTest.php | 2 +- functions/helloworld_pubsub/test/DeployTest.php | 4 ++++ functions/imagemagick/test/DeployTest.php | 6 +++++- functions/tips_retry/test/DeployTest.php | 4 ++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/functions/firebase_rtdb/test/DeployTest.php b/functions/firebase_rtdb/test/DeployTest.php index 1936d3b6ab..5a64495aff 100644 --- a/functions/firebase_rtdb/test/DeployTest.php +++ b/functions/firebase_rtdb/test/DeployTest.php @@ -17,7 +17,7 @@ declare(strict_types=1); -namespace Google\Cloud\Samples\Functions\HelloworldStorage\Test; +namespace Google\Cloud\Samples\Functions\FirebaseRTDB\Test; use Google\Cloud\Logging\LoggingClient; use Google\Cloud\TestUtils\CloudFunctionDeploymentTrait; diff --git a/functions/firebase_rtdb/test/IntegrationTest.php b/functions/firebase_rtdb/test/IntegrationTest.php index f8dd419181..4014b4b10d 100644 --- a/functions/firebase_rtdb/test/IntegrationTest.php +++ b/functions/firebase_rtdb/test/IntegrationTest.php @@ -17,7 +17,7 @@ declare(strict_types=1); -namespace Google\Cloud\Samples\Functions\HelloworldHttp\Test; +namespace Google\Cloud\Samples\Functions\FirebaseRTDB\Test; use PHPUnit\Framework\TestCase; use Google\CloudFunctions\CloudEvent; diff --git a/functions/helloworld_pubsub/test/DeployTest.php b/functions/helloworld_pubsub/test/DeployTest.php index 85ca9bc60c..6bf7e01110 100644 --- a/functions/helloworld_pubsub/test/DeployTest.php +++ b/functions/helloworld_pubsub/test/DeployTest.php @@ -72,6 +72,10 @@ public function testHelloworldPubsub(string $name, string $expected, string $lab // Send Pub/Sub message. $this->publishMessage($name); + // Give event and log systems a head start. + // If log retrieval fails to find logs for our function within retry limit, increase sleep time. + sleep(10); + $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($name, $expected, $label) { // Concatenate all relevant log messages. diff --git a/functions/imagemagick/test/DeployTest.php b/functions/imagemagick/test/DeployTest.php index ea9cbe01d7..4634319b2f 100644 --- a/functions/imagemagick/test/DeployTest.php +++ b/functions/imagemagick/test/DeployTest.php @@ -65,6 +65,10 @@ public function testFunction( $object = $fixtureBucket->object($fileName); $object->copy(self::$monitoredBucket, ['name' => $fileName]); + // Give event and log systems a head start. + // If log retrieval fails to find logs for our function within retry limit, increase sleep time. + sleep(30); + $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($expected, $label) { // Concatenate all relevant log messages. @@ -77,7 +81,7 @@ public function testFunction( // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual, $label . ':'); - }); + }, 6); } /** diff --git a/functions/tips_retry/test/DeployTest.php b/functions/tips_retry/test/DeployTest.php index 3a9bb9dbf4..c55a13d12a 100644 --- a/functions/tips_retry/test/DeployTest.php +++ b/functions/tips_retry/test/DeployTest.php @@ -46,6 +46,10 @@ public function testTipsRetry(): void // Send Pub/Sub message. $this->publishMessage(); + // Give event and log systems a head start. + // If log retrieval fails to find logs for our function within retry limit, increase sleep time. + sleep(10); + $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) { // Concatenate all relevant log messages. From 07777bf3fe105a634328f849b14194d934ef38f5 Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 21 Apr 2021 13:44:55 -0700 Subject: [PATCH 15/44] Remove manual sleeps + use php-tools' instead --- functions/firebase_firestore/test/DeployTest.php | 10 ++++------ .../firebase_firestore_reactive/test/DeployTest.php | 6 +----- functions/firebase_remote_config/test/DeployTest.php | 6 +----- functions/firebase_rtdb/test/DeployTest.php | 6 +----- functions/helloworld_pubsub/test/DeployTest.php | 6 +----- functions/helloworld_storage/test/DeployTest.php | 6 +----- functions/imagemagick/index.php | 3 ++- functions/imagemagick/test/DeployTest.php | 6 +----- functions/tips_infinite_retries/test/DeployTest.php | 6 +----- functions/tips_retry/test/DeployTest.php | 6 +----- 10 files changed, 14 insertions(+), 47 deletions(-) diff --git a/functions/firebase_firestore/test/DeployTest.php b/functions/firebase_firestore/test/DeployTest.php index 79ba5192d8..9795e10dfd 100644 --- a/functions/firebase_firestore/test/DeployTest.php +++ b/functions/firebase_firestore/test/DeployTest.php @@ -77,7 +77,9 @@ private static function doDeploy() { $resource = sprintf( 'projects/%s/databases/(default)/documents/%s/%s/', - self::$projectId, self::$collectionName, self::$documentName + self::$projectId, + self::$collectionName, + self::$documentName ); $event = 'providers/cloud.firestore/eventTypes/document.write'; @@ -110,10 +112,6 @@ public function testFirebaseFirestore(array $data, string $expected): void $data ); - // Give event and log systems a head start. - // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(5); - $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($expected) { // Concatenate all relevant log messages. @@ -128,7 +126,7 @@ public function testFirebaseFirestore(array $data, string $expected): void // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual); - }); + }, null, 5); } /** diff --git a/functions/firebase_firestore_reactive/test/DeployTest.php b/functions/firebase_firestore_reactive/test/DeployTest.php index d08d4e9356..bf37e18e0d 100644 --- a/functions/firebase_firestore_reactive/test/DeployTest.php +++ b/functions/firebase_firestore_reactive/test/DeployTest.php @@ -117,10 +117,6 @@ public function testFirebaseReactive(array $data, string $expected): void $data ); - // Give event and log systems a head start. - // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(30); - $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($expected) { // Concatenate all relevant log messages. @@ -135,7 +131,7 @@ public function testFirebaseReactive(array $data, string $expected): void // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual); - }); + }, 3, 30); } /** diff --git a/functions/firebase_remote_config/test/DeployTest.php b/functions/firebase_remote_config/test/DeployTest.php index 471b82e72f..4eab302e3f 100644 --- a/functions/firebase_remote_config/test/DeployTest.php +++ b/functions/firebase_remote_config/test/DeployTest.php @@ -102,10 +102,6 @@ public function testFirebaseRemoteConfig( $value ); - // Give event and log systems a head start. - // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(10); - $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($expected, $label) { // Concatenate all relevant log messages. @@ -120,7 +116,7 @@ public function testFirebaseRemoteConfig( // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual, $label); - }); + }, null, 10); } /** diff --git a/functions/firebase_rtdb/test/DeployTest.php b/functions/firebase_rtdb/test/DeployTest.php index 5a64495aff..e4c2a65dd9 100644 --- a/functions/firebase_rtdb/test/DeployTest.php +++ b/functions/firebase_rtdb/test/DeployTest.php @@ -96,10 +96,6 @@ public function testFirebaseRTDB(array $data, string $expected): void // Trigger storage upload. $objectUri = $this->updateRTDB(self::$rtdbPath, $data); - // Give event and log systems a head start. - // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(5); - $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($expected) { // Concatenate all relevant log messages. @@ -114,7 +110,7 @@ public function testFirebaseRTDB(array $data, string $expected): void // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual); - }); + }, null, 5); } /** diff --git a/functions/helloworld_pubsub/test/DeployTest.php b/functions/helloworld_pubsub/test/DeployTest.php index 6bf7e01110..b11f3c7368 100644 --- a/functions/helloworld_pubsub/test/DeployTest.php +++ b/functions/helloworld_pubsub/test/DeployTest.php @@ -72,10 +72,6 @@ public function testHelloworldPubsub(string $name, string $expected, string $lab // Send Pub/Sub message. $this->publishMessage($name); - // Give event and log systems a head start. - // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(10); - $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($name, $expected, $label) { // Concatenate all relevant log messages. @@ -86,7 +82,7 @@ public function testHelloworldPubsub(string $name, string $expected, string $lab } $this->assertStringContainsString($expected, $actual, $label); - }, 5); + }, 5, 10); } private function publishMessage(string $name): void diff --git a/functions/helloworld_storage/test/DeployTest.php b/functions/helloworld_storage/test/DeployTest.php index 38eea6e7a3..39bf4410c4 100644 --- a/functions/helloworld_storage/test/DeployTest.php +++ b/functions/helloworld_storage/test/DeployTest.php @@ -82,10 +82,6 @@ public function testHelloGCS(string $name, string $expected): void $objectUri = $this->triggerStorageUpload(self::$bucket, $name); $expected = sprintf($expected, $name); - // Give event and log systems a head start. - // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(5); - $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($expected) { // Concatenate all relevant log messages. @@ -98,7 +94,7 @@ public function testHelloGCS(string $name, string $expected): void // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual); - }); + }, null, 5); unlink($objectUri); } diff --git a/functions/imagemagick/index.php b/functions/imagemagick/index.php index 5ee6f09dd4..0188da7899 100644 --- a/functions/imagemagick/index.php +++ b/functions/imagemagick/index.php @@ -105,7 +105,8 @@ function blurImage( fwrite($log, 'Streamed blurred image to: ' . $gcsPath . PHP_EOL); } catch (Exception $e) { throw new Exception( - sprintf('Unable to stream blurred image to %s: %s', + sprintf( + 'Unable to stream blurred image to %s: %s', $gcsPath, $e->getMessage() ) diff --git a/functions/imagemagick/test/DeployTest.php b/functions/imagemagick/test/DeployTest.php index 4634319b2f..269f003585 100644 --- a/functions/imagemagick/test/DeployTest.php +++ b/functions/imagemagick/test/DeployTest.php @@ -65,10 +65,6 @@ public function testFunction( $object = $fixtureBucket->object($fileName); $object->copy(self::$monitoredBucket, ['name' => $fileName]); - // Give event and log systems a head start. - // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(30); - $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($expected, $label) { // Concatenate all relevant log messages. @@ -81,7 +77,7 @@ public function testFunction( // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual, $label . ':'); - }, 6); + }, 6, 30); } /** diff --git a/functions/tips_infinite_retries/test/DeployTest.php b/functions/tips_infinite_retries/test/DeployTest.php index e321da96f5..c6d46143a8 100644 --- a/functions/tips_infinite_retries/test/DeployTest.php +++ b/functions/tips_infinite_retries/test/DeployTest.php @@ -53,10 +53,6 @@ public function testTipsRetry(): void // Send Pub/Sub message. $this->publishMessage(); - // Give event and log systems a head start. - // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(30); - $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) { // Concatenate all relevant log messages. @@ -72,7 +68,7 @@ public function testTipsRetry(): void // Check that the function has stopped retrying $this->assertContains('Dropping event', $actual); - }); + }, 3, 30); } private function publishMessage(): void diff --git a/functions/tips_retry/test/DeployTest.php b/functions/tips_retry/test/DeployTest.php index c55a13d12a..ed6dd920c1 100644 --- a/functions/tips_retry/test/DeployTest.php +++ b/functions/tips_retry/test/DeployTest.php @@ -46,10 +46,6 @@ public function testTipsRetry(): void // Send Pub/Sub message. $this->publishMessage(); - // Give event and log systems a head start. - // If log retrieval fails to find logs for our function within retry limit, increase sleep time. - sleep(10); - $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) { // Concatenate all relevant log messages. @@ -63,7 +59,7 @@ public function testTipsRetry(): void $retryText = 'Intermittent failure occurred; retrying...'; $retryCount = substr_count($actual, $retryText); $this->assertGreaterThan(1, $retryCount); - }); + }, 3, 10); } private function publishMessage(): void From 745811f824952502b2e18eb71fda1a786be51d5d Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 11:47:30 -0700 Subject: [PATCH 16/44] Fix PHPUnit deprecation warning --- functions/tips_infinite_retries/test/DeployTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/tips_infinite_retries/test/DeployTest.php b/functions/tips_infinite_retries/test/DeployTest.php index c6d46143a8..a350478764 100644 --- a/functions/tips_infinite_retries/test/DeployTest.php +++ b/functions/tips_infinite_retries/test/DeployTest.php @@ -67,7 +67,7 @@ public function testTipsRetry(): void $this->assertGreaterThan(1, $retryCount); // Check that the function has stopped retrying - $this->assertContains('Dropping event', $actual); + $this->assertStringContainsString('Dropping event', $actual); }, 3, 30); } From 40260a0ee89399da401146bbf38f565a80cd09ef Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 11:50:17 -0700 Subject: [PATCH 17/44] Tweak retry times (attempt at fixing log fetch error) --- functions/firebase_rtdb/test/DeployTest.php | 2 +- functions/helloworld_storage/test/DeployTest.php | 2 +- functions/tips_retry/test/DeployTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/firebase_rtdb/test/DeployTest.php b/functions/firebase_rtdb/test/DeployTest.php index e4c2a65dd9..2092a49722 100644 --- a/functions/firebase_rtdb/test/DeployTest.php +++ b/functions/firebase_rtdb/test/DeployTest.php @@ -110,7 +110,7 @@ public function testFirebaseRTDB(array $data, string $expected): void // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual); - }, null, 5); + }, 5, 10); } /** diff --git a/functions/helloworld_storage/test/DeployTest.php b/functions/helloworld_storage/test/DeployTest.php index 39bf4410c4..da27670dfd 100644 --- a/functions/helloworld_storage/test/DeployTest.php +++ b/functions/helloworld_storage/test/DeployTest.php @@ -94,7 +94,7 @@ public function testHelloGCS(string $name, string $expected): void // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual); - }, null, 5); + }, 5, 10); unlink($objectUri); } diff --git a/functions/tips_retry/test/DeployTest.php b/functions/tips_retry/test/DeployTest.php index ed6dd920c1..a7a46972fb 100644 --- a/functions/tips_retry/test/DeployTest.php +++ b/functions/tips_retry/test/DeployTest.php @@ -59,7 +59,7 @@ public function testTipsRetry(): void $retryText = 'Intermittent failure occurred; retrying...'; $retryCount = substr_count($actual, $retryText); $this->assertGreaterThan(1, $retryCount); - }, 3, 10); + }, 4, 30); } private function publishMessage(): void From c6da82a15d53b680a01b80b698c7bed0b5dd480d Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 13:02:21 -0700 Subject: [PATCH 18/44] chore(appengine): fix (some) GAE failures --- appengine/standard/errorreporting/test/DeployTest.php | 9 ++++++--- appengine/standard/logging/test/DeployTest.php | 2 +- appengine/standard/symfony-framework/phpunit.xml.dist | 4 +--- .../symfony-framework/test/DeploySymfonyTrait.php | 10 ++++++++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/appengine/standard/errorreporting/test/DeployTest.php b/appengine/standard/errorreporting/test/DeployTest.php index d40cee1efe..ddf84f58c2 100644 --- a/appengine/standard/errorreporting/test/DeployTest.php +++ b/appengine/standard/errorreporting/test/DeployTest.php @@ -33,7 +33,7 @@ class DeployTest extends TestCase public function setUp(): void { - $this->projectId = getenv('GOOGLE_PROJECT_ID'); + self::$projectId = getenv('GOOGLE_PROJECT_ID'); } public function testIndex() @@ -98,7 +98,7 @@ public function testFatalErrors() private function verifyReportedError($message, $retryCount = 5) { $errorStats = new ErrorStatsServiceClient(); - $projectName = $errorStats->projectName($this->projectId); + $projectName = $errorStats->projectName(self::$projectId); $timeRange = (new QueryTimeRange()) ->setPeriod(QueryTimeRange_Period::PERIOD_1_HOUR); @@ -111,7 +111,10 @@ private function verifyReportedError($message, $retryCount = 5) $message ) { $messages = []; - $response = $errorStats->listGroupStats($projectName, $timeRange); + $response = $errorStats->listGroupStats( + $projectName, + ['timeRange' => $timeRange] + ); foreach ($response->iterateAllElements() as $groupStat) { $response = $errorStats->listEvents($projectName, $groupStat->getGroup()->getGroupId(), [ 'timeRange' => $timeRange, diff --git a/appengine/standard/logging/test/DeployTest.php b/appengine/standard/logging/test/DeployTest.php index f707b1b156..7c32a1d577 100644 --- a/appengine/standard/logging/test/DeployTest.php +++ b/appengine/standard/logging/test/DeployTest.php @@ -49,7 +49,7 @@ public function testIndex() $this->verifyLog('This will show up as log level ERROR', 'error'); } - private function verifyLog($message, $level, $retryCount = 2) + private function verifyLog($message, $level, $retryCount = 3) { $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $filter = sprintf( diff --git a/appengine/standard/symfony-framework/phpunit.xml.dist b/appengine/standard/symfony-framework/phpunit.xml.dist index b1a64e1286..f4ed21cbab 100644 --- a/appengine/standard/symfony-framework/phpunit.xml.dist +++ b/appengine/standard/symfony-framework/phpunit.xml.dist @@ -18,9 +18,7 @@ test - - ./vendor - + ./vendor diff --git a/appengine/standard/symfony-framework/test/DeploySymfonyTrait.php b/appengine/standard/symfony-framework/test/DeploySymfonyTrait.php index 43e46f3a99..a24e42f793 100644 --- a/appengine/standard/symfony-framework/test/DeploySymfonyTrait.php +++ b/appengine/standard/symfony-framework/test/DeploySymfonyTrait.php @@ -31,8 +31,14 @@ private static function createSymfonyProject() $tmpDir = sys_get_temp_dir() . '/test-' . FileUtil::randomName(8); // install - $demoVersion = 'symfony/symfony-demo:^1.5'; - $cmd = sprintf('composer create-project %s %s || true', $demoVersion, $tmpDir); + $demoPackage = 'symfony/symfony-demo'; + $demoVersion = '^1.5'; + + $cmd = sprintf( + 'composer create-project %s %s %s || true', + $demoPackage, $tmpDir, $demoVersion + ); + $process = self::createProcess($cmd); $process->setTimeout(300); // 5 minutes From 9d9064df35baddcea3e62c9323795d520f3829e9 Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 15:01:33 -0700 Subject: [PATCH 19/44] Fix bad firestore project ID --- .kokoro/secrets.sh.enc | Bin 8380 -> 8377 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.kokoro/secrets.sh.enc b/.kokoro/secrets.sh.enc index e821213a8bb9755bd5d181f826721f5cde28797f..6cb9edb8cc714ba725118eeaeb250fd3dd5d2999 100644 GIT binary patch literal 8377 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 P0kh(f>MBT}x@}6pG@E`V literal 8380 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 Date: Wed, 28 Apr 2021 15:06:04 -0700 Subject: [PATCH 20/44] Add Redis details --- .kokoro/secrets.sh.enc | Bin 8377 -> 8389 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.kokoro/secrets.sh.enc b/.kokoro/secrets.sh.enc index 6cb9edb8cc714ba725118eeaeb250fd3dd5d2999..e4da27a59e10713ed02b6f872fd6b3a04c76f18c 100644 GIT binary patch literal 8389 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 P0kh(f>MBT}x@}6pG@E`V From d28fce53a45531c428cfd51b626bcbfa17c35dbd Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 15:12:52 -0700 Subject: [PATCH 21/44] chore(GAE storage): install missing yaml pkg --- appengine/standard/storage/composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appengine/standard/storage/composer.json b/appengine/standard/storage/composer.json index 6e12686510..ce24fd86dc 100644 --- a/appengine/standard/storage/composer.json +++ b/appengine/standard/storage/composer.json @@ -1,6 +1,7 @@ { "require": { - "google/cloud-storage": "^1.5" + "google/cloud-storage": "^1.5", + "symfony/yaml": "^5.2" }, "autoload": { "files": [ From d96ebecb42c092e2f3ac641197bb040b3def48ef Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 16:03:33 -0700 Subject: [PATCH 22/44] chore(slim on GAE): add missing error middleware --- appengine/standard/slim-framework/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/appengine/standard/slim-framework/index.php b/appengine/standard/slim-framework/index.php index 44cca515cb..a1d6a659cd 100644 --- a/appengine/standard/slim-framework/index.php +++ b/appengine/standard/slim-framework/index.php @@ -29,6 +29,7 @@ # [START gae_slim_front_controller] $app = AppFactory::create(); $app->addRoutingMiddleware(); +$app->addErrorMiddleware(true, true, true); $app->get('/', function (Request $request, Response $response) { // Use the Null Coalesce Operator in PHP7 From 525c11f1b7b18ee67c0c9d0fa0eda767dffc3808 Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 16:19:32 -0700 Subject: [PATCH 23/44] chore(GAE logging): use string-contains to display output on failure --- appengine/standard/logging/test/DeployTest.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/appengine/standard/logging/test/DeployTest.php b/appengine/standard/logging/test/DeployTest.php index 7c32a1d577..d2762a8bfe 100644 --- a/appengine/standard/logging/test/DeployTest.php +++ b/appengine/standard/logging/test/DeployTest.php @@ -71,16 +71,14 @@ private function verifyLog($message, $level, $retryCount = 3) $logOptions, $message ) { + // Concatenate all relevant log messages. $logs = $logging->entries($logOptions); - $matched = false; + $actual = ''; foreach ($logs as $log) { - if ($log->info()['jsonPayload']['message'] == $message) { - $matched = true; - break; - } + $actual .= $log->info()['jsonPayload']['message']; } - $this->assertTrue($matched); + $this->assertStringContainsString($message, $actual); }, $retryCount, true); } } From d51c51b222bc1e06de91f16960121f89f0c53254 Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 16:35:22 -0700 Subject: [PATCH 24/44] chore(GAE wordpress): update composer.json + PHPUnit spec --- appengine/standard/wordpress/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/standard/wordpress/composer.json b/appengine/standard/wordpress/composer.json index 86e1cb7ff2..437f4edad1 100644 --- a/appengine/standard/wordpress/composer.json +++ b/appengine/standard/wordpress/composer.json @@ -3,6 +3,6 @@ "ext-phar": "*", "ext-zip": "*", "paragonie/random_compat": "^9.0.0", - "google/cloud-tools": "^0.12.0" + "google/cloud-tools": "dev-master" } } From 00329838d67855598d2ef0cc78937d11cfde8e3c Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 16:55:29 -0700 Subject: [PATCH 25/44] Fix missed-spot in 7.2 -> 7.4 app.yaml change --- appengine/standard/laravel-framework/app-dbsessions.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appengine/standard/laravel-framework/app-dbsessions.yaml b/appengine/standard/laravel-framework/app-dbsessions.yaml index 94e64a7051..59469a4737 100644 --- a/appengine/standard/laravel-framework/app-dbsessions.yaml +++ b/appengine/standard/laravel-framework/app-dbsessions.yaml @@ -1,5 +1,4 @@ -# Use the PHP 7.3 runtime (BETA) by replacing "php72" below with "php73" -runtime: php72 +runtime: php74 env_variables: ## Put production environment variables here. @@ -17,4 +16,4 @@ env_variables: ## To use Stackdriver logging in your Laravel application, copy ## "app/Logging/CreateStackdriverLogger.php" and "config/logging.php" ## into your Laravel application. Then uncomment the following line: - # LOG_CHANNEL: stackdriver \ No newline at end of file + # LOG_CHANNEL: stackdriver From e6ff458aabafb1ffb80a10ca94bf97e76a650e7d Mon Sep 17 00:00:00 2001 From: ace-n Date: Wed, 28 Apr 2021 16:57:44 -0700 Subject: [PATCH 26/44] Wordpress phpunit, take 2 --- appengine/standard/wordpress/phpunit.xml.dist | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appengine/standard/wordpress/phpunit.xml.dist b/appengine/standard/wordpress/phpunit.xml.dist index 1df4c5de02..7918979bd3 100644 --- a/appengine/standard/wordpress/phpunit.xml.dist +++ b/appengine/standard/wordpress/phpunit.xml.dist @@ -18,9 +18,7 @@ test - - ./vendor - + ./vendor From 1448fb9776f9f32df92b606da1e375a9b8bb6a03 Mon Sep 17 00:00:00 2001 From: ace-n Date: Thu, 29 Apr 2021 15:40:08 -0700 Subject: [PATCH 27/44] chore(GAE storage): delete [these] unused samples --- appengine/standard/storage/README.md | 57 ---- appengine/standard/storage/app.yaml | 10 - appengine/standard/storage/composer.json | 21 -- appengine/standard/storage/index.php | 267 ------------------ appengine/standard/storage/phpunit.xml.dist | 34 --- .../standard/storage/src/read_metadata.php | 38 --- .../storage/src/register_stream_wrapper.php | 34 --- .../standard/storage/src/upload_file.php | 38 --- .../standard/storage/src/write_default.php | 36 --- .../storage/src/write_default_stream.php | 38 --- appengine/standard/storage/src/write_file.php | 35 --- .../standard/storage/src/write_metadata.php | 47 --- .../standard/storage/src/write_options.php | 42 --- .../standard/storage/src/write_public.php | 42 --- .../standard/storage/src/write_stream.php | 37 --- .../storage/src/write_with_caching.php | 49 ---- .../standard/storage/test/DeployTest.php | 156 ---------- 17 files changed, 981 deletions(-) delete mode 100644 appengine/standard/storage/README.md delete mode 100644 appengine/standard/storage/app.yaml delete mode 100644 appengine/standard/storage/composer.json delete mode 100644 appengine/standard/storage/index.php delete mode 100644 appengine/standard/storage/phpunit.xml.dist delete mode 100644 appengine/standard/storage/src/read_metadata.php delete mode 100644 appengine/standard/storage/src/register_stream_wrapper.php delete mode 100644 appengine/standard/storage/src/upload_file.php delete mode 100644 appengine/standard/storage/src/write_default.php delete mode 100644 appengine/standard/storage/src/write_default_stream.php delete mode 100644 appengine/standard/storage/src/write_file.php delete mode 100644 appengine/standard/storage/src/write_metadata.php delete mode 100644 appengine/standard/storage/src/write_options.php delete mode 100644 appengine/standard/storage/src/write_public.php delete mode 100644 appengine/standard/storage/src/write_stream.php delete mode 100644 appengine/standard/storage/src/write_with_caching.php delete mode 100644 appengine/standard/storage/test/DeployTest.php diff --git a/appengine/standard/storage/README.md b/appengine/standard/storage/README.md deleted file mode 100644 index d80b078431..0000000000 --- a/appengine/standard/storage/README.md +++ /dev/null @@ -1,57 +0,0 @@ -# Cloud Storage on App Engine Standard for PHP 7.2 - -This sample application demonstrates how to use [Cloud Storage on App Engine for PHP 7.2](https://cloud.google.com/appengine/docs/standard/php7/using-cloud-storage). - -## Setup - -Before running this sample: - -## Prerequisites - -- Install [`composer`](https://getcomposer.org) -- Install dependencies by running: - -```sh -composer install -``` - -## Setup - -Before you can run or deploy the sample, you will need to do the following: - -1. Set `` in `app.yaml` to the name of your Cloud Storage Bucket. - -## Run Locally - -First, set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to the -path to a set of downloaded -[service account credentials](https://cloud.google.com/docs/authentication/production#obtaining_and_providing_service_account_credentials_manually). - -Next, set the `GOOGLE_STORAGE_BUCKET`environment variable to the name of a -Cloud Storage bucket in the same project as the credentials you downloaded. -Make sure the service account you created has access. - -Finally, run the PHP built-in web server to serve the demo app: - -``` -php -S localhost:8080 -``` - -Now browse to `http://localhost:8080` to view the sample. - -## Deploy to App Engine - -**Prerequisites** - -- Install the [Google Cloud SDK](https://developers.google.com/cloud/sdk/). - -**Deploy with gcloud** - -``` -gcloud config set project YOUR_PROJECT_ID -gcloud app deploy -gcloud app browse -``` - -The last command will open `https://{YOUR_PROJECT_ID}.appspot.com/` -in your browser. diff --git a/appengine/standard/storage/app.yaml b/appengine/standard/storage/app.yaml deleted file mode 100644 index e60f155d25..0000000000 --- a/appengine/standard/storage/app.yaml +++ /dev/null @@ -1,10 +0,0 @@ -runtime: php74 - -# Defaults to "serve index.php" and "serve public/index.php". Can be used to -# serve a custom PHP front controller (e.g. "serve backend/index.php") or to -# run a long-running PHP script as a worker process (e.g. "php worker.php"). -# -# entrypoint: serve index.php - -env_variables: - GOOGLE_STORAGE_BUCKET: diff --git a/appengine/standard/storage/composer.json b/appengine/standard/storage/composer.json deleted file mode 100644 index ce24fd86dc..0000000000 --- a/appengine/standard/storage/composer.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "require": { - "google/cloud-storage": "^1.5", - "symfony/yaml": "^5.2" - }, - "autoload": { - "files": [ - "src/read_metadata.php", - "src/register_stream_wrapper.php", - "src/upload_file.php", - "src/write_default.php", - "src/write_default_stream.php", - "src/write_file.php", - "src/write_metadata.php", - "src/write_options.php", - "src/write_public.php", - "src/write_stream.php", - "src/write_with_caching.php" - ] - } -} diff --git a/appengine/standard/storage/index.php b/appengine/standard/storage/index.php deleted file mode 100644 index 99038e92f1..0000000000 --- a/appengine/standard/storage/index.php +++ /dev/null @@ -1,267 +0,0 @@ -') { - return 'Set the GOOGLE_STORAGE_BUCKET environment variable to the name of ' - . 'your cloud storage bucket in app.yaml'; -} - -if (!in_array('gs', stream_get_wrappers())) { - return 'This application can only run in AppEngine or the Dev AppServer environment.'; -} - -if ($_SERVER['REQUEST_URI'] == '/write/public') { - $contents = sprintf('new file written at %s', date('Y-m-d H:i:s')); - $publicUrl = write_public($bucketName, 'public_file.txt', $contents); - header('Location: ' . $publicUrl); - exit; -} - -if ($_SERVER['REQUEST_METHOD'] == 'POST') { - switch ($_SERVER['REQUEST_URI']) { - case '/write': - write_file($bucketName, 'hello.txt', $_REQUEST['content']); - break; - case '/write/options': - write_options($bucketName, 'hello_options.txt', $_REQUEST['content']); - break; - case '/write/stream': - write_stream($bucketName, 'hello_stream.txt', $_REQUEST['content']); - break; - case '/write/caching': - write_with_caching($bucketName, 'hello_caching.txt', $_REQUEST['content']); - break; - case '/write/metadata': - write_metadata( - $bucketName, - 'hello_metadata.txt', - $_REQUEST['content'], - ['foo' => 'bar', 'baz' => 'qux'] - ); - break; - case '/write/default': - if (!GCECredentials::onGce()) { - exit('This sample will only work when running on App Engine'); - } - write_default('hello_default.txt', $_REQUEST['content']); - break; - case '/write/default/stream': - if (!GCECredentials::onGce()) { - exit('This sample will only work when running on App Engine'); - } - write_default_stream('hello_default_stream.txt', $_REQUEST['content']); - break; - case '/user/upload': - upload_file($bucketName); - exit; - } - header('Location: /'); - exit; -} - -$params = []; -$objects = [ - 'hello' => "gs://${bucketName}/hello.txt", - 'options' => "gs://${bucketName}/hello_options.txt", - 'stream' => "gs://${bucketName}/hello_stream.txt", - 'caching' => "gs://${bucketName}/hello_caching.txt", - 'metadata' => "gs://${bucketName}/hello_metadata.txt", - 'default' => "gs://${defaultBucketName}/hello_default.txt", - 'default_stream' => "gs://${defaultBucketName}/hello_default_stream.txt", -]; -foreach ($objects as $name => $object) { - $params[$name] = file_exists($object) ? file_get_contents($object) : ''; -} - -// load file metadata -$metadata = []; -if (file_exists($objects['metadata'])) { - $metadata = read_metadata($projectId, $bucketName, 'hello_metadata.txt'); -} - -?> - - - - Storage Example - - - -

Storage Example

- - - -
-

- Write with Options - [docs]: -

-
- Some file content:
-
- -
- - -

Your content:

-

- -
- -
-

- Stream Write - [docs]: -

-
- Some file content:
-
- -
- - -

Your content:

-

- -
- -
-

- Write with Caching - [docs]: -

-
- Some file content:
-
- -
- - -

Your content:

-

- -
- -
-

- Write with Metadata - [docs]: -

-
- Some file content:
-
- -
- - -

Your content:

-

-

Your metadata:

- 

- $value): ?>
-    : 
-
-
-
- -
- -
-

- Write (default) - [docs]: -

-
- Some file content:
-
- -
- - -

Your content:

-

- -
- -
-

- Stream Write (default) - [docs]: -

-
- Some file content:
-
- -
- - -

Your content:

-

- -
- -
-

- Write and Serve Public Files - [docs]: -

-

Example of writing and serving a public file

-
- -
-

- User Uploads - [docs]: -

- - -
- Files to upload:
- - -
- -
- - diff --git a/appengine/standard/storage/phpunit.xml.dist b/appengine/standard/storage/phpunit.xml.dist deleted file mode 100644 index bb2849a940..0000000000 --- a/appengine/standard/storage/phpunit.xml.dist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - test - - - - - - - - app.php - - ./vendor - - - - diff --git a/appengine/standard/storage/src/read_metadata.php b/appengine/standard/storage/src/read_metadata.php deleted file mode 100644 index 17e798946d..0000000000 --- a/appengine/standard/storage/src/read_metadata.php +++ /dev/null @@ -1,38 +0,0 @@ - $projectId - ]); - $object = $storage->bucket($bucketName)->object($objectName); - - return $object->info()['metadata']; -} -# [END gae_storage_read_metadata] diff --git a/appengine/standard/storage/src/register_stream_wrapper.php b/appengine/standard/storage/src/register_stream_wrapper.php deleted file mode 100644 index 9b2fc74738..0000000000 --- a/appengine/standard/storage/src/register_stream_wrapper.php +++ /dev/null @@ -1,34 +0,0 @@ - $projectId]); - $client->registerStreamWrapper(); -} -# [END gae_storage_register_stream_wrapper] diff --git a/appengine/standard/storage/src/upload_file.php b/appengine/standard/storage/src/upload_file.php deleted file mode 100644 index 6afa09f152..0000000000 --- a/appengine/standard/storage/src/upload_file.php +++ /dev/null @@ -1,38 +0,0 @@ - [ - 'contentType' => 'text/plain', - 'metadata' => $metadata, - ] - ]; - $context = stream_context_create(['gs' => $options]); - file_put_contents( - "gs://${bucketName}/${objectName}", - $contents, - 0, - $context - ); -} -# [END gae_storage_write_metadata] diff --git a/appengine/standard/storage/src/write_options.php b/appengine/standard/storage/src/write_options.php deleted file mode 100644 index b36e7e13d4..0000000000 --- a/appengine/standard/storage/src/write_options.php +++ /dev/null @@ -1,42 +0,0 @@ - ['Content-Type' => 'text/plain']]; - $context = stream_context_create($options); - file_put_contents( - "gs://${bucketName}/${objectName}", - $contents, - 0, - $context - ); -} -# [END gae_storage_write_options] diff --git a/appengine/standard/storage/src/write_public.php b/appengine/standard/storage/src/write_public.php deleted file mode 100644 index 0f00ecf869..0000000000 --- a/appengine/standard/storage/src/write_public.php +++ /dev/null @@ -1,42 +0,0 @@ - ['predefinedAcl' => 'publicRead'] - ]; - $context = stream_context_create($options); - $fileName = "gs://${bucketName}/${objectName}"; - file_put_contents($fileName, $contents, 0, $context); - - return sprintf('http://storage.googleapis.com/%s/%s', $bucketName, $objectName); -} -# [END gae_storage_write_public] diff --git a/appengine/standard/storage/src/write_stream.php b/appengine/standard/storage/src/write_stream.php deleted file mode 100644 index 21abb50006..0000000000 --- a/appengine/standard/storage/src/write_stream.php +++ /dev/null @@ -1,37 +0,0 @@ - [ - 'enable_cache' => true, - 'enable_optimistic_cache' => true, - 'read_cache_expiry_seconds' => 300, - ] - ]; - $context = stream_context_create($options); - file_put_contents( - "gs://${bucketName}/${objectName}", - $contents, - 0, - $context - ); -} -# [END gae_storage_write_with_caching] diff --git a/appengine/standard/storage/test/DeployTest.php b/appengine/standard/storage/test/DeployTest.php deleted file mode 100644 index cfeb1a6fc7..0000000000 --- a/appengine/standard/storage/test/DeployTest.php +++ /dev/null @@ -1,156 +0,0 @@ -getBaseUrl(); - $this->client = new Client([ - 'base_uri' => $url, - 'allow_redirects' => true, - ]); - } - - public static function beforeDeploy() - { - if (!$bucketName = getenv('GOOGLE_STORAGE_BUCKET')) { - self::markTestSkipped('Set the GOOGLE_STORAGE_BUCKET environment variable'); - } - - $tmpDir = FileUtil::cloneDirectoryIntoTmp(__DIR__ . '/..'); - self::$gcloudWrapper->setDir($tmpDir); - chdir($tmpDir); - - $appYamlContents = file_get_contents('app.yaml'); - $appYaml = Yaml::parse($appYamlContents); - $appYaml['env_variables']['GOOGLE_STORAGE_BUCKET'] = $bucketName . '/storage'; - file_put_contents('app.yaml', Yaml::dump($appYaml)); - } - - public function testHome() - { - $response = $this->client->get('/'); - $this->assertEquals(200, $response->getStatusCode()); - } - - public function testWrite() - { - $content = sprintf('test write (%s)', date('Y-m-d H:i:s')); - $response = $this->client->request('POST', '/write', [ - 'form_params' => ['content' => $content], - ]); - - $this->assertEquals(200, $response->getStatusCode()); - $this->assertStringContainsString($content, (string) $response->getBody()); - } - - public function testWriteOptions() - { - $content = sprintf('write options (%s)', date('Y-m-d H:i:s')); - $response = $this->client->request('POST', '/write/options', [ - 'form_params' => ['content' => $content], - ]); - - $this->assertEquals(200, $response->getStatusCode()); - $this->assertStringContainsString($content, (string) $response->getBody()); - } - - public function testWriteStream() - { - $content = sprintf('write stream (%s)', date('Y-m-d H:i:s')); - $response = $this->client->request('POST', '/write/stream', [ - 'form_params' => ['content' => $content], - ]); - - $this->assertEquals(200, $response->getStatusCode()); - $this->assertStringContainsString($content, (string) $response->getBody()); - } - - public function testWriteCaching() - { - $content = sprintf('write caching (%s)', date('Y-m-d H:i:s')); - $response = $this->client->request('POST', '/write/caching', [ - 'form_params' => ['content' => $content], - ]); - - $this->assertEquals(200, $response->getStatusCode()); - $this->assertStringContainsString($content, (string) $response->getBody()); - } - - public function testWriteMetadata() - { - $content = sprintf('write metadata (%s)', date('Y-m-d H:i:s')); - $response = $this->client->request('POST', '/write/metadata', [ - 'form_params' => ['content' => $content], - ]); - - $this->assertEquals(200, $response->getStatusCode()); - $body = (string) $response->getBody(); - $this->assertStringContainsString($content, $content); - $this->assertStringContainsString('foo: bar', $body); - $this->assertStringContainsString('baz: qux', $body); - } - - public function testWriteDefault() - { - $content = sprintf('write default (%s)', date('Y-m-d H:i:s')); - $response = $this->client->request('POST', '/write/default', [ - 'form_params' => ['content' => $content], - ]); - - $this->assertEquals(200, $response->getStatusCode()); - $this->assertStringContainsString($content, (string) $response->getBody()); - } - - public function testWriteDefaultStream() - { - $content = sprintf('write default stream (%s)', date('Y-m-d H:i:s')); - $response = $this->client->request('POST', '/write/default/stream', [ - 'form_params' => ['content' => $content], - ]); - - $this->assertEquals(200, $response->getStatusCode()); - $this->assertStringContainsString($content, (string) $response->getBody()); - } - - public function testWritePublic() - { - $response = $this->client->request('GET', '/write/public'); - - $this->assertEquals(200, $response->getStatusCode()); - $this->assertStringContainsString('new file written at ', (string) $response->getBody()); - } -} From e3c4ad488e41d60b07d072276c0f73a06fbb74dd Mon Sep 17 00:00:00 2001 From: ace-n Date: Thu, 29 Apr 2021 15:43:02 -0700 Subject: [PATCH 28/44] chore(GAE bookshelf): add missing yaml package --- appengine/standard/getting-started/composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appengine/standard/getting-started/composer.json b/appengine/standard/getting-started/composer.json index 0dd488b1b2..b503d360c0 100644 --- a/appengine/standard/getting-started/composer.json +++ b/appengine/standard/getting-started/composer.json @@ -4,7 +4,8 @@ "slim/slim": "^4.0", "slim/psr7": "^1.0", "slim/twig-view": "^3.0", - "php-di/slim-bridge": "^3.1" + "php-di/slim-bridge": "^3.1", + "symfony/yaml": "^5.2" }, "autoload": { "psr-4": { From 49a6334e7ad74c7284b61994a563cffefd37e193 Mon Sep 17 00:00:00 2001 From: ace-n Date: Thu, 29 Apr 2021 15:43:26 -0700 Subject: [PATCH 29/44] fix incorrect firestore project id --- .kokoro/secrets.sh.enc | Bin 8389 -> 8391 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.kokoro/secrets.sh.enc b/.kokoro/secrets.sh.enc index e4da27a59e10713ed02b6f872fd6b3a04c76f18c..bb5f4f04f760f24b431ee5c0e20259b7b1d42315 100644 GIT binary patch literal 8391 zcmV;&AUNL&BmfTBrg}xt%BTkBI}?G7$L~GY=^a_mao;Y>Ijvi&!M>RzqY|D$0LMxY zs{8?n1Ii=08%rf=qfiHdGEU_(0urn}Y@jX#xm(&4#QrpXhzAM9qaSB=et&JAQ7sPU z1h}Up$1$nZA%F%)LvmY+iK*A~h6u%e1RVh|vs9A^V_se^$#*SVHF~7$u+a+2z|pIL z`zGx84{^> zX^r31Qwf6rvNB{gJJGqCqh?Ng?#>^ZX7Oickv%N@;$_|pbz z?9`0zo3UMRCmYbS2ZcVi04u|f9aR1KG$xsQ3{75Z z3(0<<{~^0Jnks#Hn(QpjhGLJCSQ^aH;I+z@H?WTVk183c67-E>w|c2ZT`|;>t&hVY z4H6_P*%%*#^UKoJzQ6n(jPPjy3;y7AajD|>I54P6W!=LZR!XBQQW8ke#j*KZy{_BZo7F;ge6Z)L_-K z7)eRF5Jd0LzMyghsnvKnXm6F--18_RAZ% z9kgoPmZ>{+$V@cDseWZK8mJ}+W#4Il1$!@wxlZo-eGKPB@dE(c*_-Yw>TR5RG)BWt zQx51N{xq#Bx=L9ioUFlfuQJ3Sy?!6S>KLZY#*NM(&Qzub>DLlZg;L98gTxT*p-g#HfQavSY|IScADk4>^cmGs5`LCkt09iRxHdk4<~ z7&XxywXM4@7!_o9-6V*eR#VIT-f#Fjt2T~TqF&)biBls|O%<2oa-KTHhHb>>V6Ud* zLSj?EbUOPhO`LUfUGpqwYADfbi;cw@+(E$B@P1E|c~{8@_<*e>Y;$Tk0fvp}7ylg0 zL+hZpNfDjQfjdxdllJSprZf~-&r;I7@Sbir$vF|J5EJyB64cQZNQSSetBe1l7&={$ zpfr0T09d206~62f!eByJz(|`wSm4DQLHi1QUz;coo+l8)uRzE9w$n0M#|J2X-t6}^ z$L)>cE9x^X$fC5F!8hQ%n6SEV8ftuadc+^!S4JvaV(~U%R*$W2bFU|XKKC98l_Ekn zt=Iy&yly;KQ__B_JGg80F&#yIYz^_k@pNEp5!7vAKPx~g;WuhB!thx4&aMziJD7W? zbGU%Hag(YDa1v4DWgH#Xlfm@i0~^Oh{O_Kvh|>2?wcrH+3L#06Ss96cCl~CK@SxiO zUrG9V-ro|O>C+H!V1W}!?&A{td_fl9gG_5;Wh(1b&%&0<)~fN)2!O6gk(jG3XlX<7 z(BHr#PzdKe35X)ua-S$#ja7QRgGYAi`YWaUOO(Ar{i8e%;>%}qm2+=q-w0(#ongDh_BTg#+t5(K2VbAMq53SR zTQtfGEpi}dkFJSG;cpy03ug$g`30{ummrD6nr7T0BLHVynmVK{Gr;?JXTBM7r*UqG zQZC-4d-%F}6&kWTTXd_sc@Px40BF%#_LTpA+mO8F&4#g)xpq_e>h)WmEXm9lR|9+e zaz4v?33E_tcn*Wb#ok@1n()A%?Lt}oZj&a@MmX&X)C1`ZKIG)6ZC};2b%3DLK}m)P zQ}>>=jqwo1D{No8+;e!NDO0koVX;-f!18@KQtWUdv^tVN89?QiR{#B6=d-vXl zY}-pNdxTE~b4<{6#uOUS0QPEjCzogiW+xC-oi}pz{sB0b?TdD*GbEBc2e4$!Ha41| z^*^%N`@W6#mucc9g8y~`o@iPud9iY0}WL1J~5 z^^D|Z;}aSU{_nw4J|+iNeUJigi|YwQm<(K^l5!2=;|DWp{}5I{kPnV!OXDKeeyOKc z8+-n@^k(b zDKIL+%h10o>N6pli3H8?W(?yq-I#o?o!S&YR{1f;s(Mr2&f9fdq(-{vo!)F}lM%%Z zs*wJTg9xitz^YF53fySm8Ok>fXt{Sez1q-?!km002AQd3^!+?-(d(^jn#q|S4>9Qt zhqEQHOlJ|H%gyVBTM9;l>5nqxxw_<1)Q#v?%-)@67^9zDR$-DBvbRv#pm-R#fRq z6t@vzmh=+>Y)i?xJ?GaipO5i<|BBCg;3d{kmRBO{OCkjkpIt$ zhF8Yv7I+5~_5$U10HX2)71byY(@C*5DyW18!1O-1!xy^XPcCL%*V*qy5bB%UQAhl? z$WaP$0to!)Ax|M0Y%Q1~u$b5ALRHxzbxd?J3Bb;;!{5kMh@)fI(UAljF35Z!(K`Zb zLCq=lUGhV%+JU^Xm^%xOkp`X!so3Z27XSTj`l?I&Dy@i36C;?=@y^1JF1p7c zwt<}_vwf%koPMo)g@n^rHFQGP96Whl*MtfhNMNMUY1c zXb-gNydGmc6OE6dW7P(pF&~T)gz}}MQhGBWg!+{w>(zCor~@9~pjQlXB&U4^n^e)d zLBFywMb&D!=D+NM9WltpYK=6<4t$$EfWrYJ*JY5B?Nv+&pu;I>7e-hOtvUUN?L0@+(C1`ZgA-y;LX=TSQbcEf*z1Q z>!ZW9?VlG@)|-&^`S6F$7c}-c;dOb^A99jTlR^%E;*Qs-eNV&n4|hVl;;f!?cyR12 zT$?4b@v`_+RJBZ`Ayo-;c(3(ar_PwE_;DCNyt0+Cm5oDueD3GJ^dC?Edu70o7>E2F z8tehXoaVbOF<8I|RN)E2Ppv_fhwf^>)zwFm<{>@KsG73zYNBr`Xb511U5~!fmkB{L z2ip9V-X8R%{-tB{!XFt;f|e^x*&`bIh~24c9{7chuJx}#?SEfYo3oE6Og=(aO9Pmb zr`BAT*I%1@9J)dR1`8!xX%T8*RvUJ}gM7{^FO=>e_JS6SVCFQx?nfxqtLBr#ge>TTSokv#>hVJRn%^v%xt6Y#1OpEt!TMs;2fJNd*pVulDKyOSyi} zdm%oQl6O}Ph*l`TC<_Aud}-E%&+^hP!C_0#FcjyMm_#tbJ5^QWkzgThEj7YUT4S5< z+8DAyPE{~+m;Ml%Gqk8|@~!w(B@=m=llgoF9Cnp#p>(&zIeK8}%!uc6A60srso5xu zGy)ooEa3gq``Cr=5zQb~4=6ArPhYFeEXGbGcoff4Z$#DxXX9uK=46aZaq$V}qsr0) z*J69ue6fvkRQD9jk~4}!j?9yE2|;>&71dvK;8HUT&p3O9KzM92(PQ_)e)%$o&g^)`Gq95Ak}4SnH@7Wqf8M&Z(@hD8~~1-XPl>-xKL zAxn%HG@XX1z<4kbl~SHonaDB-K9h|Ve|Ymy)vo7>*whv-WG-M*%*!{GvXHJ~CnM{IT_t0PZk8SCCMMld~L3KdCU$!xq< z+dj%ua1z*rCzmK`%(cW)XWv;VDh&4mpB{+5~FHM&C^tP0#qH!op z!qBO;K{qi#>hd|fH}liB#l0u+(S`QVf(#qm7Qt@GZ(?<+!$Z+YkKtc%OLO^JHe zDmZgJ6Ot>FlXj)2VAmSS=15d!$l%r?Eg&#USdV|Zg^ARMH@*E+(=QjRh%^(RzOVUe zN$E?MA!fHo;>x*+@Ewr!DEF%qx(t%9ks__S-pZk$w}jZFQ}i=GYrpu-^(^^&Oy!UH z2?*~hW~-qB((DCbdspI9_>{xAm2Ka9d(2$>CO(lBy8eWH0Is)z-}(o*YkJY zNB}{$E>r65pE9w0e3Vi(o4A2XF*6O* z2wS;8^XqG393dM0);v9rIuR1@#di3*NS;LjBm!R4?NSX76QyKPTR^2bo6l$MK!`x4 z_+~hZYMcKAE6j*T1`mPnI`JkO{+hKuWLX(Zwa#hCfV>*AF2%&dF0#%QJ&_zboe@1^ z|1SKiX@DvxLJg~NIyoU1HQiR?xxfutoOwuF8pF%d=AM3mPquI9$Co{bbgYms39{Y5 z`SVfBs2S>Go3^N^`D~rZcvz)ax0-f4a}}ep{$oNFEEd)-DiVM9R6!Cux{n+KypcJ_ z@o0v6K?*hN#?DKzy>%6&(OcdOo7F4Bbl&+P0vzQtH)k+zodBwyVtLc#$|?Zyu3UzI zF}zq}70P^t>34`fH_D843Ay!_N$@p*a2ftLmgW6qx7uTCEY8|rF(P7bTFzpz!MNg? z78ma`NosnErMDCuxljbbaT^~e(tPLYJeMM;f2M2L=bUeRRM}(AGNuC#AYF%%<7(KW zJ8H7O+ru49(MR?w;lZE4FZX?Vz}Muy_mBjfHNV$;0YGN;T!zOD(>AP0C)D}$bTAi!5}Yi@i^PBno+e3m_7rge{D@ZtK80|xb~KkRmb z{=KWdn$0s{L3K>TJ9_1qh$d*mwpr{95?NA_!UgNIyZSTI7(5tq)DNqj>`#IV82Ggv zz6V|%1T)0P=FyE6fx!oKa-;WfxX!&B5<7=y}os-Bos+*}>{C6~v^AT}q8Q1|Z z(06*<1Qw@SN&}x*q}4?n(D$tr%JGEx5}oC*7%=nlJB#;>0W5N1;eI$kM+rG{8U~Jm z8=U>M6_>TZ&vaK}uM;QGH<_1z$a};#{G+<~rIHE_@!-y-ZA}k56wV0Q7MctVnWAp0 zB5ThbNTQ3s z#<#+lkrodXx8?5B%IUtB;G4{~+vg;!g+o+AuYYF?xj6SGX2O|trD-i>s&ABgF?YYn zQmioQbBXoqmP!yMXSbz&tNVvcVuZTbKp(dJhZo+S9X}CIH&)j$3a4*K+TgpHuXhD{KAal<4J`*6|b7-(7 zMREgDFF8-m{GbJtBInM4k{`N(UupDOGMI*%UsFgN=3Fhzp>gVCnl%=k@M}~L>+4jb zH6gopl7u95Q%(V=Z;LBerk}MV`TEiSNpo)-U;bB8hE2lV{Ppy$&YjasxE21hkur*F z^8d2s?Nn`6M3B)*TMmx6Lkd0FEGBI<-EVTICbXC~|DD3@DHsjpsc;B)(1B$P#v!pn z)6p$6YFd(QQL=N%fRSXPB*!OdMTV~Pv_H)a=4l<;eV3IMqpca0AW+7E$IOfPW2F85 zuCD)^BB?1mBSA=;TLN%*n{z(sYB*QrcmXV4+eT$ywN%9Lz!aNZ#ZRU7s{+;0bRZi{3QGaa+m#^WMy>|lv5R$d2t%yGufhHGqC%->hvcdBLxv_B?I;2mt3 z7v%hW`SdC>k=&PV($g~kN{I~j#Rl_`%SwZhVfpj~1P)bZeznu=YS5qYZ2Rn0% zCg%?aa8WBfIp^-`bWL&t-bEAKw8G*S5gRWzqlG@~RLXkeF9$B*y_T3mbfE7v^0Jy4aHQfFnxsArqxomUyap$d??L z_}BLimE|8cG1sVMPIfU~{dcx=c8bKODSsvE0pj_mbVM;1rY;F+N^L;p+%7!H|De)X zAja$!!!>RU(p={JomTln_S9<>VT()^*A`-Wd@}=_0DmH*ZH6Mpi>^7^6DF1{Mkmo< zmvJlm-zz$xZ}IiQaY)9)?_+A+puVDqRCSl252HdmSk|Oyf+~eyOheMLZsJ9ON!2(L z<~oG&q1j835yY)0=9vx0B6f!e*&1XRZF`f06bL0xV+~qp6$-CffxL?_@&^ikEf7qL zW?UV8@(VJHv>@;jx^qpViv~# zCGX1&K*CbvH?NhQe4YgPIPLQ=*W-!(an-$aN3?pC3<_5@7_~%$JzS4m2W1y9ZgBO9 z%YGU9R(eWMB6jKj^3pGW;2_oJ*yA)s!!|}9(jNpx!VE+V%&!D_c{$0m%Cn1{iH2NP z?)JQgFu`DYp``ROB1G5NYfbj`AnoJL`<@^I=q(3&UNqhlbIl44`MS|#YoIngKa}c{ zb&d|f7$_+|1(Th45~W99^Zv=Bo-Sr@>olDOz$P}@rsT2f#8`bKv%|cO1NT||EuuSs z5rDkE4DV4aX;hsE1&JP!jeHlF2QWB-o9zDf-XG>!mr?u%4F^jq%JdswbF(d z2d7~ENu|tK@!j;{tD#N7Z3)y8$ap6~<&ea24)f&d{Mw?1T_REpMy;ry zXveM%29S4TOe(lUp zgUD7kj9?wMdaSGW!;JQJx>s1BSBk|%jpu~fK;pfpb>Lxpj#A}`z4xi0x@doo1MVYO zMg`AU4esfwng`rg+&u!{1Jl9#yq>!ra3svl?c`0o{xz&et+Pkj;gwaZ=;SqGGD>j1 z13$!ktR}e>3x!bME2L%})`+}@H;+|Z7!;`KM#mIlt%U%q#j;CV;^L>*gg>wm&kY*h zUGnUrm1Wg5^8Gyyq|7)pyQLE6?Xv|poFzY{ZD}q4fkPH@UBj(Hx`;$<(w}Mhm$DiH zE%goV4KboAOcdRu{4zc1Yw5|2BMi)Rj{Q+c@*XF}N?sIgN2H5Vx?rde+;5=k)?Cpl zq|q5?p*o3K(+hB#`=)I^l9CqUF@?x+^&p~9Fu928XUW{@5IC^{;(R9GbwVk;Vn`v_ z?(QF%2kX;DMVvAr#5!Oe&8ze^jYB=xK$5N-o_ab#xzUK@u~$(WK$}WEq&?@qE+qA8 zxfEO8;R~LKvh0E0NwJ{rUh%%Gk~FMdo?4W~_7OYSvUn7mcLs^ADHaxCad7T+8Oa*+ z)VHzq$FCy6EMF4yPfyG23$^{ua-?_?OenYuE0e#y+9|FdaD7dfYOaL(AW z(rcbqPnIRWa>!yxM`BjEJfj|XaOpOEvgl^nhB!XlVLR=%vccI5Sl0OJp10VJ9um^E zav=ha-B?Yo=E zCNw-krr^X{r(b~Hl)cvmEDjwz>>*Z!-8n>`eV|y>;?4jZ-sf(PIdPf8!qIaH z?tkVRMBzt4tenYdGBhd0>OZEi+`!!DD#W&SrG$H=L!Qr5>kOuPa3S@MS05&P5qSpl}A?8`Lxj1h+skP?lvUMmQ!Ov(g?{mn3Pjp0uru z;{V!V%C~p3vXK^`Z?@~cGd~j!%`Cv23pB*W0-X7Nd^xX$iiS*PGiL#Ob8l?S=cm8L zgc0v1j@6y)zi4ZCwrpM~EEr!6A!G)oR8bHWZC5Iet)E68r_02l>LAo?6~FDX7xt13 zO}TM%+SM?KZp77^a?ai1>2)|n*{Z8?jst>n2xLbFj^{gJ$f}`6*pXItS6N7ClhkDk zp#D{LQk z!GTULa$7>Sn2`u>;_km|B65-^J}Qlyj|p`|R2d&wz6->KM$0C;5&VZU2q3Ok93rZs zTZpCIy*_5r9a0G0`qHPv{ISAun1R#ByO10_{0jM%#aN=GT1T9%Q* zc^9_oF>XVNexm%zh1s0fLzF_rcdxCjH_c}0Fnm-eZW#=xOF1+!$aHYaJ|Y6KjGsk` zFkN62-15f(R8GqO_*zh582@Cq1uNT|uw0gQ)Pc8FX+Wp0MF$lIMI7SYFc?|nf4542 zw%)M-0H(5yKme*!DLhGX7SygNm@2${!K|e_D`!Jb+}NY;++!!iWmYTJ?*YfCM4BYdu5T*&1-Js~KRnPKqD9!bun zRfP*ryvuPg216S^BC%VpO7vDyoJLHmOM6l>NK*&>(;3l~0t_gfG`MO=K<3|4OLNQU#JwK1gz9Im6_lXeb?M@?8zwFc!f9z}geK@5;>My^15 z>kVlg@9?|uW}Zgy%La=c5#{3)Xq{rHXUM?6C;1Prq+*8>*ol?LJ70i4)eVE==hurp zMdneAM{Rtj$fGIl+4*Ri)F6PDEs38c|Ihm0f;HAy dva;p_{tI;#!g8i243!wkRBzh6C8>A;kJD1)In@9F literal 8389 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 Date: Thu, 29 Apr 2021 18:56:44 -0700 Subject: [PATCH 30/44] fix: typo --- functions/firebase_firestore/test/DeployTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/firebase_firestore/test/DeployTest.php b/functions/firebase_firestore/test/DeployTest.php index 9795e10dfd..d4831fe5e7 100644 --- a/functions/firebase_firestore/test/DeployTest.php +++ b/functions/firebase_firestore/test/DeployTest.php @@ -76,7 +76,7 @@ private static function checkProjectEnvVars() private static function doDeploy() { $resource = sprintf( - 'projects/%s/databases/(default)/documents/%s/%s/', + 'projects/%s/databases/(default)/documents/%s/%s', self::$projectId, self::$collectionName, self::$documentName From 12d1a631e49ffa1dd2c29d1904f96ae54191a7af Mon Sep 17 00:00:00 2001 From: ace-n Date: Thu, 29 Apr 2021 18:57:05 -0700 Subject: [PATCH 31/44] fix: use proper project ID --- functions/firebase_firestore_reactive/test/DeployTest.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/functions/firebase_firestore_reactive/test/DeployTest.php b/functions/firebase_firestore_reactive/test/DeployTest.php index bf37e18e0d..d8a815e1f2 100644 --- a/functions/firebase_firestore_reactive/test/DeployTest.php +++ b/functions/firebase_firestore_reactive/test/DeployTest.php @@ -77,11 +77,9 @@ private static function checkProjectEnvVars() */ private static function doDeploy() { - $project = self::requireEnv('GOOGLE_PROJECT_ID'); - $resource = sprintf( 'projects/%s/databases/(default)/documents/%s/%s', - $project, + self::$projectId, self::$collectionName, self::$documentName ); From 929c18687664b33a444fdf45dec056596d3616b8 Mon Sep 17 00:00:00 2001 From: ace-n Date: Thu, 29 Apr 2021 18:57:59 -0700 Subject: [PATCH 32/44] fix: tweak remote config retry params --- functions/firebase_remote_config/test/DeployTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/firebase_remote_config/test/DeployTest.php b/functions/firebase_remote_config/test/DeployTest.php index 4eab302e3f..8ea95f9162 100644 --- a/functions/firebase_remote_config/test/DeployTest.php +++ b/functions/firebase_remote_config/test/DeployTest.php @@ -116,7 +116,7 @@ public function testFirebaseRemoteConfig( // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual, $label); - }, null, 10); + }, 5, 30); } /** From 14a7e70311b7d6139aa765bb67c6281d839b472d Mon Sep 17 00:00:00 2001 From: ace-n Date: Mon, 3 May 2021 15:13:34 -0700 Subject: [PATCH 33/44] Skip broken wordpress sample's test --- appengine/standard/wordpress/test/DeployTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appengine/standard/wordpress/test/DeployTest.php b/appengine/standard/wordpress/test/DeployTest.php index 98750cecfe..25df24b9cb 100644 --- a/appengine/standard/wordpress/test/DeployTest.php +++ b/appengine/standard/wordpress/test/DeployTest.php @@ -56,6 +56,10 @@ public static function beforeDeploy() public function testIndex() { + $this->markTestSkipped( + 'This sample is BROKEN. See https://github.com/GoogleCloudPlatform/php-docs-samples/issues/1348' + ); + // Access the blog top page $resp = $this->client->get(''); $this->assertEquals('200', $resp->getStatusCode()); From ebd261e1156c0c74a006f046c29f5b533beecf66 Mon Sep 17 00:00:00 2001 From: ace-n Date: Mon, 3 May 2021 16:24:44 -0700 Subject: [PATCH 34/44] Skip broken laravel sample's test --- .../laravel-framework/test/DeployDatabaseTest.php | 4 ++++ .../laravel-framework/test/DeployStackdriverTest.php | 8 ++++++++ appengine/standard/laravel-framework/test/DeployTest.php | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/appengine/standard/laravel-framework/test/DeployDatabaseTest.php b/appengine/standard/laravel-framework/test/DeployDatabaseTest.php index c300557696..a953674e26 100644 --- a/appengine/standard/laravel-framework/test/DeployDatabaseTest.php +++ b/appengine/standard/laravel-framework/test/DeployDatabaseTest.php @@ -67,6 +67,10 @@ public static function beforeDeploy() public function testHomepage() { + $this->markTestSkipped( + 'This sample is BROKEN. See https://github.com/GoogleCloudPlatform/php-docs-samples/issues/1349' + ); + // Access the blog top page $resp = $this->client->get('/'); $this->assertEquals( diff --git a/appengine/standard/laravel-framework/test/DeployStackdriverTest.php b/appengine/standard/laravel-framework/test/DeployStackdriverTest.php index 3aa6c329a8..cc01a3e5ea 100644 --- a/appengine/standard/laravel-framework/test/DeployStackdriverTest.php +++ b/appengine/standard/laravel-framework/test/DeployStackdriverTest.php @@ -66,6 +66,10 @@ public static function beforeDeploy() public function testLogging() { + $this->markTestSkipped( + 'This sample is BROKEN. See https://github.com/GoogleCloudPlatform/php-docs-samples/issues/1349' + ); + $logging = new LoggingClient([ 'projectId' => self::getProjectId() ]); @@ -98,6 +102,10 @@ public function testLogging() public function testErrorReporting() { + $this->markTestSkipped( + 'This sample is BROKEN. See https://github.com/GoogleCloudPlatform/php-docs-samples/issues/1349' + ); + $logging = new LoggingClient([ 'projectId' => self::getProjectId() ]); diff --git a/appengine/standard/laravel-framework/test/DeployTest.php b/appengine/standard/laravel-framework/test/DeployTest.php index 75bfac75b2..5fd708179d 100644 --- a/appengine/standard/laravel-framework/test/DeployTest.php +++ b/appengine/standard/laravel-framework/test/DeployTest.php @@ -42,6 +42,10 @@ public static function beforeDeploy() public function testHomepage() { + $this->markTestSkipped( + 'This sample is BROKEN. See https://github.com/GoogleCloudPlatform/php-docs-samples/issues/1349' + ); + // Access the blog top page $resp = $this->client->get('/'); $this->assertEquals('200', $resp->getStatusCode(), 'top page status code'); From 35e8675b4099e7fdeb96c0ff84dfe79d2747bc3f Mon Sep 17 00:00:00 2001 From: ace-n Date: Thu, 6 May 2021 13:32:48 -0700 Subject: [PATCH 35/44] Fix deprecated assertContains --- functions/tips_infinite_retries/test/IntegrationTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/functions/tips_infinite_retries/test/IntegrationTest.php b/functions/tips_infinite_retries/test/IntegrationTest.php index 9f26dc954a..50303024d0 100644 --- a/functions/tips_infinite_retries/test/IntegrationTest.php +++ b/functions/tips_infinite_retries/test/IntegrationTest.php @@ -103,6 +103,10 @@ public function testLimitInfiniteRetries(array $cloudevent, array $data, string ); // Verify the function's behavior is correct. - $this->assertContains($expected, $actual, $label . ' contains'); + $this->assertStringContainsString( + $expected, + $actual, + $label . ' contains' + ); } } From 015d6bc7d5e4bc6f36a14b20b6126aca71a2a3d1 Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 11 May 2021 12:21:21 -0700 Subject: [PATCH 36/44] Fix bad project ID spec for firestore --- functions/firebase_firestore_reactive/test/DeployTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functions/firebase_firestore_reactive/test/DeployTest.php b/functions/firebase_firestore_reactive/test/DeployTest.php index d8a815e1f2..d985f5fcb9 100644 --- a/functions/firebase_firestore_reactive/test/DeployTest.php +++ b/functions/firebase_firestore_reactive/test/DeployTest.php @@ -147,7 +147,9 @@ private function updateFirestore( array $data ): void { if (empty(self::$firestoreClient)) { - self::$firestoreClient = new FirestoreClient(); + self::$firestoreClient = new FirestoreClient( + ['projectId' => self::$projectId] + ); } self::$firestoreClient From 4c7252d7819baabf32fd0e4fb7864d103dc3ca12 Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 11 May 2021 12:21:42 -0700 Subject: [PATCH 37/44] Tweak logging GAE sample's retry params --- appengine/standard/logging/test/DeployTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appengine/standard/logging/test/DeployTest.php b/appengine/standard/logging/test/DeployTest.php index d2762a8bfe..c80ba86497 100644 --- a/appengine/standard/logging/test/DeployTest.php +++ b/appengine/standard/logging/test/DeployTest.php @@ -41,7 +41,7 @@ public function testIndex() $response->getBody()->getContents() ); - $this->verifyLog('This will show up as log level INFO', 'info', 3); + $this->verifyLog('This will show up as log level INFO', 'info', 5); // These should succeed if the above call has too. // Thus, they need fewer retries! @@ -59,8 +59,8 @@ private function verifyLog($message, $level, $retryCount = 3) $fiveMinAgo ); $logOptions = [ - 'pageSize' => 20, - 'resultLimit' => 20, + 'pageSize' => 50, + 'resultLimit' => 50, 'filter' => $filter, ]; $logging = new LoggingClient(); From e97c9d0d9c2f5d75acf3575e7bbed371dd0aeec0 Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 11 May 2021 12:24:22 -0700 Subject: [PATCH 38/44] Fix bad project ID spec, take 2 --- functions/firebase_firestore/test/DeployTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functions/firebase_firestore/test/DeployTest.php b/functions/firebase_firestore/test/DeployTest.php index d4831fe5e7..15a44e6c47 100644 --- a/functions/firebase_firestore/test/DeployTest.php +++ b/functions/firebase_firestore/test/DeployTest.php @@ -144,7 +144,9 @@ private function updateFirestore( array $data ): void { if (empty(self::$firestore)) { - self::$firestoreClient = new FirestoreClient(); + self::$firestoreClient = new FirestoreClient( + ['projectId' => self::$projectId] + ); } self::$firestoreClient From b4383f2e844cc316004da79a306482279c77fd99 Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 11 May 2021 18:41:26 -0700 Subject: [PATCH 39/44] Try to fix compilation error in Laravel sample --- appengine/standard/laravel-framework/bootstrap/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/standard/laravel-framework/bootstrap/app.php b/appengine/standard/laravel-framework/bootstrap/app.php index f192c92034..991f19472e 100644 --- a/appengine/standard/laravel-framework/bootstrap/app.php +++ b/appengine/standard/laravel-framework/bootstrap/app.php @@ -37,7 +37,7 @@ ); $app->singleton( - Illuminate\Contracts\Debug\ExceptionHandler::class, + Illuminate\Foundation\Exceptions\Handler::class, App\Exceptions\Handler::class ); From a4d0cec553d32a896fab16db6d6d60de589dfaa0 Mon Sep 17 00:00:00 2001 From: ace-n Date: Mon, 17 May 2021 18:21:28 -0700 Subject: [PATCH 40/44] Fix Laravel compilation issue, take 2 --- appengine/standard/laravel-framework/bootstrap/app.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appengine/standard/laravel-framework/bootstrap/app.php b/appengine/standard/laravel-framework/bootstrap/app.php index 991f19472e..ae5d0971ad 100644 --- a/appengine/standard/laravel-framework/bootstrap/app.php +++ b/appengine/standard/laravel-framework/bootstrap/app.php @@ -36,6 +36,11 @@ App\Console\Kernel::class ); +$app->singleton( + Illuminate\Contracts\Debug\ExceptionHandler::class, + App\Exceptions\Handler::class +); + $app->singleton( Illuminate\Foundation\Exceptions\Handler::class, App\Exceptions\Handler::class From 55664e3b5de4b6dad089ae25e528ff9db86a04dc Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 18 May 2021 00:13:02 -0700 Subject: [PATCH 41/44] Completely skip the laravel tests in phpunit.xml --- appengine/standard/laravel-framework/phpunit.xml.dist | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appengine/standard/laravel-framework/phpunit.xml.dist b/appengine/standard/laravel-framework/phpunit.xml.dist index c7b779b25d..4b10dba8bb 100644 --- a/appengine/standard/laravel-framework/phpunit.xml.dist +++ b/appengine/standard/laravel-framework/phpunit.xml.dist @@ -17,7 +17,9 @@ - test + + + From 1f0216c94c8bc9038e8bc34c358063e7543d9895 Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 18 May 2021 01:05:54 -0700 Subject: [PATCH 42/44] DEBUG: add status-code check to remote config test --- functions/firebase_remote_config/test/DeployTest.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/functions/firebase_remote_config/test/DeployTest.php b/functions/firebase_remote_config/test/DeployTest.php index 8ea95f9162..5acf13c5d6 100644 --- a/functions/firebase_remote_config/test/DeployTest.php +++ b/functions/firebase_remote_config/test/DeployTest.php @@ -24,6 +24,7 @@ use Google\Cloud\Logging\LoggingClient; use Google\Cloud\TestUtils\CloudFunctionDeploymentTrait; use PHPUnit\Framework\TestCase; +use GuzzleHttp\Psr7\Response; /** * Class DeployTest. @@ -97,10 +98,11 @@ public function testFirebaseRemoteConfig( string $expected ): void { // Trigger config update. - $objectUri = $this->updateRemoteConfig( + $apiResponse = $this->updateRemoteConfig( $key, $value ); + $this->assertEquals($apiResponse->getStatusCode(), 200); $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes')); $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) use ($expected, $label) { @@ -130,7 +132,7 @@ public function testFirebaseRemoteConfig( private function updateRemoteConfig( string $key, string $value - ): void { + ): Response { $projectId = self::requireEnv('GOOGLE_PROJECT_ID'); if (empty(self::$apiHttpClient)) { @@ -149,7 +151,7 @@ private function updateRemoteConfig( ] ] ]; - $response = self::$apiHttpClient->put('', [ + return self::$apiHttpClient->put('', [ 'headers' => ['If-Match' => '*'], 'json' => $json ]); From bf4ed90b6580e39e8228571f9aa7199c4b36458d Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 18 May 2021 11:57:55 -0700 Subject: [PATCH 43/44] Increase deploy-test timeouts --- functions/firebase_firestore/test/DeployTest.php | 2 +- functions/firebase_firestore_reactive/test/DeployTest.php | 2 +- functions/firebase_remote_config/test/DeployTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/firebase_firestore/test/DeployTest.php b/functions/firebase_firestore/test/DeployTest.php index 15a44e6c47..28f5ffad46 100644 --- a/functions/firebase_firestore/test/DeployTest.php +++ b/functions/firebase_firestore/test/DeployTest.php @@ -126,7 +126,7 @@ public function testFirebaseFirestore(array $data, string $expected): void // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual); - }, null, 5); + }, 5, 30); } /** diff --git a/functions/firebase_firestore_reactive/test/DeployTest.php b/functions/firebase_firestore_reactive/test/DeployTest.php index d985f5fcb9..4e099c915c 100644 --- a/functions/firebase_firestore_reactive/test/DeployTest.php +++ b/functions/firebase_firestore_reactive/test/DeployTest.php @@ -129,7 +129,7 @@ public function testFirebaseReactive(array $data, string $expected): void // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual); - }, 3, 30); + }, 5, 30); } /** diff --git a/functions/firebase_remote_config/test/DeployTest.php b/functions/firebase_remote_config/test/DeployTest.php index 5acf13c5d6..89d023ee4b 100644 --- a/functions/firebase_remote_config/test/DeployTest.php +++ b/functions/firebase_remote_config/test/DeployTest.php @@ -118,7 +118,7 @@ public function testFirebaseRemoteConfig( // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual, $label); - }, 5, 30); + }, 8, 30); } /** From a95b874da7dc8472dadd0e74dbe69e0d7abea8c3 Mon Sep 17 00:00:00 2001 From: ace-n Date: Tue, 18 May 2021 14:48:07 -0700 Subject: [PATCH 44/44] Increase remote config retry count, take 2 --- functions/firebase_remote_config/test/DeployTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/firebase_remote_config/test/DeployTest.php b/functions/firebase_remote_config/test/DeployTest.php index 89d023ee4b..00a64ff2d8 100644 --- a/functions/firebase_remote_config/test/DeployTest.php +++ b/functions/firebase_remote_config/test/DeployTest.php @@ -118,7 +118,7 @@ public function testFirebaseRemoteConfig( // Only testing one property to decrease odds the expected logs are // split between log requests. $this->assertStringContainsString($expected, $actual, $label); - }, 8, 30); + }, 10, 60); } /**

-

- Write - [docs]: -

-
- Some file content:
-
- -
- - -

Your content:

-

- -