fix: improves eventarc sample (GoogleCloudPlatform#1226)

Author: bshaffer

eventarc/README.md

@@ -0,0 +1,11 @@
+<img src="https://avatars2.githubusercontent.com/u/2810941?v=3&s=96" alt="Google Cloud Platform logo" title="Google Cloud Platform" align="right" height="96" width="96"/>
+
+# Eventarc – PHP Samples
+
+This directory contains samples for using Eventarc with PHP.
+
+## Sample
+
+|                 Sample                  |        Description       |
+| --------------------------------------- | ------------------------ |
+|[Generic](generic)  | Quickstart |

eventarc/generic/README.md

@@ -2,13 +2,11 @@
 
 # Eventarc – Generic – PHP Sample
 
-This directory contains a sample for receiving a generic event using Cloud Run and Eventarc with PHP. For testing purposes, we use Cloud Pub/Sub as an event source for our sample.
+[<img src="https://storage.googleapis.com/cloudrun/button.svg" alt="Run on Google Cloud" height="30"/>][run_button_generic]
 
-## Sample
-
-|                 Sample                  |        Description       |     Deploy    |
-| --------------------------------------- | ------------------------ | ------------- |
-|[Generic][generic]  | Quickstart | [<img src="https://storage.googleapis.com/cloudrun/button.svg" alt="Run on Google Cloud" height="30"/>][run_button_generic] |
+This directory contains a sample for receiving a generic event using Cloud Run
+and Eventarc with PHP. For testing purposes, we use Cloud Pub/Sub as an event
+source for our sample.
 
 ## Setup
 
@@ -20,7 +18,8 @@ This directory contains a sample for receiving a generic event using Cloud Run a
     gcloud components install beta
     ```
 
-1. Set the following gcloud configurations, where `PROJECT_ID` is your Google Cloud project ID:
+1. Set the following gcloud configurations, where `PROJECT_ID` is your Google
+   Cloud project ID:
 
     ```sh
     gcloud config set project PROJECT_ID
@@ -45,16 +44,15 @@ This directory contains a sample for receiving a generic event using Cloud Run a
 1. [Build the container locally](https://cloud.google.com/run/docs/building/containers#building_locally_and_pushing_using_docker):
 
     ```sh
-    export SAMPLE='generic'
-    docker build --tag "eventarc-$SAMPLE" .
+    docker build --tag eventarc-generic .
     ```
 
 1. [Run containers locally](https://cloud.google.com/run/docs/testing/local)
 
     With the built container:
 
     ```sh
-    PORT=8080 && docker run --rm -p 8080:${PORT} -e PORT=${PORT} $SAMPLE
+    PORT=8080 && docker run --rm -p 8080:${PORT} -e PORT=${PORT} eventarc-generic
     ```
 
     Test the web server with `cURL`:
@@ -64,7 +62,7 @@ This directory contains a sample for receiving a generic event using Cloud Run a
     ```
 
     Observe the output logs your HTTP request:
-    
+
     ```
     Event received!
 
@@ -178,5 +176,4 @@ To clean up, delete the resources created above:
     ```
 
 [enable_apis_url]: https://console.cloud.google.com/flows/enableapi?apiid=run.googleapis.com,logging.googleapis.com,cloudbuild.googleapis.com,pubsub.googleapis.com,eventarc.googleapis.com
-[generic]: .
 [run_button_generic]: https://deploy.cloud.run/?dir=eventarc/generic

eventarc/generic/index.php

@@ -16,25 +16,25 @@
  */
 
 // [START eventarc_generic_server]
-$log = fopen('php://stderr', 'wb');
 // [END eventarc_generic_server]
 
 // [START eventarc_generic_handler]
-echo "Event received!\n";
-fwrite($log, "Event received!\n");
+$msg = "Event received!\n";
 
-echo "\nHEADERS:\n";
-fwrite($log, "\nHEADERS:\n");
+$msg .= "\nHEADERS:\n";
 $headers = getallheaders();
 unset($headers['Authorization']); // do not log authorization header
 foreach ($headers as $name => $value) {
-    echo "$name: $value\n";
-    fwrite($log, "$name: $value\n");
+    $msg .= "$name: $value\n";
 }
 
-echo "\nBODY:\n";
-fwrite($log, "\nBODY:\n");
+$msg .= "\nBODY:\n";
 $body = file_get_contents('php://input');
-echo $body . "\n";
-fwrite($log, $body . "\n");
+$msg .= $body . "\n";
+
+// Write to stderr for logging
+$log = fopen('php://stderr', 'wb');
+fwrite($log, $msg);
+// Echo to return in request body
+echo $msg;
 // [END eventarc_generic_handler]

eventarc/generic/test/DeployTest.php

@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-namespace Google\Cloud\Samples\Run\Helloworld;
+namespace Google\Cloud\Samples\EventArc\Generic\Test;
 
 use Google\Auth\ApplicationDefaultCredentials;
 use Google\Cloud\TestUtils\DeploymentTrait;
-use Google\Cloud\TestUtils\EventuallyConsistentTestTrait;
 use Google\Cloud\TestUtils\GcloudWrapper\CloudRun;
 use Google\Cloud\TestUtils\TestTrait;
 use GuzzleHttp\Client;
@@ -29,10 +28,9 @@
 /**
  * Class DeployTest.
  */
-class DeloyTest extends TestCase
+class DeployTest extends TestCase
 {
     use DeploymentTrait;
-    use EventuallyConsistentTestTrait;
     use TestTrait;
 
     /** @var \Google\Cloud\TestUtils\GcloudWrapper\CloudRun */
@@ -48,10 +46,12 @@ class DeloyTest extends TestCase
      */
     public static function setUpDeploymentVars()
     {
-        $projectId = self::requireEnv('GOOGLE_PROJECT_ID');
-        $versionId = self::requireEnv('GOOGLE_VERSION_ID');
-        self::$service = new CloudRun($projectId, ['service' => $versionId]);
-        self::$image = sprintf('gcr.io/%s/%s:latest', $projectId, $versionId);
+        if (is_null(self::$service) || is_null(self::$image)) {
+            $projectId = self::requireEnv('GOOGLE_PROJECT_ID');
+            $versionId = self::requireEnv('GOOGLE_VERSION_ID');
+            self::$service = new CloudRun($projectId, ['service' => $versionId]);
+            self::$image = sprintf('gcr.io/%s/%s:latest', $projectId, $versionId);
+        }
     }
 
     private static function beforeDeploy()

eventarc/generic/test/LocalTest.php

@@ -0,0 +1,44 @@
+
+/**
+ * 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.
+ */
+
+namespace Google\Cloud\Samples\EventArc\Generic\Test;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class LocalTest.
+ */
+class LocalTest extends TestCase
+{
+    public function testIndex()
+    {
+        ob_start();
+        require_once(__DIR__ . '/../index.php');
+        $output = ob_get_clean();
+        $expected = <<
+Event received!
+
+HEADERS:
+
+BODY:
+
+
+EOF;
+
+        $this->assertEquals($expected, $output);
+    }
+}