Skip to content
This repository was archived by the owner on May 14, 2026. It is now read-only.

Commit cdaf6d6

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: [iam,iam] upgrading protobuf to 23.2 for code generation (#1729)
* chore: upgrading protobuf to 23.2 for code generation PiperOrigin-RevId: 537035741 Source-Link: googleapis/googleapis@640f743 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ec02ed2022878f99c94c763060ff6a018896b6e Copy-Tag: eyJwIjoiamF2YS1pYW0vLk93bEJvdC55YW1sIiwiaCI6IjVlYzAyZWQyMDIyODc4Zjk5Yzk0Yzc2MzA2MGZmNmEwMTg4OTZiNmUifQ== chore: upgrading protobuf to 23.2 for code generation PiperOrigin-RevId: 537035741 Source-Link: googleapis/googleapis@640f743 Source-Link: https://github.com/googleapis/googleapis-gen/commit/5ec02ed2022878f99c94c763060ff6a018896b6e Copy-Tag: eyJwIjoiamF2YS1pYW0vLk93bEJvdC55YW1sIiwiaCI6IjVlYzAyZWQyMDIyODc4Zjk5Yzk0Yzc2MzA2MGZmNmEwMTg4OTZiNmUifQ== * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 5c1bd44 commit cdaf6d6

55 files changed

Lines changed: 1479 additions & 504 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.

‎java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfig.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@
2626
* The configuration determines which permission types are logged, and what
2727
* identities, if any, are exempted from logging.
2828
* An AuditConfig must have one or more AuditLogConfigs.
29+
*
2930
* If there are AuditConfigs for both `allServices` and a specific service,
3031
* the union of the two AuditConfigs is used for that service: the log_types
3132
* specified in each AuditConfig are enabled, and the exempted_members in each
3233
* AuditLogConfig are exempted.
34+
*
3335
* Example Policy with multiple AuditConfigs:
36+
*
3437
* {
3538
* "audit_configs": [
3639
* {
@@ -66,6 +69,7 @@
6669
* }
6770
* ]
6871
* }
72+
*
6973
* For sampleservice, this policy enables DATA_READ, DATA_WRITE and ADMIN_READ
7074
* logging. It also exempts jose&#64;example.com from DATA_READ logging, and
7175
* aliya&#64;example.com from DATA_WRITE logging.
@@ -94,11 +98,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
9498
return new AuditConfig();
9599
}
96100

97-
@java.lang.Override
98-
public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
99-
return this.unknownFields;
100-
}
101-
102101
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
103102
return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_AuditConfig_descriptor;
104103
}
@@ -414,11 +413,14 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
414413
* The configuration determines which permission types are logged, and what
415414
* identities, if any, are exempted from logging.
416415
* An AuditConfig must have one or more AuditLogConfigs.
416+
*
417417
* If there are AuditConfigs for both `allServices` and a specific service,
418418
* the union of the two AuditConfigs is used for that service: the log_types
419419
* specified in each AuditConfig are enabled, and the exempted_members in each
420420
* AuditLogConfig are exempted.
421+
*
421422
* Example Policy with multiple AuditConfigs:
423+
*
422424
* {
423425
* "audit_configs": [
424426
* {
@@ -454,6 +456,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
454456
* }
455457
* ]
456458
* }
459+
*
457460
* For sampleservice, this policy enables DATA_READ, DATA_WRITE and ADMIN_READ
458461
* logging. It also exempts jose&#64;example.com from DATA_READ logging, and
459462
* aliya&#64;example.com from DATA_WRITE logging.

‎java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditConfigDelta.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
5151
return new AuditConfigDelta();
5252
}
5353

54-
@java.lang.Override
55-
public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
56-
return this.unknownFields;
57-
}
58-
5954
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
6055
return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_AuditConfigDelta_descriptor;
6156
}

‎java-iam/proto-google-iam-v1/src/main/java/com/google/iam/v1/AuditLogConfig.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* <pre>
2525
* Provides the configuration for logging a type of permissions.
2626
* Example:
27+
*
2728
* {
2829
* "audit_log_configs": [
2930
* {
@@ -37,6 +38,7 @@
3738
* }
3839
* ]
3940
* }
41+
*
4042
* This enables 'DATA_READ' and 'DATA_WRITE' logging, while exempting
4143
* jose&#64;example.com from DATA_READ logging.
4244
* </pre>
@@ -55,7 +57,7 @@ private AuditLogConfig(com.google.protobuf.GeneratedMessageV3.Builder<?> builder
5557

5658
private AuditLogConfig() {
5759
logType_ = 0;
58-
exemptedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
60+
exemptedMembers_ = com.google.protobuf.LazyStringArrayList.emptyList();
5961
}
6062

6163
@java.lang.Override
@@ -64,11 +66,6 @@ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
6466
return new AuditLogConfig();
6567
}
6668

67-
@java.lang.Override
68-
public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
69-
return this.unknownFields;
70-
}
71-
7269
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
7370
return com.google.iam.v1.PolicyProto.internal_static_google_iam_v1_AuditLogConfig_descriptor;
7471
}
@@ -300,7 +297,8 @@ public com.google.iam.v1.AuditLogConfig.LogType getLogType() {
300297
public static final int EXEMPTED_MEMBERS_FIELD_NUMBER = 2;
301298

302299
@SuppressWarnings("serial")
303-
private com.google.protobuf.LazyStringList exemptedMembers_;
300+
private com.google.protobuf.LazyStringArrayList exemptedMembers_ =
301+
com.google.protobuf.LazyStringArrayList.emptyList();
304302
/**
305303
*
306304
*
@@ -551,6 +549,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
551549
* <pre>
552550
* Provides the configuration for logging a type of permissions.
553551
* Example:
552+
*
554553
* {
555554
* "audit_log_configs": [
556555
* {
@@ -564,6 +563,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
564563
* }
565564
* ]
566565
* }
566+
*
567567
* This enables 'DATA_READ' and 'DATA_WRITE' logging, while exempting
568568
* jose&#64;example.com from DATA_READ logging.
569569
* </pre>
@@ -600,8 +600,7 @@ public Builder clear() {
600600
super.clear();
601601
bitField0_ = 0;
602602
logType_ = 0;
603-
exemptedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
604-
bitField0_ = (bitField0_ & ~0x00000002);
603+
exemptedMembers_ = com.google.protobuf.LazyStringArrayList.emptyList();
605604
return this;
606605
}
607606

@@ -627,27 +626,22 @@ public com.google.iam.v1.AuditLogConfig build() {
627626
@java.lang.Override
628627
public com.google.iam.v1.AuditLogConfig buildPartial() {
629628
com.google.iam.v1.AuditLogConfig result = new com.google.iam.v1.AuditLogConfig(this);
630-
buildPartialRepeatedFields(result);
631629
if (bitField0_ != 0) {
632630
buildPartial0(result);
633631
}
634632
onBuilt();
635633
return result;
636634
}
637635

638-
private void buildPartialRepeatedFields(com.google.iam.v1.AuditLogConfig result) {
639-
if (((bitField0_ & 0x00000002) != 0)) {
640-
exemptedMembers_ = exemptedMembers_.getUnmodifiableView();
641-
bitField0_ = (bitField0_ & ~0x00000002);
642-
}
643-
result.exemptedMembers_ = exemptedMembers_;
644-
}
645-
646636
private void buildPartial0(com.google.iam.v1.AuditLogConfig result) {
647637
int from_bitField0_ = bitField0_;
648638
if (((from_bitField0_ & 0x00000001) != 0)) {
649639
result.logType_ = logType_;
650640
}
641+
if (((from_bitField0_ & 0x00000002) != 0)) {
642+
exemptedMembers_.makeImmutable();
643+
result.exemptedMembers_ = exemptedMembers_;
644+
}
651645
}
652646

653647
@java.lang.Override
@@ -701,7 +695,7 @@ public Builder mergeFrom(com.google.iam.v1.AuditLogConfig other) {
701695
if (!other.exemptedMembers_.isEmpty()) {
702696
if (exemptedMembers_.isEmpty()) {
703697
exemptedMembers_ = other.exemptedMembers_;
704-
bitField0_ = (bitField0_ & ~0x00000002);
698+
bitField0_ |= 0x00000002;
705699
} else {
706700
ensureExemptedMembersIsMutable();
707701
exemptedMembers_.addAll(other.exemptedMembers_);
@@ -856,14 +850,14 @@ public Builder clearLogType() {
856850
return this;
857851
}
858852

859-
private com.google.protobuf.LazyStringList exemptedMembers_ =
860-
com.google.protobuf.LazyStringArrayList.EMPTY;
853+
private com.google.protobuf.LazyStringArrayList exemptedMembers_ =
854+
com.google.protobuf.LazyStringArrayList.emptyList();
861855

862856
private void ensureExemptedMembersIsMutable() {
863-
if (!((bitField0_ & 0x00000002) != 0)) {
857+
if (!exemptedMembers_.isModifiable()) {
864858
exemptedMembers_ = new com.google.protobuf.LazyStringArrayList(exemptedMembers_);
865-
bitField0_ |= 0x00000002;
866859
}
860+
bitField0_ |= 0x00000002;
867861
}
868862
/**
869863
*
@@ -880,7 +874,8 @@ private void ensureExemptedMembersIsMutable() {
880874
* @return A list containing the exemptedMembers.
881875
*/
882876
public com.google.protobuf.ProtocolStringList getExemptedMembersList() {
883-
return exemptedMembers_.getUnmodifiableView();
877+
exemptedMembers_.makeImmutable();
878+
return exemptedMembers_;
884879
}
885880
/**
886881
*
@@ -957,6 +952,7 @@ public Builder setExemptedMembers(int index, java.lang.String value) {
957952
}
958953
ensureExemptedMembersIsMutable();
959954
exemptedMembers_.set(index, value);
955+
bitField0_ |= 0x00000002;
960956
onChanged();
961957
return this;
962958
}
@@ -981,6 +977,7 @@ public Builder addExemptedMembers(java.lang.String value) {
981977
}
982978
ensureExemptedMembersIsMutable();
983979
exemptedMembers_.add(value);
980+
bitField0_ |= 0x00000002;
984981
onChanged();
985982
return this;
986983
}
@@ -1002,6 +999,7 @@ public Builder addExemptedMembers(java.lang.String value) {
1002999
public Builder addAllExemptedMembers(java.lang.Iterable<java.lang.String> values) {
10031000
ensureExemptedMembersIsMutable();
10041001
com.google.protobuf.AbstractMessageLite.Builder.addAll(values, exemptedMembers_);
1002+
bitField0_ |= 0x00000002;
10051003
onChanged();
10061004
return this;
10071005
}
@@ -1020,8 +1018,9 @@ public Builder addAllExemptedMembers(java.lang.Iterable<java.lang.String> values
10201018
* @return This builder for chaining.
10211019
*/
10221020
public Builder clearExemptedMembers() {
1023-
exemptedMembers_ = com.google.protobuf.LazyStringArrayList.EMPTY;
1021+
exemptedMembers_ = com.google.protobuf.LazyStringArrayList.emptyList();
10241022
bitField0_ = (bitField0_ & ~0x00000002);
1023+
;
10251024
onChanged();
10261025
return this;
10271026
}
@@ -1047,6 +1046,7 @@ public Builder addExemptedMembersBytes(com.google.protobuf.ByteString value) {
10471046
checkByteStringIsUtf8(value);
10481047
ensureExemptedMembersIsMutable();
10491048
exemptedMembers_.add(value);
1049+
bitField0_ |= 0x00000002;
10501050
onChanged();
10511051
return this;
10521052
}

0 commit comments

Comments
 (0)