Skip to content

Commit f59de31

Browse files
sushicwsushicw
authored
Include locations/global in parent field to fix samples (GoogleCloudPlatform#3042)
* Include locations/global in parent field to fix samples * use LocationName helper
1 parent b885be7 commit f59de31

28 files changed

+62
-80
lines changed

‎dlp/src/main/java/dlp/snippets/DeIdentifyWithDateShift.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import com.google.privacy.dlp.v2.DeidentifyContentResponse;
2828
import com.google.privacy.dlp.v2.FieldId;
2929
import com.google.privacy.dlp.v2.FieldTransformation;
30+
import com.google.privacy.dlp.v2.LocationName;
3031
import com.google.privacy.dlp.v2.PrimitiveTransformation;
31-
import com.google.privacy.dlp.v2.ProjectName;
3232
import com.google.privacy.dlp.v2.RecordTransformations;
3333
import com.google.privacy.dlp.v2.Table;
3434
import com.google.privacy.dlp.v2.Value;
@@ -98,7 +98,7 @@ public static void deIdentifyWithDateShift(
9898
// Combine configurations into a request for the service.
9999
DeidentifyContentRequest request =
100100
DeidentifyContentRequest.newBuilder()
101-
.setParent(ProjectName.of(projectId).toString())
101+
.setParent(LocationName.of(projectId, "global").toString())
102102
.setItem(item)
103103
.setDeidentifyConfig(deidentifyConfig)
104104
.build();

‎dlp/src/main/java/dlp/snippets/DeIdentifyWithFpe.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation;
3333
import com.google.privacy.dlp.v2.InspectConfig;
3434
import com.google.privacy.dlp.v2.KmsWrappedCryptoKey;
35+
import com.google.privacy.dlp.v2.LocationName;
3536
import com.google.privacy.dlp.v2.PrimitiveTransformation;
36-
import com.google.privacy.dlp.v2.ProjectName;
3737
import com.google.protobuf.ByteString;
3838
import java.io.IOException;
3939
import java.util.Arrays;
@@ -104,7 +104,7 @@ public static void deIdentifyWithFpe(
104104
// Combine configurations into a request for the service.
105105
DeidentifyContentRequest request =
106106
DeidentifyContentRequest.newBuilder()
107-
.setParent(ProjectName.of(projectId).toString())
107+
.setParent(LocationName.of(projectId, "global").toString())
108108
.setItem(contentItem)
109109
.setInspectConfig(inspectConfig)
110110
.setDeidentifyConfig(deidentifyConfig)

‎dlp/src/main/java/dlp/snippets/DeIdentifyWithMasking.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import com.google.privacy.dlp.v2.InfoTypeTransformations;
2929
import com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation;
3030
import com.google.privacy.dlp.v2.InspectConfig;
31+
import com.google.privacy.dlp.v2.LocationName;
3132
import com.google.privacy.dlp.v2.PrimitiveTransformation;
32-
import com.google.privacy.dlp.v2.ProjectName;
3333
import com.google.privacy.dlp.v2.ReplaceWithInfoTypeConfig;
3434
import java.io.IOException;
3535
import java.util.Arrays;
@@ -82,7 +82,7 @@ public static void deIdentifyWithMasking(String projectId, String textToDeIdenti
8282
// Combine configurations into a request for the service.
8383
DeidentifyContentRequest request =
8484
DeidentifyContentRequest.newBuilder()
85-
.setParent(ProjectName.of(projectId).toString())
85+
.setParent(LocationName.of(projectId, "global").toString())
8686
.setItem(contentItem)
8787
.setInspectConfig(inspectConfig)
8888
.setDeidentifyConfig(deidentifyConfig)

‎dlp/src/main/java/dlp/snippets/InspectBigQueryTable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.google.privacy.dlp.v2.InspectConfig;
3535
import com.google.privacy.dlp.v2.InspectDataSourceDetails;
3636
import com.google.privacy.dlp.v2.InspectJobConfig;
37-
import com.google.privacy.dlp.v2.ProjectName;
37+
import com.google.privacy.dlp.v2.LocationName;
3838
import com.google.privacy.dlp.v2.StorageConfig;
3939
import com.google.pubsub.v1.ProjectSubscriptionName;
4040
import com.google.pubsub.v1.PubsubMessage;
@@ -113,7 +113,7 @@ public static void inspectBigQueryTable(
113113
// Create the request for the job configured above.
114114
CreateDlpJobRequest createDlpJobRequest =
115115
CreateDlpJobRequest.newBuilder()
116-
.setParent(ProjectName.of(projectId).toString())
116+
.setParent(LocationName.of(projectId, "global").toString())
117117
.setInspectJob(inspectJobConfig)
118118
.build();
119119

‎dlp/src/main/java/dlp/snippets/InspectDatastoreEntity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import com.google.privacy.dlp.v2.InspectDataSourceDetails;
3535
import com.google.privacy.dlp.v2.InspectJobConfig;
3636
import com.google.privacy.dlp.v2.KindExpression;
37+
import com.google.privacy.dlp.v2.LocationName;
3738
import com.google.privacy.dlp.v2.PartitionId;
38-
import com.google.privacy.dlp.v2.ProjectName;
3939
import com.google.privacy.dlp.v2.StorageConfig;
4040
import com.google.pubsub.v1.ProjectSubscriptionName;
4141
import com.google.pubsub.v1.PubsubMessage;
@@ -114,7 +114,7 @@ public static void insepctDatastoreEntity(
114114
// Create the request for the job configured above.
115115
CreateDlpJobRequest createDlpJobRequest =
116116
CreateDlpJobRequest.newBuilder()
117-
.setParent(ProjectName.of(projectId).toString())
117+
.setParent(LocationName.of(projectId, "global").toString())
118118
.setInspectJob(inspectJobConfig)
119119
.build();
120120

‎dlp/src/main/java/dlp/snippets/InspectGcsFile.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
package dlp.snippets;
1818

1919
// [START dlp_inspect_gcs]
20+
2021
import com.google.api.core.SettableApiFuture;
2122
import com.google.cloud.dlp.v2.DlpServiceClient;
2223
import com.google.cloud.pubsub.v1.AckReplyConsumer;
2324
import com.google.cloud.pubsub.v1.MessageReceiver;
2425
import com.google.cloud.pubsub.v1.Subscriber;
25-
import com.google.common.util.concurrent.SettableFuture;
2626
import com.google.privacy.dlp.v2.Action;
2727
import com.google.privacy.dlp.v2.CloudStorageOptions;
2828
import com.google.privacy.dlp.v2.CloudStorageOptions.FileSet;
@@ -34,7 +34,7 @@
3434
import com.google.privacy.dlp.v2.InspectConfig;
3535
import com.google.privacy.dlp.v2.InspectDataSourceDetails;
3636
import com.google.privacy.dlp.v2.InspectJobConfig;
37-
import com.google.privacy.dlp.v2.ProjectName;
37+
import com.google.privacy.dlp.v2.LocationName;
3838
import com.google.privacy.dlp.v2.StorageConfig;
3939
import com.google.pubsub.v1.ProjectSubscriptionName;
4040
import com.google.pubsub.v1.PubsubMessage;
@@ -100,7 +100,7 @@ public static void inspectGcsFile(
100100
// Create the request for the job configured above.
101101
CreateDlpJobRequest createDlpJobRequest =
102102
CreateDlpJobRequest.newBuilder()
103-
.setParent(ProjectName.of(projectId).toString())
103+
.setParent(LocationName.of(projectId, "global").toString())
104104
.setInspectJob(inspectJobConfig)
105105
.build();
106106

‎dlp/src/main/java/dlp/snippets/InspectImageFile.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package dlp.snippets;
1818

1919
// [START dlp_inspect_image_file]
20+
2021
import com.google.cloud.dlp.v2.DlpServiceClient;
2122
import com.google.privacy.dlp.v2.ByteContentItem;
2223
import com.google.privacy.dlp.v2.ByteContentItem.BytesType;
@@ -26,7 +27,7 @@
2627
import com.google.privacy.dlp.v2.InspectConfig;
2728
import com.google.privacy.dlp.v2.InspectContentRequest;
2829
import com.google.privacy.dlp.v2.InspectContentResponse;
29-
import com.google.privacy.dlp.v2.ProjectName;
30+
import com.google.privacy.dlp.v2.LocationName;
3031
import com.google.protobuf.ByteString;
3132
import java.io.FileInputStream;
3233
import java.util.ArrayList;
@@ -47,9 +48,6 @@ public static void inspectImageFile(String projectId, String filePath) {
4748
// once, and can be reused for multiple requests. After completing all of your requests, call
4849
// the "close" method on the client to safely clean up any remaining background resources.
4950
try (DlpServiceClient dlp = DlpServiceClient.create()) {
50-
// Specify the project used for request.
51-
ProjectName project = ProjectName.of(projectId);
52-
5351
// Specify the type and content to be inspected.
5452
ByteString fileBytes = ByteString.readFrom(new FileInputStream(filePath));
5553
ByteContentItem byteItem =
@@ -70,7 +68,7 @@ public static void inspectImageFile(String projectId, String filePath) {
7068
// Construct the Inspect request to be sent by the client.
7169
InspectContentRequest request =
7270
InspectContentRequest.newBuilder()
73-
.setParent(project.toString())
71+
.setParent(LocationName.of(projectId, "global").toString())
7472
.setItem(item)
7573
.setInspectConfig(config)
7674
.build();

‎dlp/src/main/java/dlp/snippets/InspectPhoneNumber.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.google.privacy.dlp.v2.InspectContentRequest;
2727
import com.google.privacy.dlp.v2.InspectContentResponse;
2828
import com.google.privacy.dlp.v2.Likelihood;
29-
import com.google.privacy.dlp.v2.ProjectName;
29+
import com.google.privacy.dlp.v2.LocationName;
3030

3131
public class InspectPhoneNumber {
3232

@@ -43,9 +43,6 @@ public static void inspectString(String projectId, String textToInspect) {
4343
// once, and can be reused for multiple requests. After completing all of your requests, call
4444
// the "close" method on the client to safely clean up any remaining background resources.
4545
try (DlpServiceClient dlp = DlpServiceClient.create()) {
46-
// Specify the project used for request.
47-
ProjectName project = ProjectName.of(projectId);
48-
4946
// Specify the type and content to be inspected.
5047
ContentItem item = ContentItem.newBuilder()
5148
.setValue(textToInspect)
@@ -66,7 +63,7 @@ public static void inspectString(String projectId, String textToInspect) {
6663
// Construct the Inspect request to be sent by the client.
6764
InspectContentRequest request =
6865
InspectContentRequest.newBuilder()
69-
.setParent(project.toString())
66+
.setParent(LocationName.of(projectId, "global").toString())
7067
.setItem(item)
7168
.setInspectConfig(config)
7269
.build();

‎dlp/src/main/java/dlp/snippets/InspectString.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package dlp.snippets;
1818

1919
// [START dlp_inspect_string]
20+
2021
import com.google.cloud.dlp.v2.DlpServiceClient;
2122
import com.google.privacy.dlp.v2.ByteContentItem;
2223
import com.google.privacy.dlp.v2.ByteContentItem.BytesType;
@@ -26,7 +27,7 @@
2627
import com.google.privacy.dlp.v2.InspectConfig;
2728
import com.google.privacy.dlp.v2.InspectContentRequest;
2829
import com.google.privacy.dlp.v2.InspectContentResponse;
29-
import com.google.privacy.dlp.v2.ProjectName;
30+
import com.google.privacy.dlp.v2.LocationName;
3031
import com.google.protobuf.ByteString;
3132
import java.util.ArrayList;
3233
import java.util.List;
@@ -46,9 +47,6 @@ public static void inspectString(String projectId, String textToInspect) {
4647
// once, and can be reused for multiple requests. After completing all of your requests, call
4748
// the "close" method on the client to safely clean up any remaining background resources.
4849
try (DlpServiceClient dlp = DlpServiceClient.create()) {
49-
// Specify the project used for request.
50-
ProjectName project = ProjectName.of(projectId);
51-
5250
// Specify the type and content to be inspected.
5351
ByteContentItem byteItem =
5452
ByteContentItem.newBuilder()
@@ -71,7 +69,7 @@ public static void inspectString(String projectId, String textToInspect) {
7169
// Construct the Inspect request to be sent by the client.
7270
InspectContentRequest request =
7371
InspectContentRequest.newBuilder()
74-
.setParent(project.toString())
72+
.setParent(LocationName.of(projectId, "global").toString())
7573
.setItem(item)
7674
.setInspectConfig(config)
7775
.build();

‎dlp/src/main/java/dlp/snippets/InspectStringWithExclusionDict.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import com.google.privacy.dlp.v2.InspectContentResponse;
3333
import com.google.privacy.dlp.v2.InspectionRule;
3434
import com.google.privacy.dlp.v2.InspectionRuleSet;
35+
import com.google.privacy.dlp.v2.LocationName;
3536
import com.google.privacy.dlp.v2.MatchingType;
36-
import com.google.privacy.dlp.v2.ProjectName;
3737
import com.google.protobuf.ByteString;
3838
import java.util.ArrayList;
3939
import java.util.Arrays;
@@ -56,9 +56,6 @@ public static void inspectStringWithExclusionDict(String projectId, String textT
5656
// once, and can be reused for multiple requests. After completing all of your requests, call
5757
// the "close" method on the client to safely clean up any remaining background resources.
5858
try (DlpServiceClient dlp = DlpServiceClient.create()) {
59-
// Specify the project used for request.
60-
ProjectName project = ProjectName.of(projectId);
61-
6259
// Specify the type and content to be inspected.
6360
ByteContentItem byteItem =
6461
ByteContentItem.newBuilder()
@@ -98,7 +95,7 @@ public static void inspectStringWithExclusionDict(String projectId, String textT
9895
// Construct the Inspect request to be sent by the client.
9996
InspectContentRequest request =
10097
InspectContentRequest.newBuilder()
101-
.setParent(project.toString())
98+
.setParent(LocationName.of(projectId, "global").toString())
10299
.setItem(item)
103100
.setInspectConfig(config)
104101
.build();

0 commit comments

Comments
 (0)