Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 6585360

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(bazel): update version of Protobuf to v3.20.1 (#399)
- [ ] 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 db020c1 commit 6585360

File tree

106 files changed

+432
-99
lines changed

Some content is hidden

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

106 files changed

+432
-99
lines changed

β€Žgoogle-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4420,6 +4420,7 @@ public final UnaryCallable<GetLocationRequest, Location> getLocationCallable() {
44204420
* SetIamPolicyRequest.newBuilder()
44214421
* .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString())
44224422
* .setPolicy(Policy.newBuilder().build())
4423+
* .setUpdateMask(FieldMask.newBuilder().build())
44234424
* .build();
44244425
* Policy response = certificateAuthorityServiceClient.setIamPolicy(request);
44254426
* }
@@ -4447,6 +4448,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
44474448
* SetIamPolicyRequest.newBuilder()
44484449
* .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString())
44494450
* .setPolicy(Policy.newBuilder().build())
4451+
* .setUpdateMask(FieldMask.newBuilder().build())
44504452
* .build();
44514453
* ApiFuture<Policy> future =
44524454
* certificateAuthorityServiceClient.setIamPolicyCallable().futureCall(request);

β€Žgoogle-cloud-security-private-ca/src/test/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceClientTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.google.cloud.location.Location;
3838
import com.google.cloud.location.MockLocations;
3939
import com.google.common.collect.Lists;
40+
import com.google.iam.v1.AuditConfig;
4041
import com.google.iam.v1.Binding;
4142
import com.google.iam.v1.GetIamPolicyRequest;
4243
import com.google.iam.v1.GetPolicyOptions;
@@ -3121,6 +3122,7 @@ public void setIamPolicyTest() throws Exception {
31213122
Policy.newBuilder()
31223123
.setVersion(351608024)
31233124
.addAllBindings(new ArrayList<Binding>())
3125+
.addAllAuditConfigs(new ArrayList<AuditConfig>())
31243126
.setEtag(ByteString.EMPTY)
31253127
.build();
31263128
mockIAMPolicy.addResponse(expectedResponse);
@@ -3129,6 +3131,7 @@ public void setIamPolicyTest() throws Exception {
31293131
SetIamPolicyRequest.newBuilder()
31303132
.setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString())
31313133
.setPolicy(Policy.newBuilder().build())
3134+
.setUpdateMask(FieldMask.newBuilder().build())
31323135
.build();
31333136

31343137
Policy actualResponse = client.setIamPolicy(request);
@@ -3140,6 +3143,7 @@ public void setIamPolicyTest() throws Exception {
31403143

31413144
Assert.assertEquals(request.getResource(), actualRequest.getResource());
31423145
Assert.assertEquals(request.getPolicy(), actualRequest.getPolicy());
3146+
Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask());
31433147
Assert.assertTrue(
31443148
channelProvider.isHeaderSent(
31453149
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -3156,6 +3160,7 @@ public void setIamPolicyExceptionTest() throws Exception {
31563160
SetIamPolicyRequest.newBuilder()
31573161
.setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString())
31583162
.setPolicy(Policy.newBuilder().build())
3163+
.setUpdateMask(FieldMask.newBuilder().build())
31593164
.build();
31603165
client.setIamPolicy(request);
31613166
Assert.fail("No exception raised");
@@ -3170,6 +3175,7 @@ public void getIamPolicyTest() throws Exception {
31703175
Policy.newBuilder()
31713176
.setVersion(351608024)
31723177
.addAllBindings(new ArrayList<Binding>())
3178+
.addAllAuditConfigs(new ArrayList<AuditConfig>())
31733179
.setEtag(ByteString.EMPTY)
31743180
.build();
31753181
mockIAMPolicy.addResponse(expectedResponse);

β€Žproto-google-cloud-security-private-ca-v1/src/main/java/com/google/cloud/security/privateca/v1/ActivateCertificateAuthorityRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ private ActivateCertificateAuthorityRequest(
124124
}
125125
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
126126
throw e.setUnfinishedMessage(this);
127+
} catch (com.google.protobuf.UninitializedMessageException e) {
128+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
127129
} catch (java.io.IOException e) {
128130
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
129131
} finally {

β€Žproto-google-cloud-security-private-ca-v1/src/main/java/com/google/cloud/security/privateca/v1/CaPool.java

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ private CaPool(
150150
}
151151
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
152152
throw e.setUnfinishedMessage(this);
153+
} catch (com.google.protobuf.UninitializedMessageException e) {
154+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
153155
} catch (java.io.IOException e) {
154156
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
155157
} finally {
@@ -457,6 +459,8 @@ private PublishingOptions(
457459
}
458460
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
459461
throw e.setUnfinishedMessage(this);
462+
} catch (com.google.protobuf.UninitializedMessageException e) {
463+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
460464
} catch (java.io.IOException e) {
461465
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
462466
} finally {
@@ -1589,6 +1593,8 @@ private IssuancePolicy(
15891593
}
15901594
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
15911595
throw e.setUnfinishedMessage(this);
1596+
} catch (com.google.protobuf.UninitializedMessageException e) {
1597+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
15921598
} catch (java.io.IOException e) {
15931599
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
15941600
} finally {
@@ -1829,6 +1835,8 @@ private AllowedKeyType(
18291835
}
18301836
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
18311837
throw e.setUnfinishedMessage(this);
1838+
} catch (com.google.protobuf.UninitializedMessageException e) {
1839+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
18321840
} catch (java.io.IOException e) {
18331841
throw new com.google.protobuf.InvalidProtocolBufferException(e)
18341842
.setUnfinishedMessage(this);
@@ -1962,6 +1970,8 @@ private RsaKeyType(
19621970
}
19631971
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
19641972
throw e.setUnfinishedMessage(this);
1973+
} catch (com.google.protobuf.UninitializedMessageException e) {
1974+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
19651975
} catch (java.io.IOException e) {
19661976
throw new com.google.protobuf.InvalidProtocolBufferException(e)
19671977
.setUnfinishedMessage(this);
@@ -2709,6 +2719,8 @@ private EcKeyType(
27092719
}
27102720
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
27112721
throw e.setUnfinishedMessage(this);
2722+
} catch (com.google.protobuf.UninitializedMessageException e) {
2723+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
27122724
} catch (java.io.IOException e) {
27132725
throw new com.google.protobuf.InvalidProtocolBufferException(e)
27142726
.setUnfinishedMessage(this);
@@ -4298,8 +4310,9 @@ public Builder mergeRsa(
42984310
} else {
42994311
if (keyTypeCase_ == 1) {
43004312
rsaBuilder_.mergeFrom(value);
4313+
} else {
4314+
rsaBuilder_.setMessage(value);
43014315
}
4302-
rsaBuilder_.setMessage(value);
43034316
}
43044317
keyTypeCase_ = 1;
43054318
return this;
@@ -4561,8 +4574,9 @@ public Builder mergeEllipticCurve(
45614574
} else {
45624575
if (keyTypeCase_ == 2) {
45634576
ellipticCurveBuilder_.mergeFrom(value);
4577+
} else {
4578+
ellipticCurveBuilder_.setMessage(value);
45644579
}
4565-
ellipticCurveBuilder_.setMessage(value);
45664580
}
45674581
keyTypeCase_ = 2;
45684582
return this;
@@ -4847,6 +4861,8 @@ private IssuanceModes(
48474861
}
48484862
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
48494863
throw e.setUnfinishedMessage(this);
4864+
} catch (com.google.protobuf.UninitializedMessageException e) {
4865+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
48504866
} catch (java.io.IOException e) {
48514867
throw new com.google.protobuf.InvalidProtocolBufferException(e)
48524868
.setUnfinishedMessage(this);
@@ -8422,7 +8438,7 @@ public int getLabelsCount() {
84228438
@java.lang.Override
84238439
public boolean containsLabels(java.lang.String key) {
84248440
if (key == null) {
8425-
throw new java.lang.NullPointerException();
8441+
throw new NullPointerException("map key");
84268442
}
84278443
return internalGetLabels().getMap().containsKey(key);
84288444
}
@@ -8457,7 +8473,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
84578473
@java.lang.Override
84588474
public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
84598475
if (key == null) {
8460-
throw new java.lang.NullPointerException();
8476+
throw new NullPointerException("map key");
84618477
}
84628478
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
84638479
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -8474,7 +8490,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
84748490
@java.lang.Override
84758491
public java.lang.String getLabelsOrThrow(java.lang.String key) {
84768492
if (key == null) {
8477-
throw new java.lang.NullPointerException();
8493+
throw new NullPointerException("map key");
84788494
}
84798495
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
84808496
if (!map.containsKey(key)) {
@@ -9614,7 +9630,7 @@ public int getLabelsCount() {
96149630
@java.lang.Override
96159631
public boolean containsLabels(java.lang.String key) {
96169632
if (key == null) {
9617-
throw new java.lang.NullPointerException();
9633+
throw new NullPointerException("map key");
96189634
}
96199635
return internalGetLabels().getMap().containsKey(key);
96209636
}
@@ -9650,7 +9666,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
96509666
public java.lang.String getLabelsOrDefault(
96519667
java.lang.String key, java.lang.String defaultValue) {
96529668
if (key == null) {
9653-
throw new java.lang.NullPointerException();
9669+
throw new NullPointerException("map key");
96549670
}
96559671
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
96569672
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -9667,7 +9683,7 @@ public java.lang.String getLabelsOrDefault(
96679683
@java.lang.Override
96689684
public java.lang.String getLabelsOrThrow(java.lang.String key) {
96699685
if (key == null) {
9670-
throw new java.lang.NullPointerException();
9686+
throw new NullPointerException("map key");
96719687
}
96729688
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
96739689
if (!map.containsKey(key)) {
@@ -9691,7 +9707,7 @@ public Builder clearLabels() {
96919707
*/
96929708
public Builder removeLabels(java.lang.String key) {
96939709
if (key == null) {
9694-
throw new java.lang.NullPointerException();
9710+
throw new NullPointerException("map key");
96959711
}
96969712
internalGetMutableLabels().getMutableMap().remove(key);
96979713
return this;
@@ -9712,11 +9728,12 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
97129728
*/
97139729
public Builder putLabels(java.lang.String key, java.lang.String value) {
97149730
if (key == null) {
9715-
throw new java.lang.NullPointerException();
9731+
throw new NullPointerException("map key");
97169732
}
97179733
if (value == null) {
9718-
throw new java.lang.NullPointerException();
9734+
throw new NullPointerException("map value");
97199735
}
9736+
97209737
internalGetMutableLabels().getMutableMap().put(key, value);
97219738
return this;
97229739
}

β€Žproto-google-cloud-security-private-ca-v1/src/main/java/com/google/cloud/security/privateca/v1/CaPoolOrBuilder.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,12 @@ public interface CaPoolOrBuilder
214214
*
215215
* <code>map&lt;string, string&gt; labels = 5 [(.google.api.field_behavior) = OPTIONAL];</code>
216216
*/
217-
java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue);
217+
218+
/* nullable */
219+
java.lang.String getLabelsOrDefault(
220+
java.lang.String key,
221+
/* nullable */
222+
java.lang.String defaultValue);
218223
/**
219224
*
220225
*

β€Žproto-google-cloud-security-private-ca-v1/src/main/java/com/google/cloud/security/privateca/v1/Certificate.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ private Certificate(
254254
}
255255
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
256256
throw e.setUnfinishedMessage(this);
257+
} catch (com.google.protobuf.UninitializedMessageException e) {
258+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
257259
} catch (java.io.IOException e) {
258260
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
259261
} finally {
@@ -441,6 +443,8 @@ private RevocationDetails(
441443
}
442444
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
443445
throw e.setUnfinishedMessage(this);
446+
} catch (com.google.protobuf.UninitializedMessageException e) {
447+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
444448
} catch (java.io.IOException e) {
445449
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
446450
} finally {
@@ -2069,7 +2073,7 @@ public int getLabelsCount() {
20692073
@java.lang.Override
20702074
public boolean containsLabels(java.lang.String key) {
20712075
if (key == null) {
2072-
throw new java.lang.NullPointerException();
2076+
throw new NullPointerException("map key");
20732077
}
20742078
return internalGetLabels().getMap().containsKey(key);
20752079
}
@@ -2104,7 +2108,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
21042108
@java.lang.Override
21052109
public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.String defaultValue) {
21062110
if (key == null) {
2107-
throw new java.lang.NullPointerException();
2111+
throw new NullPointerException("map key");
21082112
}
21092113
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
21102114
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -2121,7 +2125,7 @@ public java.lang.String getLabelsOrDefault(java.lang.String key, java.lang.Strin
21212125
@java.lang.Override
21222126
public java.lang.String getLabelsOrThrow(java.lang.String key) {
21232127
if (key == null) {
2124-
throw new java.lang.NullPointerException();
2128+
throw new NullPointerException("map key");
21252129
}
21262130
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
21272131
if (!map.containsKey(key)) {
@@ -3205,8 +3209,9 @@ public Builder mergeConfig(com.google.cloud.security.privateca.v1.CertificateCon
32053209
} else {
32063210
if (certificateConfigCase_ == 3) {
32073211
configBuilder_.mergeFrom(value);
3212+
} else {
3213+
configBuilder_.setMessage(value);
32083214
}
3209-
configBuilder_.setMessage(value);
32103215
}
32113216
certificateConfigCase_ = 3;
32123217
return this;
@@ -5081,7 +5086,7 @@ public int getLabelsCount() {
50815086
@java.lang.Override
50825087
public boolean containsLabels(java.lang.String key) {
50835088
if (key == null) {
5084-
throw new java.lang.NullPointerException();
5089+
throw new NullPointerException("map key");
50855090
}
50865091
return internalGetLabels().getMap().containsKey(key);
50875092
}
@@ -5117,7 +5122,7 @@ public java.util.Map<java.lang.String, java.lang.String> getLabelsMap() {
51175122
public java.lang.String getLabelsOrDefault(
51185123
java.lang.String key, java.lang.String defaultValue) {
51195124
if (key == null) {
5120-
throw new java.lang.NullPointerException();
5125+
throw new NullPointerException("map key");
51215126
}
51225127
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
51235128
return map.containsKey(key) ? map.get(key) : defaultValue;
@@ -5134,7 +5139,7 @@ public java.lang.String getLabelsOrDefault(
51345139
@java.lang.Override
51355140
public java.lang.String getLabelsOrThrow(java.lang.String key) {
51365141
if (key == null) {
5137-
throw new java.lang.NullPointerException();
5142+
throw new NullPointerException("map key");
51385143
}
51395144
java.util.Map<java.lang.String, java.lang.String> map = internalGetLabels().getMap();
51405145
if (!map.containsKey(key)) {
@@ -5158,7 +5163,7 @@ public Builder clearLabels() {
51585163
*/
51595164
public Builder removeLabels(java.lang.String key) {
51605165
if (key == null) {
5161-
throw new java.lang.NullPointerException();
5166+
throw new NullPointerException("map key");
51625167
}
51635168
internalGetMutableLabels().getMutableMap().remove(key);
51645169
return this;
@@ -5179,11 +5184,12 @@ public java.util.Map<java.lang.String, java.lang.String> getMutableLabels() {
51795184
*/
51805185
public Builder putLabels(java.lang.String key, java.lang.String value) {
51815186
if (key == null) {
5182-
throw new java.lang.NullPointerException();
5187+
throw new NullPointerException("map key");
51835188
}
51845189
if (value == null) {
5185-
throw new java.lang.NullPointerException();
5190+
throw new NullPointerException("map value");
51865191
}
5192+
51875193
internalGetMutableLabels().getMutableMap().put(key, value);
51885194
return this;
51895195
}

0 commit comments

Comments
 (0)