diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfig.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfig.java
index 66323e6af..67b06239d 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfig.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfig.java
@@ -41,7 +41,6 @@ private BigQueryConfig(com.google.protobuf.GeneratedMessageV3.Builder builder
private BigQueryConfig() {
table_ = "";
state_ = 0;
- serviceAccountEmail_ = "";
}
@java.lang.Override
@@ -478,67 +477,6 @@ public boolean getUseTableSchema() {
return useTableSchema_;
}
- public static final int SERVICE_ACCOUNT_EMAIL_FIELD_NUMBER = 7;
-
- @SuppressWarnings("serial")
- private volatile java.lang.Object serviceAccountEmail_ = "";
- /**
- *
- *
- *
- * Optional. The service account to use to write to BigQuery. The subscription
- * creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub [service
- * agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The serviceAccountEmail.
- */
- @java.lang.Override
- public java.lang.String getServiceAccountEmail() {
- java.lang.Object ref = serviceAccountEmail_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- serviceAccountEmail_ = s;
- return s;
- }
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to BigQuery. The subscription
- * creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub [service
- * agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The bytes for serviceAccountEmail.
- */
- @java.lang.Override
- public com.google.protobuf.ByteString getServiceAccountEmailBytes() {
- java.lang.Object ref = serviceAccountEmail_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- serviceAccountEmail_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -571,9 +509,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (useTableSchema_ != false) {
output.writeBool(6, useTableSchema_);
}
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 7, serviceAccountEmail_);
- }
getUnknownFields().writeTo(output);
}
@@ -601,9 +536,6 @@ public int getSerializedSize() {
if (useTableSchema_ != false) {
size += com.google.protobuf.CodedOutputStream.computeBoolSize(6, useTableSchema_);
}
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, serviceAccountEmail_);
- }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -625,7 +557,6 @@ public boolean equals(final java.lang.Object obj) {
if (getDropUnknownFields() != other.getDropUnknownFields()) return false;
if (state_ != other.state_) return false;
if (getUseTableSchema() != other.getUseTableSchema()) return false;
- if (!getServiceAccountEmail().equals(other.getServiceAccountEmail())) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -649,8 +580,6 @@ public int hashCode() {
hash = (53 * hash) + state_;
hash = (37 * hash) + USE_TABLE_SCHEMA_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getUseTableSchema());
- hash = (37 * hash) + SERVICE_ACCOUNT_EMAIL_FIELD_NUMBER;
- hash = (53 * hash) + getServiceAccountEmail().hashCode();
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -795,7 +724,6 @@ public Builder clear() {
dropUnknownFields_ = false;
state_ = 0;
useTableSchema_ = false;
- serviceAccountEmail_ = "";
return this;
}
@@ -849,9 +777,6 @@ private void buildPartial0(com.google.pubsub.v1.BigQueryConfig result) {
if (((from_bitField0_ & 0x00000020) != 0)) {
result.useTableSchema_ = useTableSchema_;
}
- if (((from_bitField0_ & 0x00000040) != 0)) {
- result.serviceAccountEmail_ = serviceAccountEmail_;
- }
}
@java.lang.Override
@@ -919,11 +844,6 @@ public Builder mergeFrom(com.google.pubsub.v1.BigQueryConfig other) {
if (other.getUseTableSchema() != false) {
setUseTableSchema(other.getUseTableSchema());
}
- if (!other.getServiceAccountEmail().isEmpty()) {
- serviceAccountEmail_ = other.serviceAccountEmail_;
- bitField0_ |= 0x00000040;
- onChanged();
- }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -986,12 +906,6 @@ public Builder mergeFrom(
bitField0_ |= 0x00000020;
break;
} // case 48
- case 58:
- {
- serviceAccountEmail_ = input.readStringRequireUtf8();
- bitField0_ |= 0x00000040;
- break;
- } // case 58
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1475,137 +1389,6 @@ public Builder clearUseTableSchema() {
return this;
}
- private java.lang.Object serviceAccountEmail_ = "";
- /**
- *
- *
- *
- * Optional. The service account to use to write to BigQuery. The subscription
- * creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub [service
- * agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The serviceAccountEmail.
- */
- public java.lang.String getServiceAccountEmail() {
- java.lang.Object ref = serviceAccountEmail_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- serviceAccountEmail_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to BigQuery. The subscription
- * creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub [service
- * agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The bytes for serviceAccountEmail.
- */
- public com.google.protobuf.ByteString getServiceAccountEmailBytes() {
- java.lang.Object ref = serviceAccountEmail_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- serviceAccountEmail_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to BigQuery. The subscription
- * creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub [service
- * agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @param value The serviceAccountEmail to set.
- * @return This builder for chaining.
- */
- public Builder setServiceAccountEmail(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- serviceAccountEmail_ = value;
- bitField0_ |= 0x00000040;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to BigQuery. The subscription
- * creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub [service
- * agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return This builder for chaining.
- */
- public Builder clearServiceAccountEmail() {
- serviceAccountEmail_ = getDefaultInstance().getServiceAccountEmail();
- bitField0_ = (bitField0_ & ~0x00000040);
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to BigQuery. The subscription
- * creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub [service
- * agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @param value The bytes for serviceAccountEmail to set.
- * @return This builder for chaining.
- */
- public Builder setServiceAccountEmailBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
- serviceAccountEmail_ = value;
- bitField0_ |= 0x00000040;
- onChanged();
- return this;
- }
-
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfigOrBuilder.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfigOrBuilder.java
index 958a634f2..a2420175d 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfigOrBuilder.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfigOrBuilder.java
@@ -145,39 +145,4 @@ public interface BigQueryConfigOrBuilder
* @return The useTableSchema.
*/
boolean getUseTableSchema();
-
- /**
- *
- *
- *
- * Optional. The service account to use to write to BigQuery. The subscription
- * creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub [service
- * agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The serviceAccountEmail.
- */
- java.lang.String getServiceAccountEmail();
- /**
- *
- *
- *
- * Optional. The service account to use to write to BigQuery. The subscription
- * creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub [service
- * agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The bytes for serviceAccountEmail.
- */
- com.google.protobuf.ByteString getServiceAccountEmailBytes();
}
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfig.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfig.java
index f847f91d6..5620703da 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfig.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfig.java
@@ -42,9 +42,7 @@ private CloudStorageConfig() {
bucket_ = "";
filenamePrefix_ = "";
filenameSuffix_ = "";
- filenameDatetimeFormat_ = "";
state_ = 0;
- serviceAccountEmail_ = "";
}
@java.lang.Override
@@ -130,17 +128,6 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
* IN_TRANSIT_LOCATION_RESTRICTION = 4;
*/
IN_TRANSIT_LOCATION_RESTRICTION(4),
- /**
- *
- *
- *
- * Cannot write to the Cloud Storage bucket due to an incompatibility
- * between the topic schema and subscription settings.
- *
- *
- * SCHEMA_MISMATCH = 5;
- */
- SCHEMA_MISMATCH(5),
UNRECOGNIZED(-1),
;
@@ -196,17 +183,6 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
* IN_TRANSIT_LOCATION_RESTRICTION = 4;
*/
public static final int IN_TRANSIT_LOCATION_RESTRICTION_VALUE = 4;
- /**
- *
- *
- *
- * Cannot write to the Cloud Storage bucket due to an incompatibility
- * between the topic schema and subscription settings.
- *
- *
- * SCHEMA_MISMATCH = 5;
- */
- public static final int SCHEMA_MISMATCH_VALUE = 5;
public final int getNumber() {
if (this == UNRECOGNIZED) {
@@ -242,8 +218,6 @@ public static State forNumber(int value) {
return NOT_FOUND;
case 4:
return IN_TRANSIT_LOCATION_RESTRICTION;
- case 5:
- return SCHEMA_MISMATCH;
default:
return null;
}
@@ -745,20 +719,6 @@ public interface AvroConfigOrBuilder
* @return The writeMetadata.
*/
boolean getWriteMetadata();
-
- /**
- *
- *
- *
- * Optional. When true, the output Cloud Storage file will be serialized
- * using the topic schema, if it exists.
- *
- *
- * bool use_topic_schema = 2 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The useTopicSchema.
- */
- boolean getUseTopicSchema();
}
/**
*
@@ -826,25 +786,6 @@ public boolean getWriteMetadata() {
return writeMetadata_;
}
- public static final int USE_TOPIC_SCHEMA_FIELD_NUMBER = 2;
- private boolean useTopicSchema_ = false;
- /**
- *
- *
- *
- * Optional. When true, the output Cloud Storage file will be serialized
- * using the topic schema, if it exists.
- *
- *
- * bool use_topic_schema = 2 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The useTopicSchema.
- */
- @java.lang.Override
- public boolean getUseTopicSchema() {
- return useTopicSchema_;
- }
-
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -862,9 +803,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (writeMetadata_ != false) {
output.writeBool(1, writeMetadata_);
}
- if (useTopicSchema_ != false) {
- output.writeBool(2, useTopicSchema_);
- }
getUnknownFields().writeTo(output);
}
@@ -877,9 +815,6 @@ public int getSerializedSize() {
if (writeMetadata_ != false) {
size += com.google.protobuf.CodedOutputStream.computeBoolSize(1, writeMetadata_);
}
- if (useTopicSchema_ != false) {
- size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, useTopicSchema_);
- }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -897,7 +832,6 @@ public boolean equals(final java.lang.Object obj) {
(com.google.pubsub.v1.CloudStorageConfig.AvroConfig) obj;
if (getWriteMetadata() != other.getWriteMetadata()) return false;
- if (getUseTopicSchema() != other.getUseTopicSchema()) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -911,8 +845,6 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + WRITE_METADATA_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getWriteMetadata());
- hash = (37 * hash) + USE_TOPIC_SCHEMA_FIELD_NUMBER;
- hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getUseTopicSchema());
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -1056,7 +988,6 @@ public Builder clear() {
super.clear();
bitField0_ = 0;
writeMetadata_ = false;
- useTopicSchema_ = false;
return this;
}
@@ -1096,9 +1027,6 @@ private void buildPartial0(com.google.pubsub.v1.CloudStorageConfig.AvroConfig re
if (((from_bitField0_ & 0x00000001) != 0)) {
result.writeMetadata_ = writeMetadata_;
}
- if (((from_bitField0_ & 0x00000002) != 0)) {
- result.useTopicSchema_ = useTopicSchema_;
- }
}
@java.lang.Override
@@ -1152,9 +1080,6 @@ public Builder mergeFrom(com.google.pubsub.v1.CloudStorageConfig.AvroConfig othe
if (other.getWriteMetadata() != false) {
setWriteMetadata(other.getWriteMetadata());
}
- if (other.getUseTopicSchema() != false) {
- setUseTopicSchema(other.getUseTopicSchema());
- }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -1187,12 +1112,6 @@ public Builder mergeFrom(
bitField0_ |= 0x00000001;
break;
} // case 8
- case 16:
- {
- useTopicSchema_ = input.readBool();
- bitField0_ |= 0x00000002;
- break;
- } // case 16
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1280,62 +1199,6 @@ public Builder clearWriteMetadata() {
return this;
}
- private boolean useTopicSchema_;
- /**
- *
- *
- *
- * Optional. When true, the output Cloud Storage file will be serialized
- * using the topic schema, if it exists.
- *
- *
- * bool use_topic_schema = 2 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The useTopicSchema.
- */
- @java.lang.Override
- public boolean getUseTopicSchema() {
- return useTopicSchema_;
- }
- /**
- *
- *
- *
- * Optional. When true, the output Cloud Storage file will be serialized
- * using the topic schema, if it exists.
- *
- *
- * bool use_topic_schema = 2 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @param value The useTopicSchema to set.
- * @return This builder for chaining.
- */
- public Builder setUseTopicSchema(boolean value) {
-
- useTopicSchema_ = value;
- bitField0_ |= 0x00000002;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. When true, the output Cloud Storage file will be serialized
- * using the topic schema, if it exists.
- *
- *
- * bool use_topic_schema = 2 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return This builder for chaining.
- */
- public Builder clearUseTopicSchema() {
- bitField0_ = (bitField0_ & ~0x00000002);
- useTopicSchema_ = false;
- onChanged();
- return this;
- }
-
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1615,61 +1478,6 @@ public com.google.protobuf.ByteString getFilenameSuffixBytes() {
}
}
- public static final int FILENAME_DATETIME_FORMAT_FIELD_NUMBER = 10;
-
- @SuppressWarnings("serial")
- private volatile java.lang.Object filenameDatetimeFormat_ = "";
- /**
- *
- *
- *
- * Optional. User-provided format string specifying how to represent datetimes
- * in Cloud Storage filenames. See the [datetime format
- * guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- *
- *
- * string filename_datetime_format = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The filenameDatetimeFormat.
- */
- @java.lang.Override
- public java.lang.String getFilenameDatetimeFormat() {
- java.lang.Object ref = filenameDatetimeFormat_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- filenameDatetimeFormat_ = s;
- return s;
- }
- }
- /**
- *
- *
- *
- * Optional. User-provided format string specifying how to represent datetimes
- * in Cloud Storage filenames. See the [datetime format
- * guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- *
- *
- * string filename_datetime_format = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The bytes for filenameDatetimeFormat.
- */
- @java.lang.Override
- public com.google.protobuf.ByteString getFilenameDatetimeFormatBytes() {
- java.lang.Object ref = filenameDatetimeFormat_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- filenameDatetimeFormat_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
public static final int TEXT_CONFIG_FIELD_NUMBER = 4;
/**
*
@@ -1906,67 +1714,6 @@ public com.google.pubsub.v1.CloudStorageConfig.State getState() {
return result == null ? com.google.pubsub.v1.CloudStorageConfig.State.UNRECOGNIZED : result;
}
- public static final int SERVICE_ACCOUNT_EMAIL_FIELD_NUMBER = 11;
-
- @SuppressWarnings("serial")
- private volatile java.lang.Object serviceAccountEmail_ = "";
- /**
- *
- *
- *
- * Optional. The service account to use to write to Cloud Storage. The
- * subscription creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub
- * [service agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The serviceAccountEmail.
- */
- @java.lang.Override
- public java.lang.String getServiceAccountEmail() {
- java.lang.Object ref = serviceAccountEmail_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- serviceAccountEmail_ = s;
- return s;
- }
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to Cloud Storage. The
- * subscription creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub
- * [service agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The bytes for serviceAccountEmail.
- */
- @java.lang.Override
- public com.google.protobuf.ByteString getServiceAccountEmailBytes() {
- java.lang.Object ref = serviceAccountEmail_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- serviceAccountEmail_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -2005,12 +1752,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (state_ != com.google.pubsub.v1.CloudStorageConfig.State.STATE_UNSPECIFIED.getNumber()) {
output.writeEnum(9, state_);
}
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filenameDatetimeFormat_)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 10, filenameDatetimeFormat_);
- }
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 11, serviceAccountEmail_);
- }
getUnknownFields().writeTo(output);
}
@@ -2048,12 +1789,6 @@ public int getSerializedSize() {
if (state_ != com.google.pubsub.v1.CloudStorageConfig.State.STATE_UNSPECIFIED.getNumber()) {
size += com.google.protobuf.CodedOutputStream.computeEnumSize(9, state_);
}
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(filenameDatetimeFormat_)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, filenameDatetimeFormat_);
- }
- if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, serviceAccountEmail_);
- }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -2072,14 +1807,12 @@ public boolean equals(final java.lang.Object obj) {
if (!getBucket().equals(other.getBucket())) return false;
if (!getFilenamePrefix().equals(other.getFilenamePrefix())) return false;
if (!getFilenameSuffix().equals(other.getFilenameSuffix())) return false;
- if (!getFilenameDatetimeFormat().equals(other.getFilenameDatetimeFormat())) return false;
if (hasMaxDuration() != other.hasMaxDuration()) return false;
if (hasMaxDuration()) {
if (!getMaxDuration().equals(other.getMaxDuration())) return false;
}
if (getMaxBytes() != other.getMaxBytes()) return false;
if (state_ != other.state_) return false;
- if (!getServiceAccountEmail().equals(other.getServiceAccountEmail())) return false;
if (!getOutputFormatCase().equals(other.getOutputFormatCase())) return false;
switch (outputFormatCase_) {
case 4:
@@ -2108,8 +1841,6 @@ public int hashCode() {
hash = (53 * hash) + getFilenamePrefix().hashCode();
hash = (37 * hash) + FILENAME_SUFFIX_FIELD_NUMBER;
hash = (53 * hash) + getFilenameSuffix().hashCode();
- hash = (37 * hash) + FILENAME_DATETIME_FORMAT_FIELD_NUMBER;
- hash = (53 * hash) + getFilenameDatetimeFormat().hashCode();
if (hasMaxDuration()) {
hash = (37 * hash) + MAX_DURATION_FIELD_NUMBER;
hash = (53 * hash) + getMaxDuration().hashCode();
@@ -2118,8 +1849,6 @@ public int hashCode() {
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getMaxBytes());
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + state_;
- hash = (37 * hash) + SERVICE_ACCOUNT_EMAIL_FIELD_NUMBER;
- hash = (53 * hash) + getServiceAccountEmail().hashCode();
switch (outputFormatCase_) {
case 4:
hash = (37 * hash) + TEXT_CONFIG_FIELD_NUMBER;
@@ -2283,7 +2012,6 @@ public Builder clear() {
bucket_ = "";
filenamePrefix_ = "";
filenameSuffix_ = "";
- filenameDatetimeFormat_ = "";
if (textConfigBuilder_ != null) {
textConfigBuilder_.clear();
}
@@ -2297,7 +2025,6 @@ public Builder clear() {
}
maxBytes_ = 0L;
state_ = 0;
- serviceAccountEmail_ = "";
outputFormatCase_ = 0;
outputFormat_ = null;
return this;
@@ -2346,24 +2073,18 @@ private void buildPartial0(com.google.pubsub.v1.CloudStorageConfig result) {
if (((from_bitField0_ & 0x00000004) != 0)) {
result.filenameSuffix_ = filenameSuffix_;
}
- if (((from_bitField0_ & 0x00000008) != 0)) {
- result.filenameDatetimeFormat_ = filenameDatetimeFormat_;
- }
int to_bitField0_ = 0;
- if (((from_bitField0_ & 0x00000040) != 0)) {
+ if (((from_bitField0_ & 0x00000020) != 0)) {
result.maxDuration_ =
maxDurationBuilder_ == null ? maxDuration_ : maxDurationBuilder_.build();
to_bitField0_ |= 0x00000001;
}
- if (((from_bitField0_ & 0x00000080) != 0)) {
+ if (((from_bitField0_ & 0x00000040) != 0)) {
result.maxBytes_ = maxBytes_;
}
- if (((from_bitField0_ & 0x00000100) != 0)) {
+ if (((from_bitField0_ & 0x00000080) != 0)) {
result.state_ = state_;
}
- if (((from_bitField0_ & 0x00000200) != 0)) {
- result.serviceAccountEmail_ = serviceAccountEmail_;
- }
result.bitField0_ |= to_bitField0_;
}
@@ -2438,11 +2159,6 @@ public Builder mergeFrom(com.google.pubsub.v1.CloudStorageConfig other) {
bitField0_ |= 0x00000004;
onChanged();
}
- if (!other.getFilenameDatetimeFormat().isEmpty()) {
- filenameDatetimeFormat_ = other.filenameDatetimeFormat_;
- bitField0_ |= 0x00000008;
- onChanged();
- }
if (other.hasMaxDuration()) {
mergeMaxDuration(other.getMaxDuration());
}
@@ -2452,11 +2168,6 @@ public Builder mergeFrom(com.google.pubsub.v1.CloudStorageConfig other) {
if (other.state_ != 0) {
setStateValue(other.getStateValue());
}
- if (!other.getServiceAccountEmail().isEmpty()) {
- serviceAccountEmail_ = other.serviceAccountEmail_;
- bitField0_ |= 0x00000200;
- onChanged();
- }
switch (other.getOutputFormatCase()) {
case TEXT_CONFIG:
{
@@ -2532,33 +2243,21 @@ public Builder mergeFrom(
case 50:
{
input.readMessage(getMaxDurationFieldBuilder().getBuilder(), extensionRegistry);
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
break;
} // case 50
case 56:
{
maxBytes_ = input.readInt64();
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
break;
} // case 56
case 72:
{
state_ = input.readEnum();
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
break;
} // case 72
- case 82:
- {
- filenameDatetimeFormat_ = input.readStringRequireUtf8();
- bitField0_ |= 0x00000008;
- break;
- } // case 82
- case 90:
- {
- serviceAccountEmail_ = input.readStringRequireUtf8();
- bitField0_ |= 0x00000200;
- break;
- } // case 90
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -2940,122 +2639,6 @@ public Builder setFilenameSuffixBytes(com.google.protobuf.ByteString value) {
return this;
}
- private java.lang.Object filenameDatetimeFormat_ = "";
- /**
- *
- *
- *
- * Optional. User-provided format string specifying how to represent datetimes
- * in Cloud Storage filenames. See the [datetime format
- * guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- *
- *
- * string filename_datetime_format = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The filenameDatetimeFormat.
- */
- public java.lang.String getFilenameDatetimeFormat() {
- java.lang.Object ref = filenameDatetimeFormat_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- filenameDatetimeFormat_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
- /**
- *
- *
- *
- * Optional. User-provided format string specifying how to represent datetimes
- * in Cloud Storage filenames. See the [datetime format
- * guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- *
- *
- * string filename_datetime_format = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The bytes for filenameDatetimeFormat.
- */
- public com.google.protobuf.ByteString getFilenameDatetimeFormatBytes() {
- java.lang.Object ref = filenameDatetimeFormat_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- filenameDatetimeFormat_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
- /**
- *
- *
- *
- * Optional. User-provided format string specifying how to represent datetimes
- * in Cloud Storage filenames. See the [datetime format
- * guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- *
- *
- * string filename_datetime_format = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @param value The filenameDatetimeFormat to set.
- * @return This builder for chaining.
- */
- public Builder setFilenameDatetimeFormat(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- filenameDatetimeFormat_ = value;
- bitField0_ |= 0x00000008;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. User-provided format string specifying how to represent datetimes
- * in Cloud Storage filenames. See the [datetime format
- * guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- *
- *
- * string filename_datetime_format = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return This builder for chaining.
- */
- public Builder clearFilenameDatetimeFormat() {
- filenameDatetimeFormat_ = getDefaultInstance().getFilenameDatetimeFormat();
- bitField0_ = (bitField0_ & ~0x00000008);
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. User-provided format string specifying how to represent datetimes
- * in Cloud Storage filenames. See the [datetime format
- * guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- *
- *
- * string filename_datetime_format = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @param value The bytes for filenameDatetimeFormat to set.
- * @return This builder for chaining.
- */
- public Builder setFilenameDatetimeFormatBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
- filenameDatetimeFormat_ = value;
- bitField0_ |= 0x00000008;
- onChanged();
- return this;
- }
-
private com.google.protobuf.SingleFieldBuilderV3<
com.google.pubsub.v1.CloudStorageConfig.TextConfig,
com.google.pubsub.v1.CloudStorageConfig.TextConfig.Builder,
@@ -3551,7 +3134,7 @@ public com.google.pubsub.v1.CloudStorageConfig.AvroConfigOrBuilder getAvroConfig
* @return Whether the maxDuration field is set.
*/
public boolean hasMaxDuration() {
- return ((bitField0_ & 0x00000040) != 0);
+ return ((bitField0_ & 0x00000020) != 0);
}
/**
*
@@ -3597,7 +3180,7 @@ public Builder setMaxDuration(com.google.protobuf.Duration value) {
} else {
maxDurationBuilder_.setMessage(value);
}
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
onChanged();
return this;
}
@@ -3619,7 +3202,7 @@ public Builder setMaxDuration(com.google.protobuf.Duration.Builder builderForVal
} else {
maxDurationBuilder_.setMessage(builderForValue.build());
}
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
onChanged();
return this;
}
@@ -3637,7 +3220,7 @@ public Builder setMaxDuration(com.google.protobuf.Duration.Builder builderForVal
*/
public Builder mergeMaxDuration(com.google.protobuf.Duration value) {
if (maxDurationBuilder_ == null) {
- if (((bitField0_ & 0x00000040) != 0)
+ if (((bitField0_ & 0x00000020) != 0)
&& maxDuration_ != null
&& maxDuration_ != com.google.protobuf.Duration.getDefaultInstance()) {
getMaxDurationBuilder().mergeFrom(value);
@@ -3648,7 +3231,7 @@ public Builder mergeMaxDuration(com.google.protobuf.Duration value) {
maxDurationBuilder_.mergeFrom(value);
}
if (maxDuration_ != null) {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
onChanged();
}
return this;
@@ -3666,7 +3249,7 @@ public Builder mergeMaxDuration(com.google.protobuf.Duration value) {
*
*/
public Builder clearMaxDuration() {
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000020);
maxDuration_ = null;
if (maxDurationBuilder_ != null) {
maxDurationBuilder_.dispose();
@@ -3688,7 +3271,7 @@ public Builder clearMaxDuration() {
*
*/
public com.google.protobuf.Duration.Builder getMaxDurationBuilder() {
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000020;
onChanged();
return getMaxDurationFieldBuilder().getBuilder();
}
@@ -3777,7 +3360,7 @@ public long getMaxBytes() {
public Builder setMaxBytes(long value) {
maxBytes_ = value;
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000040;
onChanged();
return this;
}
@@ -3795,7 +3378,7 @@ public Builder setMaxBytes(long value) {
* @return This builder for chaining.
*/
public Builder clearMaxBytes() {
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000040);
maxBytes_ = 0L;
onChanged();
return this;
@@ -3837,7 +3420,7 @@ public int getStateValue() {
*/
public Builder setStateValue(int value) {
state_ = value;
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
onChanged();
return this;
}
@@ -3880,7 +3463,7 @@ public Builder setState(com.google.pubsub.v1.CloudStorageConfig.State value) {
if (value == null) {
throw new NullPointerException();
}
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000080;
state_ = value.getNumber();
onChanged();
return this;
@@ -3900,143 +3483,12 @@ public Builder setState(com.google.pubsub.v1.CloudStorageConfig.State value) {
* @return This builder for chaining.
*/
public Builder clearState() {
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000080);
state_ = 0;
onChanged();
return this;
}
- private java.lang.Object serviceAccountEmail_ = "";
- /**
- *
- *
- *
- * Optional. The service account to use to write to Cloud Storage. The
- * subscription creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub
- * [service agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The serviceAccountEmail.
- */
- public java.lang.String getServiceAccountEmail() {
- java.lang.Object ref = serviceAccountEmail_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- serviceAccountEmail_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to Cloud Storage. The
- * subscription creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub
- * [service agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The bytes for serviceAccountEmail.
- */
- public com.google.protobuf.ByteString getServiceAccountEmailBytes() {
- java.lang.Object ref = serviceAccountEmail_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
- serviceAccountEmail_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to Cloud Storage. The
- * subscription creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub
- * [service agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @param value The serviceAccountEmail to set.
- * @return This builder for chaining.
- */
- public Builder setServiceAccountEmail(java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- serviceAccountEmail_ = value;
- bitField0_ |= 0x00000200;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to Cloud Storage. The
- * subscription creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub
- * [service agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return This builder for chaining.
- */
- public Builder clearServiceAccountEmail() {
- serviceAccountEmail_ = getDefaultInstance().getServiceAccountEmail();
- bitField0_ = (bitField0_ & ~0x00000200);
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. The service account to use to write to Cloud Storage. The
- * subscription creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub
- * [service agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @param value The bytes for serviceAccountEmail to set.
- * @return This builder for chaining.
- */
- public Builder setServiceAccountEmailBytes(com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
- serviceAccountEmail_ = value;
- bitField0_ |= 0x00000200;
- onChanged();
- return this;
- }
-
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfigOrBuilder.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfigOrBuilder.java
index 11d3fa787..131d46624 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfigOrBuilder.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CloudStorageConfigOrBuilder.java
@@ -111,35 +111,6 @@ public interface CloudStorageConfigOrBuilder
*/
com.google.protobuf.ByteString getFilenameSuffixBytes();
- /**
- *
- *
- *
- * Optional. User-provided format string specifying how to represent datetimes
- * in Cloud Storage filenames. See the [datetime format
- * guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- *
- *
- * string filename_datetime_format = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The filenameDatetimeFormat.
- */
- java.lang.String getFilenameDatetimeFormat();
- /**
- *
- *
- *
- * Optional. User-provided format string specifying how to represent datetimes
- * in Cloud Storage filenames. See the [datetime format
- * guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- *
- *
- * string filename_datetime_format = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The bytes for filenameDatetimeFormat.
- */
- com.google.protobuf.ByteString getFilenameDatetimeFormatBytes();
-
/**
*
*
@@ -318,40 +289,5 @@ public interface CloudStorageConfigOrBuilder
*/
com.google.pubsub.v1.CloudStorageConfig.State getState();
- /**
- *
- *
- *
- * Optional. The service account to use to write to Cloud Storage. The
- * subscription creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub
- * [service agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The serviceAccountEmail.
- */
- java.lang.String getServiceAccountEmail();
- /**
- *
- *
- *
- * Optional. The service account to use to write to Cloud Storage. The
- * subscription creator or updater that specifies this field must have
- * `iam.serviceAccounts.actAs` permission on the service account. If not
- * specified, the Pub/Sub
- * [service agent](https://cloud.google.com/iam/docs/service-agents),
- * service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- *
- *
- * string service_account_email = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- * @return The bytes for serviceAccountEmail.
- */
- com.google.protobuf.ByteString getServiceAccountEmailBytes();
-
com.google.pubsub.v1.CloudStorageConfig.OutputFormatCase getOutputFormatCase();
}
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/IngestionDataSourceSettings.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/IngestionDataSourceSettings.java
index b56f85ee0..9d97d01d2 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/IngestionDataSourceSettings.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/IngestionDataSourceSettings.java
@@ -310,7 +310,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
*
*
* Permission denied encountered while publishing to the topic. This can
- * happen if the Pub/Sub SA has not been granted the [appropriate publish
+ * happen due to Pub/Sub SA has not been granted the [appropriate publish
* permissions](https://cloud.google.com/pubsub/docs/access-control#pubsub.publisher)
*
*
@@ -383,7 +383,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
*
*
* Permission denied encountered while publishing to the topic. This can
- * happen if the Pub/Sub SA has not been granted the [appropriate publish
+ * happen due to Pub/Sub SA has not been granted the [appropriate publish
* permissions](https://cloud.google.com/pubsub/docs/access-control#pubsub.publisher)
*
*
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java
index a80aaa209..f03334c1c 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java
@@ -417,242 +417,238 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "\032\017\n\rPubsubWrapper\032(\n\tNoWrapper\022\033\n\016write_"
+ "metadata\030\001 \001(\010B\003\340A\001\0321\n\017AttributesEntry\022\013"
+ "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\027\n\025authen"
- + "tication_methodB\t\n\007wrapper\"\216\003\n\016BigQueryC"
+ + "tication_methodB\t\n\007wrapper\"\352\002\n\016BigQueryC"
+ "onfig\022\022\n\005table\030\001 \001(\tB\003\340A\001\022\035\n\020use_topic_s"
+ "chema\030\002 \001(\010B\003\340A\001\022\033\n\016write_metadata\030\003 \001(\010"
+ "B\003\340A\001\022 \n\023drop_unknown_fields\030\004 \001(\010B\003\340A\001\022"
+ ":\n\005state\030\005 \001(\0162&.google.pubsub.v1.BigQue"
+ "ryConfig.StateB\003\340A\003\022\035\n\020use_table_schema\030"
- + "\006 \001(\010B\003\340A\001\022\"\n\025service_account_email\030\007 \001("
- + "\tB\003\340A\001\"\212\001\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022"
- + "\n\n\006ACTIVE\020\001\022\025\n\021PERMISSION_DENIED\020\002\022\r\n\tNO"
- + "T_FOUND\020\003\022\023\n\017SCHEMA_MISMATCH\020\004\022#\n\037IN_TRA"
- + "NSIT_LOCATION_RESTRICTION\020\005\"\316\005\n\022CloudSto"
- + "rageConfig\022\023\n\006bucket\030\001 \001(\tB\003\340A\002\022\034\n\017filen"
- + "ame_prefix\030\002 \001(\tB\003\340A\001\022\034\n\017filename_suffix"
- + "\030\003 \001(\tB\003\340A\001\022%\n\030filename_datetime_format\030"
- + "\n \001(\tB\003\340A\001\022K\n\013text_config\030\004 \001(\0132/.google"
- + ".pubsub.v1.CloudStorageConfig.TextConfig"
- + "B\003\340A\001H\000\022K\n\013avro_config\030\005 \001(\0132/.google.pu"
- + "bsub.v1.CloudStorageConfig.AvroConfigB\003\340"
- + "A\001H\000\0224\n\014max_duration\030\006 \001(\0132\031.google.prot"
- + "obuf.DurationB\003\340A\001\022\026\n\tmax_bytes\030\007 \001(\003B\003\340"
- + "A\001\022>\n\005state\030\t \001(\0162*.google.pubsub.v1.Clo"
- + "udStorageConfig.StateB\003\340A\003\022\"\n\025service_ac"
- + "count_email\030\013 \001(\tB\003\340A\001\032\014\n\nTextConfig\032H\n\n"
- + "AvroConfig\022\033\n\016write_metadata\030\001 \001(\010B\003\340A\001\022"
- + "\035\n\020use_topic_schema\030\002 \001(\010B\003\340A\001\"\212\001\n\005State"
- + "\022\025\n\021STATE_UNSPECIFIED\020\000\022\n\n\006ACTIVE\020\001\022\025\n\021P"
- + "ERMISSION_DENIED\020\002\022\r\n\tNOT_FOUND\020\003\022#\n\037IN_"
- + "TRANSIT_LOCATION_RESTRICTION\020\004\022\023\n\017SCHEMA"
- + "_MISMATCH\020\005B\017\n\routput_format\"|\n\017Received"
- + "Message\022\023\n\006ack_id\030\001 \001(\tB\003\340A\001\0225\n\007message\030"
- + "\002 \001(\0132\037.google.pubsub.v1.PubsubMessageB\003"
- + "\340A\001\022\035\n\020delivery_attempt\030\003 \001(\005B\003\340A\001\"Z\n\026Ge"
- + "tSubscriptionRequest\022@\n\014subscription\030\001 \001"
- + "(\tB*\340A\002\372A$\n\"pubsub.googleapis.com/Subscr"
- + "iption\"\214\001\n\031UpdateSubscriptionRequest\0229\n\014"
- + "subscription\030\001 \001(\0132\036.google.pubsub.v1.Su"
- + "bscriptionB\003\340A\002\0224\n\013update_mask\030\002 \001(\0132\032.g"
- + "oogle.protobuf.FieldMaskB\003\340A\002\"\221\001\n\030ListSu"
- + "bscriptionsRequest\022D\n\007project\030\001 \001(\tB3\340A\002"
- + "\372A-\n+cloudresourcemanager.googleapis.com"
- + "/Project\022\026\n\tpage_size\030\002 \001(\005B\003\340A\001\022\027\n\npage"
- + "_token\030\003 \001(\tB\003\340A\001\"u\n\031ListSubscriptionsRe"
- + "sponse\022:\n\rsubscriptions\030\001 \003(\0132\036.google.p"
- + "ubsub.v1.SubscriptionB\003\340A\001\022\034\n\017next_page_"
- + "token\030\002 \001(\tB\003\340A\001\"]\n\031DeleteSubscriptionRe"
- + "quest\022@\n\014subscription\030\001 \001(\tB*\340A\002\372A$\n\"pub"
- + "sub.googleapis.com/Subscription\"\223\001\n\027Modi"
- + "fyPushConfigRequest\022@\n\014subscription\030\001 \001("
- + "\tB*\340A\002\372A$\n\"pubsub.googleapis.com/Subscri"
- + "ption\0226\n\013push_config\030\002 \001(\0132\034.google.pubs"
- + "ub.v1.PushConfigB\003\340A\002\"\215\001\n\013PullRequest\022@\n"
- + "\014subscription\030\001 \001(\tB*\340A\002\372A$\n\"pubsub.goog"
- + "leapis.com/Subscription\022!\n\022return_immedi"
- + "ately\030\002 \001(\010B\005\030\001\340A\001\022\031\n\014max_messages\030\003 \001(\005"
- + "B\003\340A\002\"Q\n\014PullResponse\022A\n\021received_messag"
- + "es\030\001 \003(\0132!.google.pubsub.v1.ReceivedMess"
- + "ageB\003\340A\001\"\225\001\n\030ModifyAckDeadlineRequest\022@\n"
- + "\014subscription\030\001 \001(\tB*\340A\002\372A$\n\"pubsub.goog"
- + "leapis.com/Subscription\022\024\n\007ack_ids\030\004 \003(\t"
- + "B\003\340A\002\022!\n\024ack_deadline_seconds\030\003 \001(\005B\003\340A\002"
- + "\"l\n\022AcknowledgeRequest\022@\n\014subscription\030\001"
- + " \001(\tB*\340A\002\372A$\n\"pubsub.googleapis.com/Subs"
- + "cription\022\024\n\007ack_ids\030\002 \003(\tB\003\340A\002\"\307\002\n\024Strea"
- + "mingPullRequest\022@\n\014subscription\030\001 \001(\tB*\340"
+ + "\006 \001(\010B\003\340A\001\"\212\001\n\005State\022\025\n\021STATE_UNSPECIFIE"
+ + "D\020\000\022\n\n\006ACTIVE\020\001\022\025\n\021PERMISSION_DENIED\020\002\022\r"
+ + "\n\tNOT_FOUND\020\003\022\023\n\017SCHEMA_MISMATCH\020\004\022#\n\037IN"
+ + "_TRANSIT_LOCATION_RESTRICTION\020\005\"\316\004\n\022Clou"
+ + "dStorageConfig\022\023\n\006bucket\030\001 \001(\tB\003\340A\002\022\034\n\017f"
+ + "ilename_prefix\030\002 \001(\tB\003\340A\001\022\034\n\017filename_su"
+ + "ffix\030\003 \001(\tB\003\340A\001\022K\n\013text_config\030\004 \001(\0132/.g"
+ + "oogle.pubsub.v1.CloudStorageConfig.TextC"
+ + "onfigB\003\340A\001H\000\022K\n\013avro_config\030\005 \001(\0132/.goog"
+ + "le.pubsub.v1.CloudStorageConfig.AvroConf"
+ + "igB\003\340A\001H\000\0224\n\014max_duration\030\006 \001(\0132\031.google"
+ + ".protobuf.DurationB\003\340A\001\022\026\n\tmax_bytes\030\007 \001"
+ + "(\003B\003\340A\001\022>\n\005state\030\t \001(\0162*.google.pubsub.v"
+ + "1.CloudStorageConfig.StateB\003\340A\003\032\014\n\nTextC"
+ + "onfig\032)\n\nAvroConfig\022\033\n\016write_metadata\030\001 "
+ + "\001(\010B\003\340A\001\"u\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000"
+ + "\022\n\n\006ACTIVE\020\001\022\025\n\021PERMISSION_DENIED\020\002\022\r\n\tN"
+ + "OT_FOUND\020\003\022#\n\037IN_TRANSIT_LOCATION_RESTRI"
+ + "CTION\020\004B\017\n\routput_format\"|\n\017ReceivedMess"
+ + "age\022\023\n\006ack_id\030\001 \001(\tB\003\340A\001\0225\n\007message\030\002 \001("
+ + "\0132\037.google.pubsub.v1.PubsubMessageB\003\340A\001\022"
+ + "\035\n\020delivery_attempt\030\003 \001(\005B\003\340A\001\"Z\n\026GetSub"
+ + "scriptionRequest\022@\n\014subscription\030\001 \001(\tB*"
+ + "\340A\002\372A$\n\"pubsub.googleapis.com/Subscripti"
+ + "on\"\214\001\n\031UpdateSubscriptionRequest\0229\n\014subs"
+ + "cription\030\001 \001(\0132\036.google.pubsub.v1.Subscr"
+ + "iptionB\003\340A\002\0224\n\013update_mask\030\002 \001(\0132\032.googl"
+ + "e.protobuf.FieldMaskB\003\340A\002\"\221\001\n\030ListSubscr"
+ + "iptionsRequest\022D\n\007project\030\001 \001(\tB3\340A\002\372A-\n"
+ + "+cloudresourcemanager.googleapis.com/Pro"
+ + "ject\022\026\n\tpage_size\030\002 \001(\005B\003\340A\001\022\027\n\npage_tok"
+ + "en\030\003 \001(\tB\003\340A\001\"u\n\031ListSubscriptionsRespon"
+ + "se\022:\n\rsubscriptions\030\001 \003(\0132\036.google.pubsu"
+ + "b.v1.SubscriptionB\003\340A\001\022\034\n\017next_page_toke"
+ + "n\030\002 \001(\tB\003\340A\001\"]\n\031DeleteSubscriptionReques"
+ + "t\022@\n\014subscription\030\001 \001(\tB*\340A\002\372A$\n\"pubsub."
+ + "googleapis.com/Subscription\"\223\001\n\027ModifyPu"
+ + "shConfigRequest\022@\n\014subscription\030\001 \001(\tB*\340"
+ "A\002\372A$\n\"pubsub.googleapis.com/Subscriptio"
- + "n\022\024\n\007ack_ids\030\002 \003(\tB\003\340A\001\022$\n\027modify_deadli"
- + "ne_seconds\030\003 \003(\005B\003\340A\001\022$\n\027modify_deadline"
- + "_ack_ids\030\004 \003(\tB\003\340A\001\022(\n\033stream_ack_deadli"
- + "ne_seconds\030\005 \001(\005B\003\340A\002\022\026\n\tclient_id\030\006 \001(\t"
- + "B\003\340A\001\022%\n\030max_outstanding_messages\030\007 \001(\003B"
- + "\003\340A\001\022\"\n\025max_outstanding_bytes\030\010 \001(\003B\003\340A\001"
- + "\"\236\006\n\025StreamingPullResponse\022A\n\021received_m"
- + "essages\030\001 \003(\0132!.google.pubsub.v1.Receive"
- + "dMessageB\003\340A\001\022f\n\030acknowledge_confirmatio"
- + "n\030\005 \001(\0132?.google.pubsub.v1.StreamingPull"
- + "Response.AcknowledgeConfirmationB\003\340A\001\022t\n"
- + " modify_ack_deadline_confirmation\030\003 \001(\0132"
- + "E.google.pubsub.v1.StreamingPullResponse"
- + ".ModifyAckDeadlineConfirmationB\003\340A\001\022d\n\027s"
- + "ubscription_properties\030\004 \001(\0132>.google.pu"
- + "bsub.v1.StreamingPullResponse.Subscripti"
- + "onPropertiesB\003\340A\001\032\224\001\n\027AcknowledgeConfirm"
- + "ation\022\024\n\007ack_ids\030\001 \003(\tB\003\340A\001\022\034\n\017invalid_a"
- + "ck_ids\030\002 \003(\tB\003\340A\001\022\036\n\021unordered_ack_ids\030\003"
- + " \003(\tB\003\340A\001\022%\n\030temporary_failed_ack_ids\030\004 "
- + "\003(\tB\003\340A\001\032z\n\035ModifyAckDeadlineConfirmatio"
- + "n\022\024\n\007ack_ids\030\001 \003(\tB\003\340A\001\022\034\n\017invalid_ack_i"
- + "ds\030\002 \003(\tB\003\340A\001\022%\n\030temporary_failed_ack_id"
- + "s\030\003 \003(\tB\003\340A\001\032k\n\026SubscriptionProperties\022*"
- + "\n\035exactly_once_delivery_enabled\030\001 \001(\010B\003\340"
- + "A\001\022%\n\030message_ordering_enabled\030\002 \001(\010B\003\340A"
- + "\001\"\210\002\n\025CreateSnapshotRequest\0224\n\004name\030\001 \001("
- + "\tB&\340A\002\372A \n\036pubsub.googleapis.com/Snapsho"
- + "t\022@\n\014subscription\030\002 \001(\tB*\340A\002\372A$\n\"pubsub."
- + "googleapis.com/Subscription\022H\n\006labels\030\003 "
- + "\003(\01323.google.pubsub.v1.CreateSnapshotReq"
- + "uest.LabelsEntryB\003\340A\001\032-\n\013LabelsEntry\022\013\n\003"
- + "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\200\001\n\025UpdateS"
- + "napshotRequest\0221\n\010snapshot\030\001 \001(\0132\032.googl"
- + "e.pubsub.v1.SnapshotB\003\340A\002\0224\n\013update_mask"
- + "\030\002 \001(\0132\032.google.protobuf.FieldMaskB\003\340A\002\""
- + "\301\002\n\010Snapshot\022\021\n\004name\030\001 \001(\tB\003\340A\001\0222\n\005topic"
- + "\030\002 \001(\tB#\340A\001\372A\035\n\033pubsub.googleapis.com/To"
- + "pic\0224\n\013expire_time\030\003 \001(\0132\032.google.protob"
- + "uf.TimestampB\003\340A\001\022;\n\006labels\030\004 \003(\0132&.goog"
- + "le.pubsub.v1.Snapshot.LabelsEntryB\003\340A\001\032-"
- + "\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001("
- + "\t:\0028\001:L\352AI\n\036pubsub.googleapis.com/Snapsh"
- + "ot\022\'projects/{project}/snapshots/{snapsh"
- + "ot}\"N\n\022GetSnapshotRequest\0228\n\010snapshot\030\001 "
- + "\001(\tB&\340A\002\372A \n\036pubsub.googleapis.com/Snaps"
- + "hot\"\215\001\n\024ListSnapshotsRequest\022D\n\007project\030"
- + "\001 \001(\tB3\340A\002\372A-\n+cloudresourcemanager.goog"
- + "leapis.com/Project\022\026\n\tpage_size\030\002 \001(\005B\003\340"
- + "A\001\022\027\n\npage_token\030\003 \001(\tB\003\340A\001\"i\n\025ListSnaps"
- + "hotsResponse\0222\n\tsnapshots\030\001 \003(\0132\032.google"
- + ".pubsub.v1.SnapshotB\003\340A\001\022\034\n\017next_page_to"
- + "ken\030\002 \001(\tB\003\340A\001\"Q\n\025DeleteSnapshotRequest\022"
- + "8\n\010snapshot\030\001 \001(\tB&\340A\002\372A \n\036pubsub.google"
- + "apis.com/Snapshot\"\306\001\n\013SeekRequest\022@\n\014sub"
+ + "n\0226\n\013push_config\030\002 \001(\0132\034.google.pubsub.v"
+ + "1.PushConfigB\003\340A\002\"\215\001\n\013PullRequest\022@\n\014sub"
+ + "scription\030\001 \001(\tB*\340A\002\372A$\n\"pubsub.googleap"
+ + "is.com/Subscription\022!\n\022return_immediatel"
+ + "y\030\002 \001(\010B\005\030\001\340A\001\022\031\n\014max_messages\030\003 \001(\005B\003\340A"
+ + "\002\"Q\n\014PullResponse\022A\n\021received_messages\030\001"
+ + " \003(\0132!.google.pubsub.v1.ReceivedMessageB"
+ + "\003\340A\001\"\225\001\n\030ModifyAckDeadlineRequest\022@\n\014sub"
+ "scription\030\001 \001(\tB*\340A\002\372A$\n\"pubsub.googleap"
- + "is.com/Subscription\022/\n\004time\030\002 \001(\0132\032.goog"
- + "le.protobuf.TimestampB\003\340A\001H\000\022:\n\010snapshot"
- + "\030\003 \001(\tB&\340A\001\372A \n\036pubsub.googleapis.com/Sn"
- + "apshotH\000B\010\n\006target\"\016\n\014SeekResponse2\270\013\n\tP"
- + "ublisher\022q\n\013CreateTopic\022\027.google.pubsub."
- + "v1.Topic\032\027.google.pubsub.v1.Topic\"0\332A\004na"
- + "me\202\323\344\223\002#\032\036/v1/{name=projects/*/topics/*}"
- + ":\001*\022\221\001\n\013UpdateTopic\022$.google.pubsub.v1.U"
- + "pdateTopicRequest\032\027.google.pubsub.v1.Top"
- + "ic\"C\332A\021topic,update_mask\202\323\344\223\002)2$/v1/{top"
- + "ic.name=projects/*/topics/*}:\001*\022\223\001\n\007Publ"
- + "ish\022 .google.pubsub.v1.PublishRequest\032!."
- + "google.pubsub.v1.PublishResponse\"C\332A\016top"
- + "ic,messages\202\323\344\223\002,\"\'/v1/{topic=projects/*"
- + "/topics/*}:publish:\001*\022w\n\010GetTopic\022!.goog"
- + "le.pubsub.v1.GetTopicRequest\032\027.google.pu"
- + "bsub.v1.Topic\"/\332A\005topic\202\323\344\223\002!\022\037/v1/{topi"
- + "c=projects/*/topics/*}\022\212\001\n\nListTopics\022#."
- + "google.pubsub.v1.ListTopicsRequest\032$.goo"
- + "gle.pubsub.v1.ListTopicsResponse\"1\332A\007pro"
- + "ject\202\323\344\223\002!\022\037/v1/{project=projects/*}/top"
- + "ics\022\272\001\n\026ListTopicSubscriptions\022/.google."
- + "pubsub.v1.ListTopicSubscriptionsRequest\032"
- + "0.google.pubsub.v1.ListTopicSubscription"
- + "sResponse\"=\332A\005topic\202\323\344\223\002/\022-/v1/{topic=pr"
- + "ojects/*/topics/*}/subscriptions\022\252\001\n\022Lis"
- + "tTopicSnapshots\022+.google.pubsub.v1.ListT"
- + "opicSnapshotsRequest\032,.google.pubsub.v1."
- + "ListTopicSnapshotsResponse\"9\332A\005topic\202\323\344\223"
- + "\002+\022)/v1/{topic=projects/*/topics/*}/snap"
- + "shots\022|\n\013DeleteTopic\022$.google.pubsub.v1."
- + "DeleteTopicRequest\032\026.google.protobuf.Emp"
- + "ty\"/\332A\005topic\202\323\344\223\002!*\037/v1/{topic=projects/"
- + "*/topics/*}\022\255\001\n\022DetachSubscription\022+.goo"
- + "gle.pubsub.v1.DetachSubscriptionRequest\032"
- + ",.google.pubsub.v1.DetachSubscriptionRes"
- + "ponse\"<\202\323\344\223\0026\"4/v1/{subscription=project"
- + "s/*/subscriptions/*}:detach\032p\312A\025pubsub.g"
- + "oogleapis.com\322AUhttps://www.googleapis.c"
- + "om/auth/cloud-platform,https://www.googl"
- + "eapis.com/auth/pubsub2\322\025\n\nSubscriber\022\264\001\n"
- + "\022CreateSubscription\022\036.google.pubsub.v1.S"
- + "ubscription\032\036.google.pubsub.v1.Subscript"
- + "ion\"^\332A+name,topic,push_config,ack_deadl"
- + "ine_seconds\202\323\344\223\002*\032%/v1/{name=projects/*/"
- + "subscriptions/*}:\001*\022\241\001\n\017GetSubscription\022"
- + "(.google.pubsub.v1.GetSubscriptionReques"
- + "t\032\036.google.pubsub.v1.Subscription\"D\332A\014su"
- + "bscription\202\323\344\223\002/\022-/v1/{subscription=proj"
- + "ects/*/subscriptions/*}\022\273\001\n\022UpdateSubscr"
- + "iption\022+.google.pubsub.v1.UpdateSubscrip"
- + "tionRequest\032\036.google.pubsub.v1.Subscript"
- + "ion\"X\332A\030subscription,update_mask\202\323\344\223\002722"
- + "/v1/{subscription.name=projects/*/subscr"
- + "iptions/*}:\001*\022\246\001\n\021ListSubscriptions\022*.go"
- + "ogle.pubsub.v1.ListSubscriptionsRequest\032"
- + "+.google.pubsub.v1.ListSubscriptionsResp"
- + "onse\"8\332A\007project\202\323\344\223\002(\022&/v1/{project=pro"
- + "jects/*}/subscriptions\022\237\001\n\022DeleteSubscri"
- + "ption\022+.google.pubsub.v1.DeleteSubscript"
- + "ionRequest\032\026.google.protobuf.Empty\"D\332A\014s"
- + "ubscription\202\323\344\223\002/*-/v1/{subscription=pro"
- + "jects/*/subscriptions/*}\022\317\001\n\021ModifyAckDe"
- + "adline\022*.google.pubsub.v1.ModifyAckDeadl"
- + "ineRequest\032\026.google.protobuf.Empty\"v\332A)s"
- + "ubscription,ack_ids,ack_deadline_seconds"
- + "\202\323\344\223\002D\"?/v1/{subscription=projects/*/sub"
- + "scriptions/*}:modifyAckDeadline:\001*\022\250\001\n\013A"
- + "cknowledge\022$.google.pubsub.v1.Acknowledg"
- + "eRequest\032\026.google.protobuf.Empty\"[\332A\024sub"
- + "scription,ack_ids\202\323\344\223\002>\"9/v1/{subscripti"
- + "on=projects/*/subscriptions/*}:acknowled"
- + "ge:\001*\022\320\001\n\004Pull\022\035.google.pubsub.v1.PullRe"
- + "quest\032\036.google.pubsub.v1.PullResponse\"\210\001"
- + "\332A,subscription,return_immediately,max_m"
- + "essages\332A\031subscription,max_messages\202\323\344\223\002"
- + "7\"2/v1/{subscription=projects/*/subscrip"
- + "tions/*}:pull:\001*\022f\n\rStreamingPull\022&.goog"
- + "le.pubsub.v1.StreamingPullRequest\032\'.goog"
- + "le.pubsub.v1.StreamingPullResponse\"\000(\0010\001"
- + "\022\273\001\n\020ModifyPushConfig\022).google.pubsub.v1"
- + ".ModifyPushConfigRequest\032\026.google.protob"
- + "uf.Empty\"d\332A\030subscription,push_config\202\323\344"
- + "\223\002C\">/v1/{subscription=projects/*/subscr"
- + "iptions/*}:modifyPushConfig:\001*\022\211\001\n\013GetSn"
- + "apshot\022$.google.pubsub.v1.GetSnapshotReq"
- + "uest\032\032.google.pubsub.v1.Snapshot\"8\332A\010sna"
- + "pshot\202\323\344\223\002\'\022%/v1/{snapshot=projects/*/sn"
- + "apshots/*}\022\226\001\n\rListSnapshots\022&.google.pu"
- + "bsub.v1.ListSnapshotsRequest\032\'.google.pu"
- + "bsub.v1.ListSnapshotsResponse\"4\332A\007projec"
- + "t\202\323\344\223\002$\022\"/v1/{project=projects/*}/snapsh"
- + "ots\022\227\001\n\016CreateSnapshot\022\'.google.pubsub.v"
- + "1.CreateSnapshotRequest\032\032.google.pubsub."
- + "v1.Snapshot\"@\332A\021name,subscription\202\323\344\223\002&\032"
- + "!/v1/{name=projects/*/snapshots/*}:\001*\022\243\001"
- + "\n\016UpdateSnapshot\022\'.google.pubsub.v1.Upda"
- + "teSnapshotRequest\032\032.google.pubsub.v1.Sna"
- + "pshot\"L\332A\024snapshot,update_mask\202\323\344\223\002/2*/v"
- + "1/{snapshot.name=projects/*/snapshots/*}"
- + ":\001*\022\213\001\n\016DeleteSnapshot\022\'.google.pubsub.v"
- + "1.DeleteSnapshotRequest\032\026.google.protobu"
- + "f.Empty\"8\332A\010snapshot\202\323\344\223\002\'*%/v1/{snapsho"
- + "t=projects/*/snapshots/*}\022\204\001\n\004Seek\022\035.goo"
- + "gle.pubsub.v1.SeekRequest\032\036.google.pubsu"
- + "b.v1.SeekResponse\"=\202\323\344\223\0027\"2/v1/{subscrip"
- + "tion=projects/*/subscriptions/*}:seek:\001*"
- + "\032p\312A\025pubsub.googleapis.com\322AUhttps://www"
- + ".googleapis.com/auth/cloud-platform,http"
- + "s://www.googleapis.com/auth/pubsubB\252\001\n\024c"
- + "om.google.pubsub.v1B\013PubsubProtoP\001Z2clou"
- + "d.google.com/go/pubsub/apiv1/pubsubpb;pu"
- + "bsubpb\370\001\001\252\002\026Google.Cloud.PubSub.V1\312\002\026Goo"
- + "gle\\Cloud\\PubSub\\V1\352\002\031Google::Cloud::Pub"
- + "Sub::V1b\006proto3"
+ + "is.com/Subscription\022\024\n\007ack_ids\030\004 \003(\tB\003\340A"
+ + "\002\022!\n\024ack_deadline_seconds\030\003 \001(\005B\003\340A\002\"l\n\022"
+ + "AcknowledgeRequest\022@\n\014subscription\030\001 \001(\t"
+ + "B*\340A\002\372A$\n\"pubsub.googleapis.com/Subscrip"
+ + "tion\022\024\n\007ack_ids\030\002 \003(\tB\003\340A\002\"\307\002\n\024Streaming"
+ + "PullRequest\022@\n\014subscription\030\001 \001(\tB*\340A\002\372A"
+ + "$\n\"pubsub.googleapis.com/Subscription\022\024\n"
+ + "\007ack_ids\030\002 \003(\tB\003\340A\001\022$\n\027modify_deadline_s"
+ + "econds\030\003 \003(\005B\003\340A\001\022$\n\027modify_deadline_ack"
+ + "_ids\030\004 \003(\tB\003\340A\001\022(\n\033stream_ack_deadline_s"
+ + "econds\030\005 \001(\005B\003\340A\002\022\026\n\tclient_id\030\006 \001(\tB\003\340A"
+ + "\001\022%\n\030max_outstanding_messages\030\007 \001(\003B\003\340A\001"
+ + "\022\"\n\025max_outstanding_bytes\030\010 \001(\003B\003\340A\001\"\236\006\n"
+ + "\025StreamingPullResponse\022A\n\021received_messa"
+ + "ges\030\001 \003(\0132!.google.pubsub.v1.ReceivedMes"
+ + "sageB\003\340A\001\022f\n\030acknowledge_confirmation\030\005 "
+ + "\001(\0132?.google.pubsub.v1.StreamingPullResp"
+ + "onse.AcknowledgeConfirmationB\003\340A\001\022t\n mod"
+ + "ify_ack_deadline_confirmation\030\003 \001(\0132E.go"
+ + "ogle.pubsub.v1.StreamingPullResponse.Mod"
+ + "ifyAckDeadlineConfirmationB\003\340A\001\022d\n\027subsc"
+ + "ription_properties\030\004 \001(\0132>.google.pubsub"
+ + ".v1.StreamingPullResponse.SubscriptionPr"
+ + "opertiesB\003\340A\001\032\224\001\n\027AcknowledgeConfirmatio"
+ + "n\022\024\n\007ack_ids\030\001 \003(\tB\003\340A\001\022\034\n\017invalid_ack_i"
+ + "ds\030\002 \003(\tB\003\340A\001\022\036\n\021unordered_ack_ids\030\003 \003(\t"
+ + "B\003\340A\001\022%\n\030temporary_failed_ack_ids\030\004 \003(\tB"
+ + "\003\340A\001\032z\n\035ModifyAckDeadlineConfirmation\022\024\n"
+ + "\007ack_ids\030\001 \003(\tB\003\340A\001\022\034\n\017invalid_ack_ids\030\002"
+ + " \003(\tB\003\340A\001\022%\n\030temporary_failed_ack_ids\030\003 "
+ + "\003(\tB\003\340A\001\032k\n\026SubscriptionProperties\022*\n\035ex"
+ + "actly_once_delivery_enabled\030\001 \001(\010B\003\340A\001\022%"
+ + "\n\030message_ordering_enabled\030\002 \001(\010B\003\340A\001\"\210\002"
+ + "\n\025CreateSnapshotRequest\0224\n\004name\030\001 \001(\tB&\340"
+ + "A\002\372A \n\036pubsub.googleapis.com/Snapshot\022@\n"
+ + "\014subscription\030\002 \001(\tB*\340A\002\372A$\n\"pubsub.goog"
+ + "leapis.com/Subscription\022H\n\006labels\030\003 \003(\0132"
+ + "3.google.pubsub.v1.CreateSnapshotRequest"
+ + ".LabelsEntryB\003\340A\001\032-\n\013LabelsEntry\022\013\n\003key\030"
+ + "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\200\001\n\025UpdateSnaps"
+ + "hotRequest\0221\n\010snapshot\030\001 \001(\0132\032.google.pu"
+ + "bsub.v1.SnapshotB\003\340A\002\0224\n\013update_mask\030\002 \001"
+ + "(\0132\032.google.protobuf.FieldMaskB\003\340A\002\"\301\002\n\010"
+ + "Snapshot\022\021\n\004name\030\001 \001(\tB\003\340A\001\0222\n\005topic\030\002 \001"
+ + "(\tB#\340A\001\372A\035\n\033pubsub.googleapis.com/Topic\022"
+ + "4\n\013expire_time\030\003 \001(\0132\032.google.protobuf.T"
+ + "imestampB\003\340A\001\022;\n\006labels\030\004 \003(\0132&.google.p"
+ + "ubsub.v1.Snapshot.LabelsEntryB\003\340A\001\032-\n\013La"
+ + "belsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028"
+ + "\001:L\352AI\n\036pubsub.googleapis.com/Snapshot\022\'"
+ + "projects/{project}/snapshots/{snapshot}\""
+ + "N\n\022GetSnapshotRequest\0228\n\010snapshot\030\001 \001(\tB"
+ + "&\340A\002\372A \n\036pubsub.googleapis.com/Snapshot\""
+ + "\215\001\n\024ListSnapshotsRequest\022D\n\007project\030\001 \001("
+ + "\tB3\340A\002\372A-\n+cloudresourcemanager.googleap"
+ + "is.com/Project\022\026\n\tpage_size\030\002 \001(\005B\003\340A\001\022\027"
+ + "\n\npage_token\030\003 \001(\tB\003\340A\001\"i\n\025ListSnapshots"
+ + "Response\0222\n\tsnapshots\030\001 \003(\0132\032.google.pub"
+ + "sub.v1.SnapshotB\003\340A\001\022\034\n\017next_page_token\030"
+ + "\002 \001(\tB\003\340A\001\"Q\n\025DeleteSnapshotRequest\0228\n\010s"
+ + "napshot\030\001 \001(\tB&\340A\002\372A \n\036pubsub.googleapis"
+ + ".com/Snapshot\"\306\001\n\013SeekRequest\022@\n\014subscri"
+ + "ption\030\001 \001(\tB*\340A\002\372A$\n\"pubsub.googleapis.c"
+ + "om/Subscription\022/\n\004time\030\002 \001(\0132\032.google.p"
+ + "rotobuf.TimestampB\003\340A\001H\000\022:\n\010snapshot\030\003 \001"
+ + "(\tB&\340A\001\372A \n\036pubsub.googleapis.com/Snapsh"
+ + "otH\000B\010\n\006target\"\016\n\014SeekResponse2\270\013\n\tPubli"
+ + "sher\022q\n\013CreateTopic\022\027.google.pubsub.v1.T"
+ + "opic\032\027.google.pubsub.v1.Topic\"0\332A\004name\202\323"
+ + "\344\223\002#\032\036/v1/{name=projects/*/topics/*}:\001*\022"
+ + "\221\001\n\013UpdateTopic\022$.google.pubsub.v1.Updat"
+ + "eTopicRequest\032\027.google.pubsub.v1.Topic\"C"
+ + "\332A\021topic,update_mask\202\323\344\223\002)2$/v1/{topic.n"
+ + "ame=projects/*/topics/*}:\001*\022\223\001\n\007Publish\022"
+ + " .google.pubsub.v1.PublishRequest\032!.goog"
+ + "le.pubsub.v1.PublishResponse\"C\332A\016topic,m"
+ + "essages\202\323\344\223\002,\"\'/v1/{topic=projects/*/top"
+ + "ics/*}:publish:\001*\022w\n\010GetTopic\022!.google.p"
+ + "ubsub.v1.GetTopicRequest\032\027.google.pubsub"
+ + ".v1.Topic\"/\332A\005topic\202\323\344\223\002!\022\037/v1/{topic=pr"
+ + "ojects/*/topics/*}\022\212\001\n\nListTopics\022#.goog"
+ + "le.pubsub.v1.ListTopicsRequest\032$.google."
+ + "pubsub.v1.ListTopicsResponse\"1\332A\007project"
+ + "\202\323\344\223\002!\022\037/v1/{project=projects/*}/topics\022"
+ + "\272\001\n\026ListTopicSubscriptions\022/.google.pubs"
+ + "ub.v1.ListTopicSubscriptionsRequest\0320.go"
+ + "ogle.pubsub.v1.ListTopicSubscriptionsRes"
+ + "ponse\"=\332A\005topic\202\323\344\223\002/\022-/v1/{topic=projec"
+ + "ts/*/topics/*}/subscriptions\022\252\001\n\022ListTop"
+ + "icSnapshots\022+.google.pubsub.v1.ListTopic"
+ + "SnapshotsRequest\032,.google.pubsub.v1.List"
+ + "TopicSnapshotsResponse\"9\332A\005topic\202\323\344\223\002+\022)"
+ + "/v1/{topic=projects/*/topics/*}/snapshot"
+ + "s\022|\n\013DeleteTopic\022$.google.pubsub.v1.Dele"
+ + "teTopicRequest\032\026.google.protobuf.Empty\"/"
+ + "\332A\005topic\202\323\344\223\002!*\037/v1/{topic=projects/*/to"
+ + "pics/*}\022\255\001\n\022DetachSubscription\022+.google."
+ + "pubsub.v1.DetachSubscriptionRequest\032,.go"
+ + "ogle.pubsub.v1.DetachSubscriptionRespons"
+ + "e\"<\202\323\344\223\0026\"4/v1/{subscription=projects/*/"
+ + "subscriptions/*}:detach\032p\312A\025pubsub.googl"
+ + "eapis.com\322AUhttps://www.googleapis.com/a"
+ + "uth/cloud-platform,https://www.googleapi"
+ + "s.com/auth/pubsub2\322\025\n\nSubscriber\022\264\001\n\022Cre"
+ + "ateSubscription\022\036.google.pubsub.v1.Subsc"
+ + "ription\032\036.google.pubsub.v1.Subscription\""
+ + "^\332A+name,topic,push_config,ack_deadline_"
+ + "seconds\202\323\344\223\002*\032%/v1/{name=projects/*/subs"
+ + "criptions/*}:\001*\022\241\001\n\017GetSubscription\022(.go"
+ + "ogle.pubsub.v1.GetSubscriptionRequest\032\036."
+ + "google.pubsub.v1.Subscription\"D\332A\014subscr"
+ + "iption\202\323\344\223\002/\022-/v1/{subscription=projects"
+ + "/*/subscriptions/*}\022\273\001\n\022UpdateSubscripti"
+ + "on\022+.google.pubsub.v1.UpdateSubscription"
+ + "Request\032\036.google.pubsub.v1.Subscription\""
+ + "X\332A\030subscription,update_mask\202\323\344\223\002722/v1/"
+ + "{subscription.name=projects/*/subscripti"
+ + "ons/*}:\001*\022\246\001\n\021ListSubscriptions\022*.google"
+ + ".pubsub.v1.ListSubscriptionsRequest\032+.go"
+ + "ogle.pubsub.v1.ListSubscriptionsResponse"
+ + "\"8\332A\007project\202\323\344\223\002(\022&/v1/{project=project"
+ + "s/*}/subscriptions\022\237\001\n\022DeleteSubscriptio"
+ + "n\022+.google.pubsub.v1.DeleteSubscriptionR"
+ + "equest\032\026.google.protobuf.Empty\"D\332A\014subsc"
+ + "ription\202\323\344\223\002/*-/v1/{subscription=project"
+ + "s/*/subscriptions/*}\022\317\001\n\021ModifyAckDeadli"
+ + "ne\022*.google.pubsub.v1.ModifyAckDeadlineR"
+ + "equest\032\026.google.protobuf.Empty\"v\332A)subsc"
+ + "ription,ack_ids,ack_deadline_seconds\202\323\344\223"
+ + "\002D\"?/v1/{subscription=projects/*/subscri"
+ + "ptions/*}:modifyAckDeadline:\001*\022\250\001\n\013Ackno"
+ + "wledge\022$.google.pubsub.v1.AcknowledgeReq"
+ + "uest\032\026.google.protobuf.Empty\"[\332A\024subscri"
+ + "ption,ack_ids\202\323\344\223\002>\"9/v1/{subscription=p"
+ + "rojects/*/subscriptions/*}:acknowledge:\001"
+ + "*\022\320\001\n\004Pull\022\035.google.pubsub.v1.PullReques"
+ + "t\032\036.google.pubsub.v1.PullResponse\"\210\001\332A,s"
+ + "ubscription,return_immediately,max_messa"
+ + "ges\332A\031subscription,max_messages\202\323\344\223\0027\"2/"
+ + "v1/{subscription=projects/*/subscription"
+ + "s/*}:pull:\001*\022f\n\rStreamingPull\022&.google.p"
+ + "ubsub.v1.StreamingPullRequest\032\'.google.p"
+ + "ubsub.v1.StreamingPullResponse\"\000(\0010\001\022\273\001\n"
+ + "\020ModifyPushConfig\022).google.pubsub.v1.Mod"
+ + "ifyPushConfigRequest\032\026.google.protobuf.E"
+ + "mpty\"d\332A\030subscription,push_config\202\323\344\223\002C\""
+ + ">/v1/{subscription=projects/*/subscripti"
+ + "ons/*}:modifyPushConfig:\001*\022\211\001\n\013GetSnapsh"
+ + "ot\022$.google.pubsub.v1.GetSnapshotRequest"
+ + "\032\032.google.pubsub.v1.Snapshot\"8\332A\010snapsho"
+ + "t\202\323\344\223\002\'\022%/v1/{snapshot=projects/*/snapsh"
+ + "ots/*}\022\226\001\n\rListSnapshots\022&.google.pubsub"
+ + ".v1.ListSnapshotsRequest\032\'.google.pubsub"
+ + ".v1.ListSnapshotsResponse\"4\332A\007project\202\323\344"
+ + "\223\002$\022\"/v1/{project=projects/*}/snapshots\022"
+ + "\227\001\n\016CreateSnapshot\022\'.google.pubsub.v1.Cr"
+ + "eateSnapshotRequest\032\032.google.pubsub.v1.S"
+ + "napshot\"@\332A\021name,subscription\202\323\344\223\002&\032!/v1"
+ + "/{name=projects/*/snapshots/*}:\001*\022\243\001\n\016Up"
+ + "dateSnapshot\022\'.google.pubsub.v1.UpdateSn"
+ + "apshotRequest\032\032.google.pubsub.v1.Snapsho"
+ + "t\"L\332A\024snapshot,update_mask\202\323\344\223\002/2*/v1/{s"
+ + "napshot.name=projects/*/snapshots/*}:\001*\022"
+ + "\213\001\n\016DeleteSnapshot\022\'.google.pubsub.v1.De"
+ + "leteSnapshotRequest\032\026.google.protobuf.Em"
+ + "pty\"8\332A\010snapshot\202\323\344\223\002\'*%/v1/{snapshot=pr"
+ + "ojects/*/snapshots/*}\022\204\001\n\004Seek\022\035.google."
+ + "pubsub.v1.SeekRequest\032\036.google.pubsub.v1"
+ + ".SeekResponse\"=\202\323\344\223\0027\"2/v1/{subscription"
+ + "=projects/*/subscriptions/*}:seek:\001*\032p\312A"
+ + "\025pubsub.googleapis.com\322AUhttps://www.goo"
+ + "gleapis.com/auth/cloud-platform,https://"
+ + "www.googleapis.com/auth/pubsubB\252\001\n\024com.g"
+ + "oogle.pubsub.v1B\013PubsubProtoP\001Z2cloud.go"
+ + "ogle.com/go/pubsub/apiv1/pubsubpb;pubsub"
+ + "pb\370\001\001\252\002\026Google.Cloud.PubSub.V1\312\002\026Google\\"
+ + "Cloud\\PubSub\\V1\352\002\031Google::Cloud::PubSub:"
+ + ":V1b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -956,7 +952,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"DropUnknownFields",
"State",
"UseTableSchema",
- "ServiceAccountEmail",
});
internal_static_google_pubsub_v1_CloudStorageConfig_descriptor =
getDescriptor().getMessageTypes().get(24);
@@ -967,13 +962,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"Bucket",
"FilenamePrefix",
"FilenameSuffix",
- "FilenameDatetimeFormat",
"TextConfig",
"AvroConfig",
"MaxDuration",
"MaxBytes",
"State",
- "ServiceAccountEmail",
"OutputFormat",
});
internal_static_google_pubsub_v1_CloudStorageConfig_TextConfig_descriptor =
@@ -988,7 +981,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_pubsub_v1_CloudStorageConfig_AvroConfig_descriptor,
new java.lang.String[] {
- "WriteMetadata", "UseTopicSchema",
+ "WriteMetadata",
});
internal_static_google_pubsub_v1_ReceivedMessage_descriptor =
getDescriptor().getMessageTypes().get(25);
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
index a26effb78..33951890b 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
@@ -137,7 +137,7 @@ public com.google.protobuf.ByteString getSubscriptionBytes() {
*
*
* @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
- * google/pubsub/v1/pubsub.proto;l=1387
+ * google/pubsub/v1/pubsub.proto;l=1358
* @return The returnImmediately.
*/
@java.lang.Override
@@ -688,7 +688,7 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) {
*
*
* @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
- * google/pubsub/v1/pubsub.proto;l=1387
+ * google/pubsub/v1/pubsub.proto;l=1358
* @return The returnImmediately.
*/
@java.lang.Override
@@ -714,7 +714,7 @@ public boolean getReturnImmediately() {
*
*
* @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
- * google/pubsub/v1/pubsub.proto;l=1387
+ * google/pubsub/v1/pubsub.proto;l=1358
* @param value The returnImmediately to set.
* @return This builder for chaining.
*/
@@ -744,7 +744,7 @@ public Builder setReturnImmediately(boolean value) {
*
*
* @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
- * google/pubsub/v1/pubsub.proto;l=1387
+ * google/pubsub/v1/pubsub.proto;l=1358
* @return This builder for chaining.
*/
@java.lang.Deprecated
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java
index 94c2e0c10..0a9d2f97b 100644
--- a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java
+++ b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequestOrBuilder.java
@@ -72,7 +72,7 @@ public interface PullRequestOrBuilder
*
*
* @deprecated google.pubsub.v1.PullRequest.return_immediately is deprecated. See
- * google/pubsub/v1/pubsub.proto;l=1387
+ * google/pubsub/v1/pubsub.proto;l=1358
* @return The returnImmediately.
*/
@java.lang.Deprecated
diff --git a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto
index b70bda11a..93e1e84a7 100644
--- a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto
+++ b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/pubsub.proto
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2023 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -203,7 +203,7 @@ message IngestionDataSourceSettings {
KINESIS_PERMISSION_DENIED = 2;
// Permission denied encountered while publishing to the topic. This can
- // happen if the Pub/Sub SA has not been granted the [appropriate publish
+ // happen due to Pub/Sub SA has not been granted the [appropriate publish
// permissions](https://cloud.google.com/pubsub/docs/access-control#pubsub.publisher)
PUBLISH_PERMISSION_DENIED = 3;
@@ -1141,14 +1141,6 @@ message BigQueryConfig {
// write to in BigQuery. `use_table_schema` and `use_topic_schema` cannot be
// enabled at the same time.
bool use_table_schema = 6 [(google.api.field_behavior) = OPTIONAL];
-
- // Optional. The service account to use to write to BigQuery. The subscription
- // creator or updater that specifies this field must have
- // `iam.serviceAccounts.actAs` permission on the service account. If not
- // specified, the Pub/Sub [service
- // agent](https://cloud.google.com/iam/docs/service-agents),
- // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- string service_account_email = 7 [(google.api.field_behavior) = OPTIONAL];
}
// Configuration for a Cloud Storage subscription.
@@ -1168,10 +1160,6 @@ message CloudStorageConfig {
// data (for example, an ordering_key, if present) are added as entries in
// the attributes map.
bool write_metadata = 1 [(google.api.field_behavior) = OPTIONAL];
-
- // Optional. When true, the output Cloud Storage file will be serialized
- // using the topic schema, if it exists.
- bool use_topic_schema = 2 [(google.api.field_behavior) = OPTIONAL];
}
// Possible states for a Cloud Storage subscription.
@@ -1192,10 +1180,6 @@ message CloudStorageConfig {
// Cannot write to the destination because enforce_in_transit is set to true
// and the destination locations are not in the allowed regions.
IN_TRANSIT_LOCATION_RESTRICTION = 4;
-
- // Cannot write to the Cloud Storage bucket due to an incompatibility
- // between the topic schema and subscription settings.
- SCHEMA_MISMATCH = 5;
}
// Required. User-provided name for the Cloud Storage bucket.
@@ -1213,11 +1197,6 @@ message CloudStorageConfig {
// Must not end in "/".
string filename_suffix = 3 [(google.api.field_behavior) = OPTIONAL];
- // Optional. User-provided format string specifying how to represent datetimes
- // in Cloud Storage filenames. See the [datetime format
- // guidance](https://cloud.google.com/pubsub/docs/create-cloudstorage-subscription#file_names).
- string filename_datetime_format = 10 [(google.api.field_behavior) = OPTIONAL];
-
// Defaults to text format.
oneof output_format {
// Optional. If set, message data will be written to Cloud Storage in text
@@ -1243,14 +1222,6 @@ message CloudStorageConfig {
// Output only. An output-only field that indicates whether or not the
// subscription can receive messages.
State state = 9 [(google.api.field_behavior) = OUTPUT_ONLY];
-
- // Optional. The service account to use to write to Cloud Storage. The
- // subscription creator or updater that specifies this field must have
- // `iam.serviceAccounts.actAs` permission on the service account. If not
- // specified, the Pub/Sub
- // [service agent](https://cloud.google.com/iam/docs/service-agents),
- // service-{project_number}@gcp-sa-pubsub.iam.gserviceaccount.com, is used.
- string service_account_email = 11 [(google.api.field_behavior) = OPTIONAL];
}
// A message and its corresponding acknowledgment ID.
diff --git a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/schema.proto b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/schema.proto
index d52c678c5..bd17cf0f8 100644
--- a/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/schema.proto
+++ b/proto-google-cloud-pubsub-v1/src/main/proto/google/pubsub/v1/schema.proto
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2023 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/renovate.json b/renovate.json
index 58c97664e..df71c3b5a 100644
--- a/renovate.json
+++ b/renovate.json
@@ -20,7 +20,7 @@
"customManagers": [
{
"customType": "regex",
- "fileMatch": [
+ "fileMatch": [
"^.kokoro/presubmit/graalvm-native.*.cfg$"
],
"matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""],
@@ -30,7 +30,7 @@
{
"customType": "regex",
"fileMatch": [
- "^.github/workflows/unmanaged_dependency_check.yaml$"
+ "^.github/workflows/unmanaged_dependency_check.yaml$"
],
"matchStrings": ["uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v(?.+?)\\n"],
"depNameTemplate": "com.google.cloud:sdk-platform-java-config",