fix: migrate DLP samples to use regional syntax in parent field (GoogleCloudPlatform#1122)

sushicw · web-flow · commit 2776614b5984 · 2020-06-26T13:09:55.000-07:00
diff --git a/dlp/README.md b/dlp/README.md
@@ -45,6 +45,23 @@ This simple command-line application demonstrates how to invoke
 
 See the [DLP Documentation](https://cloud.google.com/dlp/docs/inspecting-text) for more information.
 
+## Troubleshooting
+
+### bcmath extension missing
+
+If you see an error like this:
+
+```
+PHP Fatal error:  Uncaught Error: Call to undefined function Google\Protobuf\Internal\bccomp() in /usr/local/google/home/crwilson/github/GoogleCloudPlatform/php-docs-samples/dlp/vendor/google/protobuf/src/Google/Protobuf/Internal/Message.php:986
+```
+
+You may need to install the bcmath PHP extension.
+e.g. (may depend on your php version)
+```
+$ sudo apt-get install php7.3-bcmath
+```
+
+
 ## Contributing changes
 
 * See [CONTRIBUTING.md](../CONTRIBUTING.md)
diff --git a/dlp/src/categorical_stats.php b/dlp/src/categorical_stats.php
@@ -94,7 +94,7 @@
     ->setActions([$action]);
 
 // Submit request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";;
 $job = $dlp->createDlpJob($parent, [
     'riskJob' => $riskJob
 ]);
diff --git a/dlp/src/create_inspect_template.php b/dlp/src/create_inspect_template.php
@@ -86,7 +86,7 @@
     ->setDescription($description);
 
 // Run request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $template = $dlp->createInspectTemplate($parent, [
     'inspectTemplate' => $inspectTemplate,
     'templateId' => $templateId
diff --git a/dlp/src/create_trigger.php b/dlp/src/create_trigger.php
@@ -129,7 +129,7 @@
     ->setDescription($description);
 
 // Run trigger creation request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $trigger = $dlp->createJobTrigger($parent, [
     'jobTrigger' => $jobTriggerObject,
     'triggerId' => $triggerId
diff --git a/dlp/src/deidentify_dates.php b/dlp/src/deidentify_dates.php
@@ -151,7 +151,7 @@
 $deidentifyConfig = (new DeidentifyConfig())
     ->setRecordTransformations($recordTransformations);
 
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 
 // Run request
 $response = $dlp->deidentifyContent($parent, [
diff --git a/dlp/src/deidentify_fpe.php b/dlp/src/deidentify_fpe.php
@@ -104,7 +104,7 @@
 $content = (new ContentItem())
     ->setValue($string);
 
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 
 // Run request
 $response = $dlp->deidentifyContent($parent, [
diff --git a/dlp/src/deidentify_mask.php b/dlp/src/deidentify_mask.php
@@ -82,7 +82,7 @@
 $item = (new ContentItem())
     ->setValue($string);
 
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 
 // Run request
 $response = $dlp->deidentifyContent($parent, [
diff --git a/dlp/src/inspect_bigquery.php b/dlp/src/inspect_bigquery.php
@@ -114,7 +114,7 @@
 $subscription = $topic->subscription($subscriptionId);
 
 // Submit request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $job = $dlp->createDlpJob($parent, [
     'inspectJob' => $inspectJob
 ]);
diff --git a/dlp/src/inspect_datastore.php b/dlp/src/inspect_datastore.php
@@ -118,7 +118,7 @@
 $subscription = $topic->subscription($subscriptionId);
 
 // Submit request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $job = $dlp->createDlpJob($parent, [
     'inspectJob' => $inspectJob
 ]);
diff --git a/dlp/src/inspect_gcs.php b/dlp/src/inspect_gcs.php
@@ -114,7 +114,7 @@
 $subscription = $topic->subscription($subscriptionId);
 
 // Submit request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $job = $dlp->createDlpJob($parent, [
     'inspectJob' => $inspectJob
 ]);
diff --git a/dlp/src/inspect_image_file.php b/dlp/src/inspect_image_file.php
@@ -51,7 +51,7 @@
     ->setData(file_get_contents($filepath));
 
 // Construct request
-$parent = $dlp->projectName($projectId);
+$parent = "projects/$projectId/locations/global";
 $item = (new ContentItem())
     ->setByteItem($fileBytes);
 $inspectConfig = (new InspectConfig())
diff --git a/dlp/src/inspect_string.php b/dlp/src/inspect_string.php
@@ -44,7 +44,7 @@
 $dlp = new DlpServiceClient();
 
 // Construct request
-$parent = $dlp->projectName($projectId);
+$parent = "projects/$projectId/locations/global";
 $item = (new ContentItem())
     ->setValue($textToInspect);
 $inspectConfig = (new InspectConfig())
diff --git a/dlp/src/inspect_text_file.php b/dlp/src/inspect_text_file.php
@@ -51,7 +51,7 @@
     ->setData(file_get_contents($filepath));
 
 // Construct request
-$parent = $dlp->projectName($projectId);
+$parent = "projects/$projectId/locations/global";
 $item = (new ContentItem())
     ->setByteItem($fileBytes);
 $inspectConfig = (new InspectConfig())
diff --git a/dlp/src/k_anonymity.php b/dlp/src/k_anonymity.php
@@ -101,7 +101,7 @@ function ($id) {
 $subscription = $topic->subscription($subscriptionId);
 
 // Submit request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $job = $dlp->createDlpJob($parent, [
     'riskJob' => $riskJob
 ]);
diff --git a/dlp/src/k_map.php b/dlp/src/k_map.php
@@ -122,7 +122,7 @@
 $subscription = $topic->subscription($subscriptionId);
 
 // Submit request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $job = $dlp->createDlpJob($parent, [
     'riskJob' => $riskJob
 ]);
diff --git a/dlp/src/l_diversity.php b/dlp/src/l_diversity.php
@@ -108,7 +108,7 @@ function ($id) {
 $subscription = $topic->subscription($subscriptionId);
 
 // Submit request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $job = $dlp->createDlpJob($parent, [
     'riskJob' => $riskJob
 ]);
diff --git a/dlp/src/list_inspect_templates.php b/dlp/src/list_inspect_templates.php
@@ -42,7 +42,7 @@
 // Instantiate a client.
 $dlp = new DlpServiceClient();
 
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 
 // Run request
 $response = $dlp->listInspectTemplates($parent);
diff --git a/dlp/src/list_jobs.php b/dlp/src/list_jobs.php
@@ -51,7 +51,7 @@
 // Run job-listing request
 // For more information and filter syntax,
 // @see https://cloud.google.com/dlp/docs/reference/rest/v2/projects.dlpJobs/list
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $response = $dlp->listDlpJobs($parent, [
   'filter' => $filter,
   'type' => $jobType
diff --git a/dlp/src/list_triggers.php b/dlp/src/list_triggers.php
@@ -42,7 +42,7 @@
 // Instantiate a client.
 $dlp = new DlpServiceClient();
 
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 
 // Run request
 $response = $dlp->listJobTriggers($parent);
diff --git a/dlp/src/numerical_stats.php b/dlp/src/numerical_stats.php
@@ -99,7 +99,7 @@
 $subscription = $topic->subscription($subscriptionId);
 
 // Submit request
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 $job = $dlp->createDlpJob($parent, [
     'riskJob' => $riskJob
 ]);
diff --git a/dlp/src/redact_image.php b/dlp/src/redact_image.php
@@ -89,7 +89,7 @@
     $imageRedactionConfigs[] = $config;
 }
 
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 
 // Run request
 $response = $dlp->redactImage($parent, [
diff --git a/dlp/src/reidentify_fpe.php b/dlp/src/reidentify_fpe.php
@@ -113,7 +113,7 @@
 $item = (new ContentItem())
     ->setValue($string);
 
-$parent = $dlp->projectName($callingProjectId);
+$parent = "projects/$callingProjectId/locations/global";
 
 // Run request
 $response = $dlp->reidentifyContent($parent, [
diff --git a/dlp/test/data/harmful.csv b/dlp/test/data/harmful.csv
@@ -0,0 +1,2 @@
+Name,Description
+John Doe,Name of a person
diff --git a/dlp/test/dlpTest.php b/dlp/test/dlpTest.php
@@ -242,7 +242,7 @@ public function testTriggers()
             $scanPeriod,
             $autoPopulateTimespan,
         ]);
-        $fullTriggerId = sprintf('projects/%s/jobTriggers/%s', self::$projectId, $triggerId);
+        $fullTriggerId = sprintf('projects/%s/locations/global/jobTriggers/%s', self::$projectId, $triggerId);
         $this->assertContains('Successfully created trigger ' . $fullTriggerId, $output);
 
         $output = $this->runSnippet('list_triggers', [self::$projectId]);
@@ -263,7 +263,7 @@ public function testInspectTemplates()
         $displayName = uniqid("My inspect template display name ");
         $description = uniqid("My inspect template description ");
         $templateId = uniqid('my-php-test-inspect-template-');
-        $fullTemplateId = sprintf('projects/%s/inspectTemplates/%s', self::$projectId, $templateId);
+        $fullTemplateId = sprintf('projects/%s/locations/global/inspectTemplates/%s', self::$projectId, $templateId);
 
         $output  = $this->runSnippet('create_inspect_template', [
             self::$projectId,

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@`
`89`	`89`	`$imageRedactionConfigs[] = $config;`
`90`	`90`	`}`
`91`	`91`
`92`		`-$parent = $dlp->projectName($callingProjectId);`
	`92`	`+$parent = "projects/$callingProjectId/locations/global";`
`93`	`93`
`94`	`94`	`// Run request`
`95`	`95`	`$response = $dlp->redactImage($parent, [`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Name,Description`
	`2`	`+John Doe,Name of a person`