fix: failing monitoring, dlp, and video samples (GoogleCloudPlatform#1400)

Author: bshaffer

dlp/test/dlpTest.php

@@ -19,13 +19,15 @@
 
 use Google\Cloud\TestUtils\TestTrait;
 use PHPUnit\Framework\TestCase;
+use PHPUnitRetry\RetryTrait;
 
 /**
  * Unit Tests for dlp commands.
  */
 class dlpTest extends TestCase
 {
     use TestTrait;
+    use RetryTrait;
 
     public function testInspectImageFile()
     {
@@ -224,9 +226,16 @@ public function testInspectTemplates()
         $this->assertStringContainsString('Successfully deleted template ' . $fullTemplateId, $output);
     }
 
+    /**
+     * @retryAttempts 3
+     */
     public function testJobs()
     {
-        $filter = 'state=DONE';
+        // Set filter to only go back a day, so that we do not pull every job.
+        $filter = sprintf(
+            'state=DONE AND end_time>"%sT00:00:00+00:00"',
+            date('Y-m-d', strtotime('-1 day'))
+        );
         $jobIdRegex = "~projects/.*/dlpJobs/i-\d+~";
 
         $output = $this->runSnippet('list_jobs', [

monitoring/test/alertsTest.php

@@ -22,11 +22,13 @@
 use Google\Cloud\TestUtils\ExecuteCommandTrait;
 use Google\Cloud\TestUtils\TestTrait;
 use PHPUnit\Framework\TestCase;
+use PHPUnitRetry\RetryTrait;
 
 class alertsTest extends TestCase
 {
     use ExecuteCommandTrait;
     use TestTrait;
+    use RetryTrait;
 
     private static $commandFile = __DIR__ . '/../alerts.php';
     private static $policyId;
@@ -43,9 +45,17 @@ public function testCreatePolicy()
         self::$policyId = $matches[1];
     }
 
+    /**
+     * @depends testCreatePolicy
+     * @retryAttempts 2
+     * @retryDelaySeconds 10
+     */
     public function testEnablePolicies()
     {
-        $policyName = AlertPolicyServiceClient::alertPolicyName(self::$projectId, self::$policyId);
+        $policyName = AlertPolicyServiceClient::alertPolicyName(
+            self::$projectId,
+            self::$policyId
+        );
         $output = $this->runAlertCommand('enable-policies', [
             'filter' => sprintf('name = "%s"', $policyName),
             'enable' => true,
@@ -54,13 +64,25 @@ public function testEnablePolicies()
             sprintf('Policy %s is already enabled', $policyName),
             $output
         );
+    }
 
+    /**
+     * @depends testEnablePolicies
+     */
+    public function testDisablePolicies()
+    {
+        $policyName = AlertPolicyServiceClient::alertPolicyName(
+            self::$projectId,
+            self::$policyId
+        );
         $output = $this->runAlertCommand('enable-policies', [
             'filter' => sprintf('name = "%s"', $policyName),
             'enable' => false,
         ]);
-
-        $this->assertStringContainsString(sprintf('Disabled %s', $policyName), $output);
+        $this->assertStringContainsString(
+            sprintf('Disabled %s', $policyName),
+            $output
+        );
     }
 
     /** @depends testCreatePolicy */
@@ -148,10 +170,11 @@ public function testListChannels()
         $this->assertStringContainsString(self::$channelId, $output);
     }
 
-    /** @depends testCreateChannel */
-    public function testBackupAndRestore()
+    /**
+     * @depends testCreateChannel
+     */
+    public function testBackupPolicies()
     {
-        // backup
         $output = $this->runAlertCommand('backup-policies');
         $this->assertStringContainsString('Backed up alert policies', $output);
 
@@ -163,8 +186,15 @@ public function testBackupAndRestore()
         $this->assertGreaterThan(0, count($backup['channels']));
         $this->assertStringContainsString(self::$policyId, $backupJson);
         $this->assertStringContainsString(self::$channelId, $backupJson);
+    }
 
-        // restore
+    /**
+     * @depends testBackupPolicies
+     * @retryAttempts 2
+     * @retryDelaySeconds 10
+     */
+    public function testRestorePolicies()
+    {
         $output = $this->runAlertCommand('restore-policies');
         $this->assertStringContainsString('Restored alert policies', $output);
     }

video/quickstart.php

@@ -26,11 +26,11 @@
 $video = new VideoIntelligenceServiceClient();
 
 # Execute a request.
+$features = [Feature::LABEL_DETECTION];
 $options = [
     'inputUri' => 'gs://cloud-samples-data/video/cat.mp4',
-    'features' => [Feature::LABEL_DETECTION]
 ];
-$operation = $video->annotateVideo($options);
+$operation = $video->annotateVideo($features, $options);
 
 # Wait for the request to complete.
 $operation->pollUntilComplete();

video/src/analyze_explicit_content.php

@@ -43,9 +43,9 @@
 $video = new VideoIntelligenceServiceClient();
 
 # Execute a request.
-$operation = $video->annotateVideo([
+$features = [Feature::EXPLICIT_CONTENT_DETECTION];
+$operation = $video->annotateVideo($features, [
     'inputUri' => $uri,
-    'features' => [Feature::EXPLICIT_CONTENT_DETECTION]
 ]);
 
 # Wait for the request to complete.

video/src/analyze_labels_file.php

@@ -40,9 +40,9 @@
 $inputContent = file_get_contents($path);
 
 # Execute a request.
-$operation = $video->annotateVideo([
+$features = [Feature::LABEL_DETECTION];
+$operation = $video->annotateVideo($features, [
     'inputContent' => $inputContent,
-    'features' => [Feature::LABEL_DETECTION]
 ]);
 
 # Wait for the request to complete.

video/src/analyze_labels_gcs.php

@@ -37,9 +37,9 @@
 $video = new VideoIntelligenceServiceClient();
 
 # Execute a request.
-$operation = $video->annotateVideo([
+$features = [Feature::LABEL_DETECTION];
+$operation = $video->annotateVideo($features, [
     'inputUri' => $uri,
-    'features' => [Feature::LABEL_DETECTION]
 ]);
 
 # Wait for the request to complete.

video/src/analyze_object_tracking.php

@@ -37,9 +37,9 @@
 $video = new VideoIntelligenceServiceClient();
 
 # Execute a request.
-$operation = $video->annotateVideo([
+$features = [Feature::OBJECT_TRACKING];
+$operation = $video->annotateVideo($features, [
     'inputUri' => $uri,
-    'features' => [Feature::OBJECT_TRACKING]
 ]);
 
 # Wait for the request to complete.

video/src/analyze_object_tracking_file.php

@@ -40,9 +40,9 @@
 $inputContent = file_get_contents($path);
 
 # Execute a request.
-$operation = $video->annotateVideo([
+$features = [Feature::OBJECT_TRACKING];
+$operation = $video->annotateVideo($features, [
     'inputContent' => $inputContent,
-    'features' => [Feature::OBJECT_TRACKING]
 ]);
 
 # Wait for the request to complete.

video/src/analyze_shots.php

@@ -37,9 +37,9 @@
 $video = new VideoIntelligenceServiceClient();
 
 # Execute a request.
-$operation = $video->annotateVideo([
+$features = [Feature::SHOT_CHANGE_DETECTION];
+$operation = $video->annotateVideo($features, [
     'inputUri' => $uri,
-    'features' => [Feature::SHOT_CHANGE_DETECTION]
 ]);
 
 # Wait for the request to complete.

video/src/analyze_text_detection.php

@@ -37,9 +37,9 @@
 $video = new VideoIntelligenceServiceClient();
 
 # Execute a request.
-$operation = $video->annotateVideo([
+$features = [Feature::TEXT_DETECTION];
+$operation = $video->annotateVideo($features, [
     'inputUri' => $uri,
-    'features' => [Feature::TEXT_DETECTION]
 ]);
 
 # Wait for the request to complete.

video/src/analyze_text_detection_file.php

@@ -40,9 +40,9 @@
 $inputContent = file_get_contents($path);
 
 # Execute a request.
-$operation = $video->annotateVideo([
+$features = [Feature::TEXT_DETECTION];
+$operation = $video->annotateVideo($features, [
     'inputContent' => $inputContent,
-    'features' => [Feature::TEXT_DETECTION]
 ]);
 
 # Wait for the request to complete.

video/src/analyze_transcription.php

@@ -36,7 +36,6 @@
 // $options = [];
 
 # set configs
-$features = [Feature::SPEECH_TRANSCRIPTION];
 $speechTranscriptionConfig = (new SpeechTranscriptionConfig())
     ->setLanguageCode('en-US')
     ->setEnableAutomaticPunctuation(true);
@@ -47,10 +46,10 @@
 $client = new VideoIntelligenceServiceClient();
 
 # execute a request.
-$operation = $client->annotateVideo([
+$features = [Feature::SPEECH_TRANSCRIPTION];
+$operation = $client->annotateVideo($features, [
     'inputUri' => $uri,
-    'features' => $features,
-    'videoContext' => $videoContext
+    'videoContext' => $videoContext,
 ]);
 
 print('Processing video for speech transcription...' . PHP_EOL);