fix: functions retry sample and test (GoogleCloudPlatform#1342)

Author: bshaffer

functions/tips_retry/index.php

@@ -21,11 +21,13 @@
 
 function tipsRetry(CloudEvent $event): void
 {
-    $data = $event->getData()['data'];
-    $data = json_decode(base64_decode($data), true);
+    $cloudEventData = $event->getData();
+    $pubSubData = $cloudEventData['message']['data'];
+
+    $json = json_decode(base64_decode($pubSubData), true);
 
     // Determine whether to retry the invocation based on a parameter
-    $tryAgain = $data['some_parameter'];
+    $tryAgain = $json['some_parameter'];
 
     if ($tryAgain) {
         /**

functions/tips_retry/puppies.jpg

@@ -19,7 +19,6 @@
 
 namespace Google\Cloud\Samples\Functions\TipsRetry\Test;
 
-use Google\Cloud\Logging\LoggingClient;
 use Google\Cloud\TestUtils\CloudFunctionDeploymentTrait;
 use Google\Cloud\PubSub\PubSubClient;
 use PHPUnit\Framework\TestCase;
@@ -39,24 +38,14 @@ class DeployTest extends TestCase
 
     private static $entryPoint = 'tipsRetry';
 
-    /* var string */
-    private static $projectId;
-
     /* var string */
     private static $topicName;
 
-    /** @var LoggingClient */
-    private static $loggingClient;
-
     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(60);
-
         $fiveMinAgo = date(\DateTime::RFC3339, strtotime('-5 minutes'));
         $this->processFunctionLogs($fiveMinAgo, function (\Iterator $logs) {
             // Concatenate all relevant log messages.
@@ -67,7 +56,8 @@ public function testTipsRetry(): void
             }
 
             // Check that multiple invocations of the function have occurred.
-            $retryCount = substr_count($actual, 'Retrying...');
+            $retryText = 'Intermittent failure occurred; retrying...';
+            $retryCount = substr_count($actual, $retryText);
             $this->assertGreaterThan(1, $retryCount);
         });
     }
@@ -90,14 +80,16 @@ private function publishMessage(): void
      */
     private static function doDeploy()
     {
-        self::$projectId = self::requireEnv('GOOGLE_CLOUD_PROJECT');
         self::$topicName = self::requireEnv('FUNCTIONS_TOPIC');
 
         /**
          * The --retry flag tells Cloud Functions to automatically retry
          * failed function invocations. This is necessary because we're
          * the parent sample exists to demonstrate automatic retries.
          */
-        return self::$fn->deploy(['--retry' => ''], '--trigger-topic=' . self::$topicName);
+        return self::$fn->deploy(
+            ['--retry' => ''],
+            '--trigger-topic=' . self::$topicName
+        );
     }
 }

functions/tips_retry/test/DeployTest.php

@@ -39,9 +39,13 @@ class IntegrationTest extends TestCase
     private static $functionSignatureType = 'cloudevent';
 
 
-    private static function makeData($jsonArray)
+    private static function makeData(array $jsonArray)
     {
-        return ['data' => base64_encode(json_encode($jsonArray))];
+        return [
+            'message' => [
+                'data' => base64_encode(json_encode($jsonArray))
+            ]
+        ];
     }
 
     public function dataProvider()
@@ -93,6 +97,6 @@ public function testTipsRetry(array $cloudevent, string $statusCode, string $exp
         );
 
         // Verify the function's behavior is correct.
-        $this->assertContains($expected, $actual, $label . ' contains');
+        $this->assertStringContainsString($expected, $actual, $label . ' contains');
     }
 }