Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CHANGE ME] Re-generated redis to pick up changes in the API or client library generator. #7258

Merged
merged 1 commit into from
Feb 1, 2019
Merged

[CHANGE ME] Re-generated redis to pick up changes in the API or client library generator. #7258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 64 additions & 36 deletions redis/google/cloud/redis_v1/proto/cloud_redis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018 Google Inc.
// Copyright 2018 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 @@ -14,22 +14,22 @@

syntax = "proto3";

package google.cloud.redis.v1beta1;
package google.cloud.redis.v1;

import "google/api/annotations.proto";
import "google/longrunning/operations.proto";
import "google/protobuf/field_mask.proto";
import "google/protobuf/timestamp.proto";

option go_package = "google.golang.org/genproto/googleapis/cloud/redis/v1beta1;redis";
option go_package = "google.golang.org/genproto/googleapis/cloud/redis/v1;redis";
option java_multiple_files = true;
option java_outer_classname = "CloudRedisServiceBetaProto";
option java_package = "com.google.cloud.redis.v1beta1";
option java_outer_classname = "CloudRedisServiceV1Proto";
option java_package = "com.google.cloud.redis.v1";


// Configures and manages Cloud Memorystore for Redis instances
//
// Google Cloud Memorystore for Redis v1beta1
// Google Cloud Memorystore for Redis v1
//
// The `redis.googleapis.com` service implements the Google Cloud Memorystore
// for Redis API and defines the following resource model for managing Redis
Expand All @@ -53,20 +53,20 @@ service CloudRedis {
// available to the project are queried, and the results are aggregated.
rpc ListInstances(ListInstancesRequest) returns (ListInstancesResponse) {
option (google.api.http) = {
get: "/v1beta1/{parent=projects/*/locations/*}/instances"
get: "/v1/{parent=projects/*/locations/*}/instances"
};
}

// Gets the details of a specific Redis instance.
rpc GetInstance(GetInstanceRequest) returns (Instance) {
option (google.api.http) = {
get: "/v1beta1/{name=projects/*/locations/*/instances/*}"
get: "/v1/{name=projects/*/locations/*/instances/*}"
};
}

// Creates a Redis instance based on the specified tier and memory size.
//
// By default, the instance is peered to the project's
// By default, the instance is accessible from the project's
// [default network](/compute/docs/networks-and-firewalls#networks).
//
// The creation is executed asynchronously and callers may check the returned
Expand All @@ -78,7 +78,7 @@ service CloudRedis {
// is no need to call DeleteOperation.
rpc CreateInstance(CreateInstanceRequest) returns (google.longrunning.Operation) {
option (google.api.http) = {
post: "/v1beta1/{parent=projects/*/locations/*}/instances"
post: "/v1/{parent=projects/*/locations/*}/instances"
body: "instance"
};
}
Expand All @@ -90,7 +90,7 @@ service CloudRedis {
// after a few hours, so there is no need to call DeleteOperation.
rpc UpdateInstance(UpdateInstanceRequest) returns (google.longrunning.Operation) {
option (google.api.http) = {
patch: "/v1beta1/{instance.name=projects/*/locations/*/instances/*}"
patch: "/v1/{instance.name=projects/*/locations/*/instances/*}"
body: "instance"
};
}
Expand All @@ -99,7 +99,7 @@ service CloudRedis {
// deleted.
rpc DeleteInstance(DeleteInstanceRequest) returns (google.longrunning.Operation) {
option (google.api.http) = {
delete: "/v1beta1/{name=projects/*/locations/*/instances/*}"
delete: "/v1/{name=projects/*/locations/*/instances/*}"
};
}
}
Expand Down Expand Up @@ -150,7 +150,7 @@ message Instance {
// `projects/{project_id}/locations/{location_id}/instances/{instance_id}`
//
// Note: Redis instances are managed and addressed at regional level so
// location_id here refers to a GCP region; however, users get to choose which
// location_id here refers to a GCP region; however, users may choose which
// specific zone (or collection of zones for cross-zone instances) an instance
// should be provisioned in. Refer to [location_id] and
// [alternative_location_id] fields for more details.
Expand All @@ -165,7 +165,7 @@ message Instance {
// Optional. The zone where the instance will be provisioned. If not provided,
// the service will choose a zone for the instance. For STANDARD_HA tier,
// instances will be created across two zones for protection against zonal
// failures. if [alternative_location_id] is also provided, it must be
// failures. If [alternative_location_id] is also provided, it must be
// different from [location_id].
string location_id = 4;

Expand All @@ -175,27 +175,29 @@ message Instance {
string alternative_location_id = 5;

// Optional. The version of Redis software.
// If not provided, latest supported version will be used.
// If not provided, latest supported version will be used. Updating the
// version will perform an upgrade/downgrade to the new version. Currently,
// the supported values are `REDIS_3_2` for Redis 3.2.
string redis_version = 7;

// Optional. The CIDR range of internal addresses that are reserved for this
// instance. If not provided, the service will choose an unused /29 block,
// for example, 10.0.0.0/29 or 192.168.0.0/29. Ranges must be unique
// and non-overlapping with existing subnets in a network.
// and non-overlapping with existing subnets in an authorized network.
string reserved_ip_range = 9;

// Output only. Hostname or IP address of the exposed redis endpoint used by
// Output only. Hostname or IP address of the exposed Redis endpoint used by
// clients to connect to the service.
string host = 10;

// Output only. The port number of the exposed redis endpoint.
// Output only. The port number of the exposed Redis endpoint.
int32 port = 11;

// Output only. The current zone where the Redis endpoint is placed. In
// single zone deployments, this will always be the same as [location_id]
// provided by the user at creation time. In cross-zone instances (only
// applicable in STANDARD_HA tier), this can be either [location_id] or
// [alternative_location_id] and can change on a failover event.
// Output only. The current zone where the Redis endpoint is placed. For Basic
// Tier instances, this will always be the same as the [location_id]
// provided by the user at creation time. For Standard Tier instances,
// this can be either [location_id] or [alternative_location_id] and can
// change after a failover event.
string current_location_id = 12;

// Output only. The time the instance was created.
Expand All @@ -211,14 +213,15 @@ message Instance {
// Optional. Redis configuration parameters, according to
// http://redis.io/topics/config. Currently, the only supported parameters
// are:
// * maxmemory-policy
// * notify-keyspace-events
//
// * maxmemory-policy
// * notify-keyspace-events
map<string, string> redis_configs = 16;

// Required. The service tier of the instance.
Tier tier = 17;

// Required. Redis memory size in GB.
// Required. Redis memory size in GiB.
int32 memory_size_gb = 18;

// Optional. The full name of the Google Compute Engine
Expand All @@ -228,7 +231,7 @@ message Instance {
string authorized_network = 20;
}

// Request for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
// Request for [ListInstances][google.cloud.redis.v1.CloudRedis.ListInstances].
message ListInstancesRequest {
// Required. The resource name of the instance location using the form:
// `projects/{project_id}/locations/{location_id}`
Expand All @@ -249,7 +252,7 @@ message ListInstancesRequest {
string page_token = 3;
}

// Response for [ListInstances][google.cloud.redis.v1beta1.CloudRedis.ListInstances].
// Response for [ListInstances][google.cloud.redis.v1.CloudRedis.ListInstances].
message ListInstancesResponse {
// A list of Redis instances in the project in the specified location,
// or across all locations.
Expand All @@ -268,15 +271,15 @@ message ListInstancesResponse {
string next_page_token = 2;
}

// Request for [GetInstance][google.cloud.redis.v1beta1.CloudRedis.GetInstance].
// Request for [GetInstance][google.cloud.redis.v1.CloudRedis.GetInstance].
message GetInstanceRequest {
// 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;
}

// Request for [CreateInstance][google.cloud.redis.v1beta1.CloudRedis.CreateInstance].
// Request for [CreateInstance][google.cloud.redis.v1.CloudRedis.CreateInstance].
message CreateInstanceRequest {
// Required. The resource name of the instance location using the form:
// `projects/{project_id}/locations/{location_id}`
Expand All @@ -297,30 +300,55 @@ message CreateInstanceRequest {
Instance instance = 3;
}

// Request for [UpdateInstance][google.cloud.redis.v1beta1.CloudRedis.UpdateInstance].
// Request for [UpdateInstance][google.cloud.redis.v1.CloudRedis.UpdateInstance].
message UpdateInstanceRequest {
// Required. Mask of fields to update. At least one path must be supplied in
// this field. The elements of the repeated paths field may only include these
// fields from [Instance][CloudRedis.Instance]:
// * `display_name`
// * `labels`
// * `memory_size_gb`
// * `redis_config`
//
// * `displayName`
// * `labels`
// * `memorySizeGb`
// * `redisConfig`
google.protobuf.FieldMask update_mask = 1;

// Required. Update description.
// Only fields specified in update_mask are updated.
Instance instance = 2;
}

// Request for [DeleteInstance][google.cloud.redis.v1beta1.CloudRedis.DeleteInstance].
// Request for [DeleteInstance][google.cloud.redis.v1.CloudRedis.DeleteInstance].
message DeleteInstanceRequest {
// 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;
}

// Represents the v1 metadata of the long-running operation.
message OperationMetadata {
// Creation timestamp.
google.protobuf.Timestamp create_time = 1;

// End timestamp.
google.protobuf.Timestamp end_time = 2;

// Operation target.
string target = 3;

// Operation verb.
string verb = 4;

// Operation status details.
string status_detail = 5;

// Specifies if cancellation was requested for the operation.
bool cancel_requested = 6;

// API version.
string api_version = 7;
}

// This location metadata represents additional configuration options for a
// given location where a Redis instance may be created. All fields are output
// only. It is returned as content of the
Expand Down
6 changes: 3 additions & 3 deletions redis/synth.metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"updateTime": "2019-01-24T17:19:20.924756Z",
"updateTime": "2019-02-01T19:00:46.511227Z",
"sources": [
{
"generator": {
Expand All @@ -12,8 +12,8 @@
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "9aac88a22468b1e291937f55fa1ef237adfdc63e",
"internalRef": "230568136"
"sha": "bce093dab3e65c40eb9a37efbdc960f34df6037a",
"internalRef": "231974277"
}
},
{
Expand Down