Skip to content

Commit

Permalink
chore: update v2.14.2 gapic-generator-typescript (#554)
Browse files Browse the repository at this point in the history
- [ ] Regenerate this pull request now.

Committer: @summer-ji-eng
PiperOrigin-RevId: 434859890

Source-Link: googleapis/googleapis@bc2432d

Source-Link: googleapis/googleapis-gen@930b673
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTMwYjY3MzEwM2U5MjUyM2Y4Y2ZlZDM4ZGVjZDdkM2FmYWU4ZWJlNyJ9

feat: [Cloud Memorystore for Redis] Support Maintenance Window
PiperOrigin-RevId: 434820669

Source-Link: googleapis/googleapis@db9aa74

Source-Link: googleapis/googleapis-gen@0cff4ff
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMGNmZjRmZjJhNmQyMWE5NTAxY2MyMWU4ZDJmMmIxNWNiMTE4ODczMCJ9

feat: add support for AUTH functionality
feat: add support for TLS functionality
feat: add secondary_ip_range field

PiperOrigin-RevId: 434816216

Source-Link: googleapis/googleapis@7cef847

Source-Link: googleapis/googleapis-gen@b4cef4c
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjRjZWY0Y2FiYmVkODNiMTk0Y2RjMDdhZDg0N2U5N2ZkYjIzM2IzYyJ9
  • Loading branch information
gcf-owl-bot[bot] authored Mar 16, 2022
1 parent f53684b commit a7862c0
Show file tree
Hide file tree
Showing 12 changed files with 4,588 additions and 431 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021 Google LLC
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -21,8 +21,11 @@ import "google/api/client.proto";
import "google/api/field_behavior.proto";
import "google/api/resource.proto";
import "google/longrunning/operations.proto";
import "google/protobuf/duration.proto";
import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";
import "google/type/dayofweek.proto";
import "google/type/timeofday.proto";

option go_package = "google.golang.org/genproto/googleapis/cloud/redis/v1;redis";
option java_multiple_files = true;
Expand Down Expand Up @@ -72,6 +75,16 @@ service CloudRedis {
option (google.api.method_signature) = "name";
}

// Gets the AUTH string for a Redis instance. If AUTH is not enabled for the
// instance the response will be empty. This information is not included in
// the details returned to GetInstance.
rpc GetInstanceAuthString(GetInstanceAuthStringRequest) returns (InstanceAuthString) {
option (google.api.http) = {
get: "/v1/{name=projects/*/locations/*/instances/*}/authString"
};
option (google.api.method_signature) = "name";
}

// Creates a Redis instance based on the specified tier and memory size.
//
// By default, the instance is accessible from the project's
Expand Down Expand Up @@ -191,6 +204,20 @@ service CloudRedis {
metadata_type: "google.cloud.redis.v1.OperationMetadata"
};
}

// Reschedule maintenance for a given instance in a given project and
// location.
rpc RescheduleMaintenance(RescheduleMaintenanceRequest) returns (google.longrunning.Operation) {
option (google.api.http) = {
post: "/v1/{name=projects/*/locations/*/instances/*}:rescheduleMaintenance"
body: "*"
};
option (google.api.method_signature) = "name, reschedule_type, schedule_time";
option (google.longrunning.operation_info) = {
response_type: "google.cloud.redis.v1.Instance"
metadata_type: "google.cloud.redis.v1.OperationMetadata"
};
}
}

// Node specific properties.
Expand All @@ -202,7 +229,7 @@ message NodeInfo {
string zone = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
}

// A Google Cloud Redis instance.
// A Memorystore for Redis instance.
message Instance {
option (google.api.resource) = {
type: "redis.googleapis.com/Instance"
Expand Down Expand Up @@ -267,18 +294,30 @@ message Instance {
PRIVATE_SERVICE_ACCESS = 2;
}

// Available TLS modes.
enum TransitEncryptionMode {
// Not set.
TRANSIT_ENCRYPTION_MODE_UNSPECIFIED = 0;

// Client to Server traffic encryption enabled with server authentication.
SERVER_AUTHENTICATION = 1;

// TLS is disabled for the instance.
DISABLED = 2;
}

// Read replicas mode.
enum ReadReplicasMode {
// If not set, Memorystore Redis backend will pick the mode based on other fields in
// the request.
// If not set, Memorystore Redis backend will default to
// READ_REPLICAS_DISABLED.
READ_REPLICAS_MODE_UNSPECIFIED = 0;

// If disabled, read endpoint will not be provided and the instance cannot
// scale up or down the number of replicas.
READ_REPLICAS_DISABLED = 1;

// If enabled, read endpoint will be provided and the instance can scale
// up and down the number of replicas.
// up and down the number of replicas. Not valid for basic tier.
READ_REPLICAS_ENABLED = 2;
}

Expand Down Expand Up @@ -333,6 +372,13 @@ message Instance {
// the default block size is /28.
string reserved_ip_range = 9 [(google.api.field_behavior) = OPTIONAL];

// Optional. Additional IP range for node placement. Required when enabling read
// replicas on an existing instance. For DIRECT_PEERING mode value must be a
// CIDR range of size /28, or "auto". For PRIVATE_SERVICE_ACCESS mode value
// must be the name of an allocated address range associated with the private
// service access connection, or "auto".
string secondary_ip_range = 30 [(google.api.field_behavior) = OPTIONAL];

// Output only. Hostname or IP address of the exposed Redis endpoint used by
// clients to connect to the service.
string host = 10 [(google.api.field_behavior) = OUTPUT_ONLY];
Expand Down Expand Up @@ -400,9 +446,37 @@ message Instance {
// If not provided, the connect mode defaults to DIRECT_PEERING.
ConnectMode connect_mode = 22 [(google.api.field_behavior) = OPTIONAL];

// Optional. The number of replica nodes. Valid range for standard tier
// is [1-5] and defaults to 1. Valid value for basic tier is 0 and defaults
// to 0.
// Optional. Indicates whether OSS Redis AUTH is enabled for the instance. If set to
// "true" AUTH is enabled on the instance. Default value is "false" meaning
// AUTH is disabled.
bool auth_enabled = 23 [(google.api.field_behavior) = OPTIONAL];

// Output only. List of server CA certificates for the instance.
repeated TlsCertificate server_ca_certs = 25 [(google.api.field_behavior) = OUTPUT_ONLY];

// Optional. The TLS mode of the Redis instance.
// If not provided, TLS is disabled for the instance.
TransitEncryptionMode transit_encryption_mode = 26 [(google.api.field_behavior) = OPTIONAL];

// Optional. The number of replica nodes. The valid range for the Standard Tier with
// read replicas enabled is [1-5] and defaults to 2. If read replicas are not
// enabled for a Standard Tier instance, the only valid value is 1 and the
// default is 1. The valid value for basic tier is 0 and the default is also
// 0.

// Optional. The maintenance policy for the instance. If not provided,
// maintenance events can be performed at any time.
MaintenancePolicy maintenance_policy = 27 [(google.api.field_behavior) = OPTIONAL];

// Output only. Date and time of upcoming maintenance events which have been
// scheduled.
MaintenanceSchedule maintenance_schedule = 28 [(google.api.field_behavior) = OUTPUT_ONLY];

// Optional. The number of replica nodes. The valid range for the Standard Tier with
// read replicas enabled is [1-5] and defaults to 2. If read replicas are not
// enabled for a Standard Tier instance, the only valid value is 1 and the
// default is 1. The valid value for basic tier is 0 and the default is also
// 0.
int32 replica_count = 31 [(google.api.field_behavior) = OPTIONAL];

// Output only. Info per node.
Expand All @@ -418,10 +492,95 @@ message Instance {
// endpoint. Standard tier only. Write requests should target 'port'.
int32 read_endpoint_port = 34 [(google.api.field_behavior) = OUTPUT_ONLY];

// Optional. Read replica mode.
// Optional. Read replicas mode for the instance. Defaults to READ_REPLICAS_DISABLED.
ReadReplicasMode read_replicas_mode = 35 [(google.api.field_behavior) = OPTIONAL];
}

// Request for [RescheduleMaintenance][google.cloud.redis.v1.CloudRedis.RescheduleMaintenance].
message RescheduleMaintenanceRequest {
// Reschedule options.
enum RescheduleType {
// Not set.
RESCHEDULE_TYPE_UNSPECIFIED = 0;

// If the user wants to schedule the maintenance to happen now.
IMMEDIATE = 1;

// If the user wants to use the existing maintenance policy to find the
// next available window.
NEXT_AVAILABLE_WINDOW = 2;

// If the user wants to reschedule the maintenance to a specific time.
SPECIFIC_TIME = 3;
}

// Required. Redis instance resource name using the form:
// `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
// where `location_id` refers to a GCP region.
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
type: "redis.googleapis.com/Instance"
}
];

// Required. If reschedule type is SPECIFIC_TIME, must set up schedule_time as well.
RescheduleType reschedule_type = 2 [(google.api.field_behavior) = REQUIRED];

// Optional. Timestamp when the maintenance shall be rescheduled to if
// reschedule_type=SPECIFIC_TIME, in RFC 3339 format, for
// example `2012-11-15T16:19:00.094Z`.
google.protobuf.Timestamp schedule_time = 3 [(google.api.field_behavior) = OPTIONAL];
}

// Maintenance policy for an instance.
message MaintenancePolicy {
// Output only. The time when the policy was created.
google.protobuf.Timestamp create_time = 1 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. The time when the policy was last updated.
google.protobuf.Timestamp update_time = 2 [(google.api.field_behavior) = OUTPUT_ONLY];

// Optional. Description of what this policy is for. Create/Update methods
// return INVALID_ARGUMENT if the length is greater than 512.
string description = 3 [(google.api.field_behavior) = OPTIONAL];

// Optional. Maintenance window that is applied to resources covered by this
// policy. Minimum 1. For the current version, the maximum number of
// weekly_window is expected to be one.
repeated WeeklyMaintenanceWindow weekly_maintenance_window = 4 [(google.api.field_behavior) = OPTIONAL];
}

// Time window in which disruptive maintenance updates occur. Non-disruptive
// updates can occur inside or outside this window.
message WeeklyMaintenanceWindow {
// Required. The day of week that maintenance updates occur.
google.type.DayOfWeek day = 1 [(google.api.field_behavior) = REQUIRED];

// Required. Start time of the window in UTC time.
google.type.TimeOfDay start_time = 2 [(google.api.field_behavior) = REQUIRED];

// Output only. Duration of the maintenance window. The current window is fixed at 1 hour.
google.protobuf.Duration duration = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
}

// Upcoming maintenance schedule. If no maintenance is scheduled, fields are not
// populated.
message MaintenanceSchedule {
// Output only. The start time of any upcoming scheduled maintenance for this instance.
google.protobuf.Timestamp start_time = 1 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. The end time of any upcoming scheduled maintenance for this instance.
google.protobuf.Timestamp end_time = 2 [(google.api.field_behavior) = OUTPUT_ONLY];

// If the scheduled maintenance can be rescheduled, default is true.
bool can_reschedule = 3 [deprecated = true];

// Output only. The deadline that the maintenance schedule start time can not go beyond,
// including reschedule.
google.protobuf.Timestamp schedule_deadline_time = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
}

// Request for [ListInstances][google.cloud.redis.v1.CloudRedis.ListInstances].
message ListInstancesRequest {
// Required. The resource name of the instance location using the form:
Expand Down Expand Up @@ -484,6 +643,25 @@ message GetInstanceRequest {
];
}

// Request for [GetInstanceAuthString][google.cloud.redis.v1.CloudRedis.GetInstanceAuthString].
message GetInstanceAuthStringRequest {
// Required. Redis instance resource name using the form:
// `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
// where `location_id` refers to a GCP region.
string name = 1 [
(google.api.field_behavior) = REQUIRED,
(google.api.resource_reference) = {
type: "redis.googleapis.com/Instance"
}
];
}

// Instance AUTH string details.
message InstanceAuthString {
// AUTH string set on the instance.
string auth_string = 1;
}

// Request for [CreateInstance][google.cloud.redis.v1.CloudRedis.CreateInstance].
message CreateInstanceRequest {
// Required. The resource name of the instance location using the form:
Expand Down Expand Up @@ -684,3 +862,25 @@ message LocationMetadata {
message ZoneMetadata {

}

// TlsCertificate Resource
message TlsCertificate {
// Serial number, as extracted from the certificate.
string serial_number = 1;

// PEM representation.
string cert = 2;

// Output only. The time when the certificate was created in [RFC
// 3339](https://tools.ietf.org/html/rfc3339) format, for example
// `2020-05-18T00:00:00.094Z`.
google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY];

// Output only. The time when the certificate expires in [RFC
// 3339](https://tools.ietf.org/html/rfc3339) format, for example
// `2020-05-18T00:00:00.094Z`.
google.protobuf.Timestamp expire_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY];

// Sha1 Fingerprint of the certificate.
string sha1_fingerprint = 5;
}
Loading

0 comments on commit a7862c0

Please sign in to comment.