Skip to content

Commit a1c9b74

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(bazel): update version of Protobuf to v3.20.1 (#1079)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 444328399 Source-Link: googleapis/googleapis@c7ca416 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d61705453a62b3ecda78aa30c192840ebc5a8a90 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDYxNzA1NDUzYTYyYjNlY2RhNzhhYTMwYzE5Mjg0MGViYzVhOGE5MCJ9 feat: AuditConfig for IAM v1 PiperOrigin-RevId: 439356405 Source-Link: googleapis/googleapis@afa2ba1 Source-Link: https://github.com/googleapis/googleapis-gen/commit/3e40c17e1510c95fab58fc2143ccb61cceca5989 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiM2U0MGMxN2UxNTEwYzk1ZmFiNThmYzIxNDNjY2I2MWNjZWNhNTk4OSJ9
1 parent bb6f105 commit a1c9b74

67 files changed

Lines changed: 253 additions & 63 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SchemaServiceClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ public final ValidateMessageResponse validateMessage(ValidateMessageRequest requ
777777
* SetIamPolicyRequest.newBuilder()
778778
* .setResource(ProjectName.of("[PROJECT]").toString())
779779
* .setPolicy(Policy.newBuilder().build())
780+
* .setUpdateMask(FieldMask.newBuilder().build())
780781
* .build();
781782
* Policy response = schemaServiceClient.setIamPolicy(request);
782783
* }
@@ -803,6 +804,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
803804
* SetIamPolicyRequest.newBuilder()
804805
* .setResource(ProjectName.of("[PROJECT]").toString())
805806
* .setPolicy(Policy.newBuilder().build())
807+
* .setUpdateMask(FieldMask.newBuilder().build())
806808
* .build();
807809
* ApiFuture<Policy> future = schemaServiceClient.setIamPolicyCallable().futureCall(request);
808810
* // Do something.

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2984,6 +2984,7 @@ public final UnaryCallable<SeekRequest, SeekResponse> seekCallable() {
29842984
* SetIamPolicyRequest.newBuilder()
29852985
* .setResource(ProjectName.of("[PROJECT]").toString())
29862986
* .setPolicy(Policy.newBuilder().build())
2987+
* .setUpdateMask(FieldMask.newBuilder().build())
29872988
* .build();
29882989
* Policy response = subscriptionAdminClient.setIamPolicy(request);
29892990
* }
@@ -3041,6 +3042,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
30413042
* SetIamPolicyRequest.newBuilder()
30423043
* .setResource(ProjectName.of("[PROJECT]").toString())
30433044
* .setPolicy(Policy.newBuilder().build())
3045+
* .setUpdateMask(FieldMask.newBuilder().build())
30443046
* .build();
30453047
* ApiFuture<Policy> future = subscriptionAdminClient.setIamPolicyCallable().futureCall(request);
30463048
* // Do something.

‎google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,7 @@ public final DetachSubscriptionResponse detachSubscription(DetachSubscriptionReq
12331233
* SetIamPolicyRequest.newBuilder()
12341234
* .setResource(ProjectName.of("[PROJECT]").toString())
12351235
* .setPolicy(Policy.newBuilder().build())
1236+
* .setUpdateMask(FieldMask.newBuilder().build())
12361237
* .build();
12371238
* Policy response = topicAdminClient.setIamPolicy(request);
12381239
* }
@@ -1290,6 +1291,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
12901291
* SetIamPolicyRequest.newBuilder()
12911292
* .setResource(ProjectName.of("[PROJECT]").toString())
12921293
* .setPolicy(Policy.newBuilder().build())
1294+
* .setUpdateMask(FieldMask.newBuilder().build())
12931295
* .build();
12941296
* ApiFuture<Policy> future = topicAdminClient.setIamPolicyCallable().futureCall(request);
12951297
* // Do something.

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SchemaServiceClientTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2727
import com.google.api.gax.rpc.InvalidArgumentException;
2828
import com.google.common.collect.Lists;
29+
import com.google.iam.v1.AuditConfig;
2930
import com.google.iam.v1.Binding;
3031
import com.google.iam.v1.GetIamPolicyRequest;
3132
import com.google.iam.v1.GetPolicyOptions;
@@ -36,6 +37,7 @@
3637
import com.google.protobuf.AbstractMessage;
3738
import com.google.protobuf.ByteString;
3839
import com.google.protobuf.Empty;
40+
import com.google.protobuf.FieldMask;
3941
import com.google.pubsub.v1.CreateSchemaRequest;
4042
import com.google.pubsub.v1.DeleteSchemaRequest;
4143
import com.google.pubsub.v1.Encoding;
@@ -559,6 +561,7 @@ public void setIamPolicyTest() throws Exception {
559561
Policy.newBuilder()
560562
.setVersion(351608024)
561563
.addAllBindings(new ArrayList<Binding>())
564+
.addAllAuditConfigs(new ArrayList<AuditConfig>())
562565
.setEtag(ByteString.EMPTY)
563566
.build();
564567
mockIAMPolicy.addResponse(expectedResponse);
@@ -567,6 +570,7 @@ public void setIamPolicyTest() throws Exception {
567570
SetIamPolicyRequest.newBuilder()
568571
.setResource(ProjectName.of("[PROJECT]").toString())
569572
.setPolicy(Policy.newBuilder().build())
573+
.setUpdateMask(FieldMask.newBuilder().build())
570574
.build();
571575

572576
Policy actualResponse = client.setIamPolicy(request);
@@ -578,6 +582,7 @@ public void setIamPolicyTest() throws Exception {
578582

579583
Assert.assertEquals(request.getResource(), actualRequest.getResource());
580584
Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy());
585+
Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask());
581586
Assert.assertTrue(
582587
channelProvider.isHeaderSent(
583588
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -594,6 +599,7 @@ public void setIamPolicyExceptionTest() throws Exception {
594599
SetIamPolicyRequest.newBuilder()
595600
.setResource(ProjectName.of("[PROJECT]").toString())
596601
.setPolicy(Policy.newBuilder().build())
602+
.setUpdateMask(FieldMask.newBuilder().build())
597603
.build();
598604
client.setIamPolicy(request);
599605
Assert.fail("No exception raised");
@@ -608,6 +614,7 @@ public void getIamPolicyTest() throws Exception {
608614
Policy.newBuilder()
609615
.setVersion(351608024)
610616
.addAllBindings(new ArrayList<Binding>())
617+
.addAllAuditConfigs(new ArrayList<AuditConfig>())
611618
.setEtag(ByteString.EMPTY)
612619
.build();
613620
mockIAMPolicy.addResponse(expectedResponse);

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.google.api.gax.rpc.InvalidArgumentException;
3232
import com.google.api.gax.rpc.StatusCode;
3333
import com.google.common.collect.Lists;
34+
import com.google.iam.v1.AuditConfig;
3435
import com.google.iam.v1.Binding;
3536
import com.google.iam.v1.GetIamPolicyRequest;
3637
import com.google.iam.v1.GetPolicyOptions;
@@ -1679,6 +1680,7 @@ public void setIamPolicyTest() throws Exception {
16791680
Policy.newBuilder()
16801681
.setVersion(351608024)
16811682
.addAllBindings(new ArrayList<Binding>())
1683+
.addAllAuditConfigs(new ArrayList<AuditConfig>())
16821684
.setEtag(ByteString.EMPTY)
16831685
.build();
16841686
mockIAMPolicy.addResponse(expectedResponse);
@@ -1687,6 +1689,7 @@ public void setIamPolicyTest() throws Exception {
16871689
SetIamPolicyRequest.newBuilder()
16881690
.setResource(ProjectName.of("[PROJECT]").toString())
16891691
.setPolicy(Policy.newBuilder().build())
1692+
.setUpdateMask(FieldMask.newBuilder().build())
16901693
.build();
16911694

16921695
Policy actualResponse = client.setIamPolicy(request);
@@ -1698,6 +1701,7 @@ public void setIamPolicyTest() throws Exception {
16981701

16991702
Assert.assertEquals(request.getResource(), actualRequest.getResource());
17001703
Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy());
1704+
Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask());
17011705
Assert.assertTrue(
17021706
channelProvider.isHeaderSent(
17031707
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1714,6 +1718,7 @@ public void setIamPolicyExceptionTest() throws Exception {
17141718
SetIamPolicyRequest.newBuilder()
17151719
.setResource(ProjectName.of("[PROJECT]").toString())
17161720
.setPolicy(Policy.newBuilder().build())
1721+
.setUpdateMask(FieldMask.newBuilder().build())
17171722
.build();
17181723
client.setIamPolicy(request);
17191724
Assert.fail("No exception raised");
@@ -1728,6 +1733,7 @@ public void getIamPolicyTest() throws Exception {
17281733
Policy.newBuilder()
17291734
.setVersion(351608024)
17301735
.addAllBindings(new ArrayList<Binding>())
1736+
.addAllAuditConfigs(new ArrayList<AuditConfig>())
17311737
.setEtag(ByteString.EMPTY)
17321738
.build();
17331739
mockIAMPolicy.addResponse(expectedResponse);

‎google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2929
import com.google.api.gax.rpc.InvalidArgumentException;
3030
import com.google.common.collect.Lists;
31+
import com.google.iam.v1.AuditConfig;
3132
import com.google.iam.v1.Binding;
3233
import com.google.iam.v1.GetIamPolicyRequest;
3334
import com.google.iam.v1.GetPolicyOptions;
@@ -804,6 +805,7 @@ public void setIamPolicyTest() throws Exception {
804805
Policy.newBuilder()
805806
.setVersion(351608024)
806807
.addAllBindings(new ArrayList<Binding>())
808+
.addAllAuditConfigs(new ArrayList<AuditConfig>())
807809
.setEtag(ByteString.EMPTY)
808810
.build();
809811
mockIAMPolicy.addResponse(expectedResponse);
@@ -812,6 +814,7 @@ public void setIamPolicyTest() throws Exception {
812814
SetIamPolicyRequest.newBuilder()
813815
.setResource(ProjectName.of("[PROJECT]").toString())
814816
.setPolicy(Policy.newBuilder().build())
817+
.setUpdateMask(FieldMask.newBuilder().build())
815818
.build();
816819

817820
Policy actualResponse = client.setIamPolicy(request);
@@ -823,6 +826,7 @@ public void setIamPolicyTest() throws Exception {
823826

824827
Assert.assertEquals(request.getResource(), actualRequest.getResource());
825828
Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy());
829+
Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask());
826830
Assert.assertTrue(
827831
channelProvider.isHeaderSent(
828832
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -839,6 +843,7 @@ public void setIamPolicyExceptionTest() throws Exception {
839843
SetIamPolicyRequest.newBuilder()
840844
.setResource(ProjectName.of("[PROJECT]").toString())
841845
.setPolicy(Policy.newBuilder().build())
846+
.setUpdateMask(FieldMask.newBuilder().build())
842847
.build();
843848
client.setIamPolicy(request);
844849
Assert.fail("No exception raised");
@@ -853,6 +858,7 @@ public void getIamPolicyTest() throws Exception {
853858
Policy.newBuilder()
854859
.setVersion(351608024)
855860
.addAllBindings(new ArrayList<Binding>())
861+
.addAllAuditConfigs(new ArrayList<AuditConfig>())
856862
.setEtag(ByteString.EMPTY)
857863
.build();
858864
mockIAMPolicy.addResponse(expectedResponse);

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ private AcknowledgeRequest(
100100
}
101101
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
102102
throw e.setUnfinishedMessage(this);
103+
} catch (com.google.protobuf.UninitializedMessageException e) {
104+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
103105
} catch (java.io.IOException e) {
104106
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
105107
} finally {

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSchemaRequest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ private CreateSchemaRequest(
110110
}
111111
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
112112
throw e.setUnfinishedMessage(this);
113+
} catch (com.google.protobuf.UninitializedMessageException e) {
114+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
113115
} catch (java.io.IOException e) {
114116
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
115117
} finally {

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ private CreateSnapshotRequest(
110110
}
111111
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
112112
throw e.setUnfinishedMessage(this);
113+
} catch (com.google.protobuf.UninitializedMessageException e) {
114+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
113115
} catch (java.io.IOException e) {
114116
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
115117
} finally {
@@ -314,7 +316,7 @@ public int getLabelsCount() {
314316
@java.lang.Override
315317
public boolean containsLabels(java.lang.String key) {
316318
if (key == null) {
317-
throw new java.lang.NullPointerException();
319+
throw new NullPointerException("map key");
318320
}
319321
return internalGetLabels().getMap().containsKey(key);
320322
}
@@ -351,7 +353,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
351353
@java.lang.Override
352354
public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
353355
if (key == null) {
354-
throw new java.lang.NullPointerException();
356+
throw new NullPointerException("map key");
355357
}
356358
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
357359
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -369,7 +371,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
369371
@java.lang.Override
370372
public java.lang.String getLabelsOrThrow(java.lang.String key) {
371373
if (key == null) {
372-
throw new java.lang.NullPointerException();
374+
throw new NullPointerException("map key");
373375
}
374376
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
375377
if (!map.containsKey(key)) {
@@ -1089,7 +1091,7 @@ public int getLabelsCount() {
10891091
@java.lang.Override
10901092
public boolean containsLabels(java.lang.String key) {
10911093
if (key == null) {
1092-
throw new java.lang.NullPointerException();
1094+
throw new NullPointerException("map key");
10931095
}
10941096
return internalGetLabels().getMap().containsKey(key);
10951097
}
@@ -1127,7 +1129,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
11271129
public java.lang.String getLabelsOrDefault(
11281130
java.lang.String key, java.lang.String defaultValue) {
11291131
if (key == null) {
1130-
throw new java.lang.NullPointerException();
1132+
throw new NullPointerException("map key");
11311133
}
11321134
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
11331135
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -1145,7 +1147,7 @@ public java.lang.String getLabelsOrDefault(
11451147
@java.lang.Override
11461148
public java.lang.String getLabelsOrThrow(java.lang.String key) {
11471149
if (key == null) {
1148-
throw new java.lang.NullPointerException();
1150+
throw new NullPointerException("map key");
11491151
}
11501152
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
11511153
if (!map.containsKey(key)) {
@@ -1170,7 +1172,7 @@ public Builder clearLabels() {
11701172
*/
11711173
public Builder removeLabels(java.lang.String key) {
11721174
if (key == null) {
1173-
throw new java.lang.NullPointerException();
1175+
throw new NullPointerException("map key");
11741176
}
11751177
internalGetMutableLabels().getMutableMap().remove(key);
11761178
return this;
@@ -1192,11 +1194,12 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
11921194
*/
11931195
public Builder putLabels(java.lang.String key, java.lang.String value) {
11941196
if (key == null) {
1195-
throw new java.lang.NullPointerException();
1197+
throw new NullPointerException("map key");
11961198
}
11971199
if (value == null) {
1198-
throw new java.lang.NullPointerException();
1200+
throw new NullPointerException("map value");
11991201
}
1202+
12001203
internalGetMutableLabels().getMutableMap().put(key, value);
12011204
return this;
12021205
}

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequestOrBuilder.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,12 @@ public interface CreateSnapshotRequestOrBuilder
153153
*
154154
* <code>map&lt;string, string&gt; labels = 3;</code>
155155
*/
156-
java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
156+
157+
/* nullable */
158+
java.lang.String getLabelsOrDefault(
159+
java.lang.String key,
160+
/* nullable */
161+
java.lang.String defaultValue);
157162
/**
158163
*
159164
*

0 commit comments

Comments
 (0)