Skip to content

Commit c0bc73e

Browse files
fix: Remove obsolete export subscription statuses field from API (#1279)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 490440743 Source-Link: https://togithub.com/googleapis/googleapis/commit/f3f035a2f65bab4946f3bb2ad8c1e49371806545 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/b67055166881e650edbfdd6b5505491ff2d4c11e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjY3MDU1MTY2ODgxZTY1MGVkYmZkZDZiNTUwNTQ5MWZmMmQ0YzExZSJ9
1 parent 65eaffd commit c0bc73e

File tree

6 files changed

+402
-2029
lines changed

6 files changed

+402
-2029
lines changed

proto-google-cloud-pubsublite-v1/clirr-ignored-differences.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
33
<differences>
4+
<difference>
5+
<differenceType>6011</differenceType>
6+
<className>com/google/cloud/pubsublite/proto/ExportConfig</className>
7+
<field>STATUSES_FIELD_NUMBER</field>
8+
</difference>
9+
<difference>
10+
<differenceType>7002</differenceType>
11+
<className>com/google/cloud/pubsublite/proto/ExportConfig*</className>
12+
<method>*</method>
13+
</difference>
14+
<difference>
15+
<differenceType>8001</differenceType>
16+
<className>com/google/cloud/pubsublite/proto/ExportConfig*</className>
17+
</difference>
418
<difference>
519
<differenceType>7012</differenceType>
620
<className>com/google/cloud/pubsublite/proto/*OrBuilder</className>

proto-google-cloud-pubsublite-v1/src/main/java/com/google/cloud/pubsublite/proto/CommonProto.java

Lines changed: 75 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
8383
internal_static_google_cloud_pubsublite_v1_ExportConfig_descriptor;
8484
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
8585
internal_static_google_cloud_pubsublite_v1_ExportConfig_fieldAccessorTable;
86-
static final com.google.protobuf.Descriptors.Descriptor
87-
internal_static_google_cloud_pubsublite_v1_ExportConfig_PartitionStatus_descriptor;
88-
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
89-
internal_static_google_cloud_pubsublite_v1_ExportConfig_PartitionStatus_fieldAccessorTable;
9086
static final com.google.protobuf.Descriptors.Descriptor
9187
internal_static_google_cloud_pubsublite_v1_ExportConfig_PubSubConfig_descriptor;
9288
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -108,83 +104,79 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
108104
+ "o\022\032google.cloud.pubsublite.v1\032\037google/ap"
109105
+ "i/field_behavior.proto\032\031google/api/resou"
110106
+ "rce.proto\032\036google/protobuf/duration.prot"
111-
+ "o\032\037google/protobuf/timestamp.proto\032\027goog"
112-
+ "le/rpc/status.proto\"!\n\017AttributeValues\022\016"
113-
+ "\n\006values\030\001 \003(\014\"\211\002\n\rPubSubMessage\022\013\n\003key\030"
114-
+ "\001 \001(\014\022\014\n\004data\030\002 \001(\014\022M\n\nattributes\030\003 \003(\0132"
115-
+ "9.google.cloud.pubsublite.v1.PubSubMessa"
116-
+ "ge.AttributesEntry\022.\n\nevent_time\030\004 \001(\0132\032"
117-
+ ".google.protobuf.Timestamp\032^\n\017Attributes"
118-
+ "Entry\022\013\n\003key\030\001 \001(\t\022:\n\005value\030\002 \001(\0132+.goog"
119-
+ "le.cloud.pubsublite.v1.AttributeValues:\002"
120-
+ "8\001\"\030\n\006Cursor\022\016\n\006offset\030\001 \001(\003\"\310\001\n\020Sequenc"
121-
+ "edMessage\0222\n\006cursor\030\001 \001(\0132\".google.cloud"
122-
+ ".pubsublite.v1.Cursor\0220\n\014publish_time\030\002 "
123-
+ "\001(\0132\032.google.protobuf.Timestamp\022:\n\007messa"
124-
+ "ge\030\003 \001(\0132).google.cloud.pubsublite.v1.Pu"
125-
+ "bSubMessage\022\022\n\nsize_bytes\030\004 \001(\003\"\250\001\n\013Rese"
126-
+ "rvation\022\014\n\004name\030\001 \001(\t\022\033\n\023throughput_capa"
127-
+ "city\030\002 \001(\003:n\352Ak\n%pubsublite.googleapis.c"
128-
+ "om/Reservation\022Bprojects/{project}/locat"
129-
+ "ions/{location}/reservations/{reservatio"
130-
+ "n}\"\367\005\n\005Topic\022\014\n\004name\030\001 \001(\t\022K\n\020partition_"
131-
+ "config\030\002 \001(\01321.google.cloud.pubsublite.v"
132-
+ "1.Topic.PartitionConfig\022K\n\020retention_con"
133-
+ "fig\030\003 \001(\01321.google.cloud.pubsublite.v1.T"
134-
+ "opic.RetentionConfig\022O\n\022reservation_conf"
135-
+ "ig\030\004 \001(\01323.google.cloud.pubsublite.v1.To"
136-
+ "pic.ReservationConfig\032\332\001\n\017PartitionConfi"
137-
+ "g\022\r\n\005count\030\001 \001(\003\022\023\n\005scale\030\002 \001(\005B\002\030\001H\000\022N\n"
138-
+ "\010capacity\030\003 \001(\0132:.google.cloud.pubsublit"
139-
+ "e.v1.Topic.PartitionConfig.CapacityH\000\032F\n"
140-
+ "\010Capacity\022\033\n\023publish_mib_per_sec\030\001 \001(\005\022\035"
141-
+ "\n\025subscribe_mib_per_sec\030\002 \001(\005B\013\n\tdimensi"
142-
+ "on\032Y\n\017RetentionConfig\022\033\n\023per_partition_b"
143-
+ "ytes\030\001 \001(\003\022)\n\006period\030\002 \001(\0132\031.google.prot"
144-
+ "obuf.Duration\032_\n\021ReservationConfig\022J\n\026th"
145-
+ "roughput_reservation\030\001 \001(\tB*\372A\'\n%pubsubl"
146-
+ "ite.googleapis.com/Reservation:\\\352AY\n\037pub"
147-
+ "sublite.googleapis.com/Topic\0226projects/{"
148-
+ "project}/locations/{location}/topics/{to"
149-
+ "pic}\"\305\004\n\014Subscription\022\014\n\004name\030\001 \001(\t\0223\n\005t"
150-
+ "opic\030\002 \001(\tB$\372A!\n\037pubsublite.googleapis.c"
151-
+ "om/Topic\022P\n\017delivery_config\030\003 \001(\01327.goog"
152-
+ "le.cloud.pubsublite.v1.Subscription.Deli"
153-
+ "veryConfig\022?\n\rexport_config\030\004 \001(\0132(.goog"
154-
+ "le.cloud.pubsublite.v1.ExportConfig\032\353\001\n\016"
155-
+ "DeliveryConfig\022i\n\024delivery_requirement\030\003"
156-
+ " \001(\0162K.google.cloud.pubsublite.v1.Subscr"
157-
+ "iption.DeliveryConfig.DeliveryRequiremen"
158-
+ "t\"n\n\023DeliveryRequirement\022$\n DELIVERY_REQ"
159-
+ "UIREMENT_UNSPECIFIED\020\000\022\027\n\023DELIVER_IMMEDI"
160-
+ "ATELY\020\001\022\030\n\024DELIVER_AFTER_STORED\020\002:q\352An\n&"
161-
+ "pubsublite.googleapis.com/Subscription\022D"
162-
+ "projects/{project}/locations/{location}/"
163-
+ "subscriptions/{subscription}\"\336\004\n\014ExportC"
164-
+ "onfig\022E\n\rdesired_state\030\001 \001(\0162..google.cl"
165-
+ "oud.pubsublite.v1.ExportConfig.State\022J\n\r"
166-
+ "current_state\030\006 \001(\0162..google.cloud.pubsu"
167-
+ "blite.v1.ExportConfig.StateB\003\340A\003\022Q\n\010stat"
168-
+ "uses\030\004 \003(\01328.google.cloud.pubsublite.v1."
169-
+ "ExportConfig.PartitionStatusB\005\030\001\340A\003\022B\n\021d"
170-
+ "ead_letter_topic\030\005 \001(\tB\'\340A\001\372A!\n\037pubsubli"
171-
+ "te.googleapis.com/Topic\022N\n\rpubsub_config"
172-
+ "\030\003 \001(\01325.google.cloud.pubsublite.v1.Expo"
173-
+ "rtConfig.PubSubConfigH\000\032H\n\017PartitionStat"
174-
+ "us\022\021\n\tpartition\030\001 \001(\003\022\"\n\006status\030\002 \001(\0132\022."
175-
+ "google.rpc.Status\032\035\n\014PubSubConfig\022\r\n\005top"
176-
+ "ic\030\001 \001(\t\"\\\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000"
177-
+ "\022\n\n\006ACTIVE\020\001\022\n\n\006PAUSED\020\002\022\025\n\021PERMISSION_D"
178-
+ "ENIED\020\003\022\r\n\tNOT_FOUND\020\004B\r\n\013destination\"z\n"
179-
+ "\nTimeTarget\0222\n\014publish_time\030\001 \001(\0132\032.goog"
180-
+ "le.protobuf.TimestampH\000\0220\n\nevent_time\030\002 "
181-
+ "\001(\0132\032.google.protobuf.TimestampH\000B\006\n\004tim"
182-
+ "eB\325\001\n!com.google.cloud.pubsublite.protoB"
183-
+ "\013CommonProtoP\001ZDgoogle.golang.org/genpro"
184-
+ "to/googleapis/cloud/pubsublite/v1;pubsub"
185-
+ "lite\370\001\001\252\002\032Google.Cloud.PubSubLite.V1\312\002\032G"
186-
+ "oogle\\Cloud\\PubSubLite\\V1\352\002\035Google::Clou"
187-
+ "d::PubSubLite::V1b\006proto3"
107+
+ "o\032\037google/protobuf/timestamp.proto\"!\n\017At"
108+
+ "tributeValues\022\016\n\006values\030\001 \003(\014\"\211\002\n\rPubSub"
109+
+ "Message\022\013\n\003key\030\001 \001(\014\022\014\n\004data\030\002 \001(\014\022M\n\nat"
110+
+ "tributes\030\003 \003(\01329.google.cloud.pubsublite"
111+
+ ".v1.PubSubMessage.AttributesEntry\022.\n\neve"
112+
+ "nt_time\030\004 \001(\0132\032.google.protobuf.Timestam"
113+
+ "p\032^\n\017AttributesEntry\022\013\n\003key\030\001 \001(\t\022:\n\005val"
114+
+ "ue\030\002 \001(\0132+.google.cloud.pubsublite.v1.At"
115+
+ "tributeValues:\0028\001\"\030\n\006Cursor\022\016\n\006offset\030\001 "
116+
+ "\001(\003\"\310\001\n\020SequencedMessage\0222\n\006cursor\030\001 \001(\013"
117+
+ "2\".google.cloud.pubsublite.v1.Cursor\0220\n\014"
118+
+ "publish_time\030\002 \001(\0132\032.google.protobuf.Tim"
119+
+ "estamp\022:\n\007message\030\003 \001(\0132).google.cloud.p"
120+
+ "ubsublite.v1.PubSubMessage\022\022\n\nsize_bytes"
121+
+ "\030\004 \001(\003\"\250\001\n\013Reservation\022\014\n\004name\030\001 \001(\t\022\033\n\023"
122+
+ "throughput_capacity\030\002 \001(\003:n\352Ak\n%pubsubli"
123+
+ "te.googleapis.com/Reservation\022Bprojects/"
124+
+ "{project}/locations/{location}/reservati"
125+
+ "ons/{reservation}\"\367\005\n\005Topic\022\014\n\004name\030\001 \001("
126+
+ "\t\022K\n\020partition_config\030\002 \001(\01321.google.clo"
127+
+ "ud.pubsublite.v1.Topic.PartitionConfig\022K"
128+
+ "\n\020retention_config\030\003 \001(\01321.google.cloud."
129+
+ "pubsublite.v1.Topic.RetentionConfig\022O\n\022r"
130+
+ "eservation_config\030\004 \001(\01323.google.cloud.p"
131+
+ "ubsublite.v1.Topic.ReservationConfig\032\332\001\n"
132+
+ "\017PartitionConfig\022\r\n\005count\030\001 \001(\003\022\023\n\005scale"
133+
+ "\030\002 \001(\005B\002\030\001H\000\022N\n\010capacity\030\003 \001(\0132:.google."
134+
+ "cloud.pubsublite.v1.Topic.PartitionConfi"
135+
+ "g.CapacityH\000\032F\n\010Capacity\022\033\n\023publish_mib_"
136+
+ "per_sec\030\001 \001(\005\022\035\n\025subscribe_mib_per_sec\030\002"
137+
+ " \001(\005B\013\n\tdimension\032Y\n\017RetentionConfig\022\033\n\023"
138+
+ "per_partition_bytes\030\001 \001(\003\022)\n\006period\030\002 \001("
139+
+ "\0132\031.google.protobuf.Duration\032_\n\021Reservat"
140+
+ "ionConfig\022J\n\026throughput_reservation\030\001 \001("
141+
+ "\tB*\372A\'\n%pubsublite.googleapis.com/Reserv"
142+
+ "ation:\\\352AY\n\037pubsublite.googleapis.com/To"
143+
+ "pic\0226projects/{project}/locations/{locat"
144+
+ "ion}/topics/{topic}\"\305\004\n\014Subscription\022\014\n\004"
145+
+ "name\030\001 \001(\t\0223\n\005topic\030\002 \001(\tB$\372A!\n\037pubsubli"
146+
+ "te.googleapis.com/Topic\022P\n\017delivery_conf"
147+
+ "ig\030\003 \001(\01327.google.cloud.pubsublite.v1.Su"
148+
+ "bscription.DeliveryConfig\022?\n\rexport_conf"
149+
+ "ig\030\004 \001(\0132(.google.cloud.pubsublite.v1.Ex"
150+
+ "portConfig\032\353\001\n\016DeliveryConfig\022i\n\024deliver"
151+
+ "y_requirement\030\003 \001(\0162K.google.cloud.pubsu"
152+
+ "blite.v1.Subscription.DeliveryConfig.Del"
153+
+ "iveryRequirement\"n\n\023DeliveryRequirement\022"
154+
+ "$\n DELIVERY_REQUIREMENT_UNSPECIFIED\020\000\022\027\n"
155+
+ "\023DELIVER_IMMEDIATELY\020\001\022\030\n\024DELIVER_AFTER_"
156+
+ "STORED\020\002:q\352An\n&pubsublite.googleapis.com"
157+
+ "/Subscription\022Dprojects/{project}/locati"
158+
+ "ons/{location}/subscriptions/{subscripti"
159+
+ "on}\"\301\003\n\014ExportConfig\022E\n\rdesired_state\030\001 "
160+
+ "\001(\0162..google.cloud.pubsublite.v1.ExportC"
161+
+ "onfig.State\022J\n\rcurrent_state\030\006 \001(\0162..goo"
162+
+ "gle.cloud.pubsublite.v1.ExportConfig.Sta"
163+
+ "teB\003\340A\003\022B\n\021dead_letter_topic\030\005 \001(\tB\'\340A\001\372"
164+
+ "A!\n\037pubsublite.googleapis.com/Topic\022N\n\rp"
165+
+ "ubsub_config\030\003 \001(\01325.google.cloud.pubsub"
166+
+ "lite.v1.ExportConfig.PubSubConfigH\000\032\035\n\014P"
167+
+ "ubSubConfig\022\r\n\005topic\030\001 \001(\t\"\\\n\005State\022\025\n\021S"
168+
+ "TATE_UNSPECIFIED\020\000\022\n\n\006ACTIVE\020\001\022\n\n\006PAUSED"
169+
+ "\020\002\022\025\n\021PERMISSION_DENIED\020\003\022\r\n\tNOT_FOUND\020\004"
170+
+ "B\r\n\013destination\"z\n\nTimeTarget\0222\n\014publish"
171+
+ "_time\030\001 \001(\0132\032.google.protobuf.TimestampH"
172+
+ "\000\0220\n\nevent_time\030\002 \001(\0132\032.google.protobuf."
173+
+ "TimestampH\000B\006\n\004timeB\325\001\n!com.google.cloud"
174+
+ ".pubsublite.protoB\013CommonProtoP\001ZDgoogle"
175+
+ ".golang.org/genproto/googleapis/cloud/pu"
176+
+ "bsublite/v1;pubsublite\370\001\001\252\002\032Google.Cloud"
177+
+ ".PubSubLite.V1\312\002\032Google\\Cloud\\PubSubLite"
178+
+ "\\V1\352\002\035Google::Cloud::PubSubLite::V1b\006pro"
179+
+ "to3"
188180
};
189181
descriptor =
190182
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -194,7 +186,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
194186
com.google.api.ResourceProto.getDescriptor(),
195187
com.google.protobuf.DurationProto.getDescriptor(),
196188
com.google.protobuf.TimestampProto.getDescriptor(),
197-
com.google.rpc.StatusProto.getDescriptor(),
198189
});
199190
internal_static_google_cloud_pubsublite_v1_AttributeValues_descriptor =
200191
getDescriptor().getMessageTypes().get(0);
@@ -308,23 +299,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
308299
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
309300
internal_static_google_cloud_pubsublite_v1_ExportConfig_descriptor,
310301
new java.lang.String[] {
311-
"DesiredState",
312-
"CurrentState",
313-
"Statuses",
314-
"DeadLetterTopic",
315-
"PubsubConfig",
316-
"Destination",
317-
});
318-
internal_static_google_cloud_pubsublite_v1_ExportConfig_PartitionStatus_descriptor =
319-
internal_static_google_cloud_pubsublite_v1_ExportConfig_descriptor.getNestedTypes().get(0);
320-
internal_static_google_cloud_pubsublite_v1_ExportConfig_PartitionStatus_fieldAccessorTable =
321-
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
322-
internal_static_google_cloud_pubsublite_v1_ExportConfig_PartitionStatus_descriptor,
323-
new java.lang.String[] {
324-
"Partition", "Status",
302+
"DesiredState", "CurrentState", "DeadLetterTopic", "PubsubConfig", "Destination",
325303
});
326304
internal_static_google_cloud_pubsublite_v1_ExportConfig_PubSubConfig_descriptor =
327-
internal_static_google_cloud_pubsublite_v1_ExportConfig_descriptor.getNestedTypes().get(1);
305+
internal_static_google_cloud_pubsublite_v1_ExportConfig_descriptor.getNestedTypes().get(0);
328306
internal_static_google_cloud_pubsublite_v1_ExportConfig_PubSubConfig_fieldAccessorTable =
329307
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
330308
internal_static_google_cloud_pubsublite_v1_ExportConfig_PubSubConfig_descriptor,
@@ -350,7 +328,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
350328
com.google.api.ResourceProto.getDescriptor();
351329
com.google.protobuf.DurationProto.getDescriptor();
352330
com.google.protobuf.TimestampProto.getDescriptor();
353-
com.google.rpc.StatusProto.getDescriptor();
354331
}
355332

356333
// @@protoc_insertion_point(outer_class_scope)

0 commit comments

Comments
 (0)