Synchronize new proto/yaml changes.

PiperOrigin-RevId: 238151361

3 files changed, 51 insertions, 197 deletions

diff --git a/google/cloud/redis/redis_v1.yaml b/google/cloud/redis/redis_v1.yaml
index 5e46809e4..65935a14b 100644
--- a/google/cloud/redis/redis_v1.yaml
+++ b/google/cloud/redis/redis_v1.yaml
@@ -4,44 +4,40 @@ name: redis.googleapis.com
 title: Google Cloud Memorystore for Redis API
 
 apis:
-- name: google.cloud.redis.v1.CloudRedis
+  - name: google.cloud.redis.v1.CloudRedis
 
 types:
-- name: google.cloud.redis.v1.OperationMetadata
-- name: google.cloud.redis.v1.LocationMetadata
-- name: google.cloud.redis.v1.ZoneMetadata
+  - name: google.cloud.redis.v1.LocationMetadata
+  - name: google.cloud.redis.v1.OperationMetadata
+  - name: google.cloud.redis.v1.ZoneMetadata
 
 documentation:
   summary: Creates and manages Redis instances on the Google Cloud Platform.
 
 backend:
   rules:
-  - selector: google.longrunning.Operations.ListOperations
-    deadline: 60.0
-  - selector: google.longrunning.Operations.GetOperation
-    deadline: 60.0
-  - selector: google.longrunning.Operations.DeleteOperation
-    deadline: 60.0
-  - selector: google.longrunning.Operations.CancelOperation
-    deadline: 60.0
-  - selector: google.longrunning.Operations.WaitOperation
-    deadline: 60.0
-  - selector: google.cloud.redis.v1.CloudRedis.ListInstances
-    deadline: 60.0
-  - selector: google.cloud.redis.v1.CloudRedis.GetInstance
-    deadline: 60.0
-  - selector: google.cloud.redis.v1.CloudRedis.CreateInstance
-    deadline: 60.0
-  - selector: google.cloud.redis.v1.CloudRedis.UpdateInstance
-    deadline: 60.0
-  - selector: google.cloud.redis.v1.CloudRedis.ImportInstance
-    deadline: 60.0
-  - selector: google.cloud.redis.v1.CloudRedis.ExportInstance
-    deadline: 60.0
-  - selector: google.cloud.redis.v1.CloudRedis.FailoverInstance
-    deadline: 60.0
-  - selector: google.cloud.redis.v1.CloudRedis.DeleteInstance
-    deadline: 60.0
+    - selector: google.longrunning.Operations.ListOperations
+      deadline: 60.0
+    - selector: google.longrunning.Operations.GetOperation
+      deadline: 60.0
+    - selector: google.longrunning.Operations.DeleteOperation
+      deadline: 60.0
+    - selector: google.longrunning.Operations.CancelOperation
+      deadline: 60.0
+    - selector: google.longrunning.Operations.WaitOperation
+      deadline: 60.0
+    - selector: google.cloud.redis.v1.CloudRedis.ListInstances
+      deadline: 60.0
+    - selector: google.cloud.redis.v1.CloudRedis.GetInstance
+      deadline: 60.0
+    - selector: google.cloud.redis.v1.CloudRedis.CreateInstance
+      deadline: 60.0
+    - selector: google.cloud.redis.v1.CloudRedis.UpdateInstance
+      deadline: 60.0
+    - selector: google.cloud.redis.v1.CloudRedis.FailoverInstance
+      deadline: 60.0
+    - selector: google.cloud.redis.v1.CloudRedis.DeleteInstance
+      deadline: 60.0
 
 http:
   rules:
@@ -59,7 +55,11 @@ http:
 
 authentication:
   rules:
-  - selector: '*'
-    oauth:
-      canonical_scopes: |-
-        https://www.googleapis.com/auth/cloud-platform
+    - selector: 'google.cloud.redis.v1.CloudRedis.*'
+      oauth:
+        canonical_scopes: |-
+          https://www.googleapis.com/auth/cloud-platform
+    - selector: 'google.longrunning.Operations.*'
+      oauth:
+        canonical_scopes: |-
+          https://www.googleapis.com/auth/cloud-platform
diff --git a/google/cloud/redis/v1/cloud_redis.proto b/google/cloud/redis/v1/cloud_redis.proto
index f8dfc5cbf..8520addad 100644
--- a/google/cloud/redis/v1/cloud_redis.proto
+++ b/google/cloud/redis/v1/cloud_redis.proto
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC.
+// Copyright 2019 Google LLC.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ syntax = "proto3";
 package google.cloud.redis.v1;
 
 import "google/api/annotations.proto";
+import "google/api/resource.proto";
 import "google/longrunning/operations.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
@@ -27,6 +28,7 @@ option java_multiple_files = true;
 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 v1
@@ -40,7 +42,7 @@ option java_package = "com.google.cloud.redis.v1";
 // * As such, Redis instances are resources of the form:
 //   `/projects/{project_id}/locations/{location_id}/instances/{instance_id}`
 //
-// Note that location_id must be refering to a GCP `region`; for example:
+// Note that location_id must be referring to a GCP `region`; for example:
 // * `projects/redpepper-1290/locations/us-central1/instances/my-redis`
 service CloudRedis {
   // Lists all Redis instances owned by a project in either the specified
@@ -76,8 +78,7 @@ service CloudRedis {
   //
   // The returned operation is automatically deleted after a few hours, so there
   // is no need to call DeleteOperation.
-  rpc CreateInstance(CreateInstanceRequest)
-      returns (google.longrunning.Operation) {
+  rpc CreateInstance(CreateInstanceRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1/{parent=projects/*/locations/*}/instances"
       body: "instance"
@@ -89,48 +90,16 @@ service CloudRedis {
   // Completed longrunning.Operation will contain the new instance object
   // in the response field. The returned operation is automatically deleted
   // after a few hours, so there is no need to call DeleteOperation.
-  rpc UpdateInstance(UpdateInstanceRequest)
-      returns (google.longrunning.Operation) {
+  rpc UpdateInstance(UpdateInstanceRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       patch: "/v1/{instance.name=projects/*/locations/*/instances/*}"
       body: "instance"
     };
   }
 
-  // Import a Redis RDB snapshot file from GCS into a Redis instance.
-  //
-  // Redis may stop serving during this operation. Instance state will be
-  // IMPORTING for entire operation. When complete, the instance will contain
-  // only data from the imported file.
-  //
-  // The returned operation is automatically deleted after a few hours, so
-  // there is no need to call DeleteOperation.
-  rpc ImportInstance(ImportInstanceRequest)
-      returns (google.longrunning.Operation) {
-    option (google.api.http) = {
-      post: "/v1/{name=projects/*/locations/*/instances/*}:import"
-      body: "*"
-    };
-  }
-
-  // Export Redis instance data into a Redis RDB format file in GCS.
-  //
-  // Redis will continue serving during this operation.
-  //
-  // The returned operation is automatically deleted after a few hours, so
-  // there is no need to call DeleteOperation.
-  rpc ExportInstance(ExportInstanceRequest)
-      returns (google.longrunning.Operation) {
-    option (google.api.http) = {
-      post: "/v1/{name=projects/*/locations/*/instances/*}:export"
-      body: "*"
-    };
-  }
-
   // Failover the master role to current replica node against a specific
   // STANDARD tier redis instance.
-  rpc FailoverInstance(FailoverInstanceRequest)
-      returns (google.longrunning.Operation) {
+  rpc FailoverInstance(FailoverInstanceRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1/{name=projects/*/locations/*/instances/*}:failover"
       body: "*"
@@ -139,8 +108,7 @@ service CloudRedis {
 
   // Deletes a specific Redis instance.  Instance stops serving and data is
   // deleted.
-  rpc DeleteInstance(DeleteInstanceRequest)
-      returns (google.longrunning.Operation) {
+  rpc DeleteInstance(DeleteInstanceRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       delete: "/v1/{name=projects/*/locations/*/instances/*}"
     };
@@ -174,9 +142,6 @@ message Instance {
     // Maintenance is being performed on this Redis instance.
     MAINTENANCE = 6;
 
-    // Redis instance is importing data (availability may be affected).
-    IMPORTING = 8;
-
     // Redis instance is failing over (availability may be affected).
     FAILING_OVER = 9;
   }
@@ -225,9 +190,7 @@ message Instance {
   // Optional. The version of Redis software.
   // 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_4_0` for Redis 4.0 compatibility
-  //  * `REDIS_3_2` for Redis 3.2 compatibility
+  // 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
@@ -264,14 +227,8 @@ message Instance {
   // http://redis.io/topics/config. Currently, the only supported parameters
   // are:
   //
-  //  Redis 3.2 and above:
-  //  * maxmemory-policy
-  //  * notify-keyspace-events
-  //
-  //  Redis 4.0 and above:
-  //  * activedefrag
-  //  * lfu-log-factor
-  //  * lfu-decay-time
+  //  *   maxmemory-policy
+  //  *   notify-keyspace-events
   map<string, string> redis_configs = 16;
 
   // Required. The service tier of the instance.
@@ -285,13 +242,6 @@ message Instance {
   // instance is connected. If left unspecified, the `default` network
   // will be used.
   string authorized_network = 20;
-
-  // Output only. Cloud IAM identity used by import / export operations to
-  // transfer data to/from Cloud Storage. Format is
-  // "serviceAccount:<service_account_email>". The value may change over time
-  // for a given instance so should be checked before each import/export
-  // operation.
-  string persistence_iam_identity = 21;
 }
 
 // Request for [ListInstances][google.cloud.redis.v1.CloudRedis.ListInstances].
@@ -345,8 +295,7 @@ message GetInstanceRequest {
   string name = 1;
 }
 
-// Request for
-// [CreateInstance][google.cloud.redis.v1.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}`
@@ -367,8 +316,7 @@ message CreateInstanceRequest {
   Instance instance = 3;
 }
 
-// Request for
-// [UpdateInstance][google.cloud.redis.v1.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
@@ -385,8 +333,7 @@ message UpdateInstanceRequest {
   Instance instance = 2;
 }
 
-// Request for
-// [DeleteInstance][google.cloud.redis.v1.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}`
@@ -394,59 +341,6 @@ message DeleteInstanceRequest {
   string name = 1;
 }
 
-// The GCS location for the input content
-message GcsSource {
-  // Required. Source data URI. (e.g. 'gs://my_bucket/my_object').
-  string uri = 1;
-}
-
-// The input content
-message InputConfig {
-  // Required. Specify source location of input data
-  oneof source {
-    // Google Cloud Storage location where input content is located.
-    GcsSource gcs_source = 1;
-  }
-}
-
-// Request for [Import][google.cloud.redis.v1.CloudRedis.ImportInstance].
-message ImportInstanceRequest {
-  // 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;
-
-  // Required. Specify data to be imported.
-  InputConfig input_config = 3;
-}
-
-// The GCS location for the output content
-message GcsDestination {
-  // Required. Data destination URI (e.g.
-  // 'gs://my_bucket/my_object'). Existing files will be overwritten.
-  string uri = 1;
-}
-
-// The output content
-message OutputConfig {
-  // Required. Specify destination location of output data
-  oneof destination {
-    // Google Cloud Storage destination for output content.
-    GcsDestination gcs_destination = 1;
-  }
-}
-
-// Request for [Export][google.cloud.redis.v1.CloudRedis.ExportInstance].
-message ExportInstanceRequest {
-  // 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;
-
-  // Required. Specify data to be exported.
-  OutputConfig output_config = 3;
-}
-
 // Request for [Failover][google.cloud.redis.v1.CloudRedis.FailoverInstance].
 message FailoverInstanceRequest {
   enum DataProtectionMode {
@@ -510,4 +404,6 @@ message LocationMetadata {
 
 // Defines specific information for a particular zone. Currently empty and
 // reserved for future use only.
-message ZoneMetadata {}
+message ZoneMetadata {
+
+}
diff --git a/google/cloud/redis/v1/redis_gapic.yaml b/google/cloud/redis/v1/redis_gapic.yaml
index a4a75c7a6..25ca270b1 100644
--- a/google/cloud/redis/v1/redis_gapic.yaml
+++ b/google/cloud/redis/v1/redis_gapic.yaml
@@ -222,48 +222,6 @@ interfaces:
       poll_delay_multiplier: 1.5
       max_poll_delay_millis: 360000 # 6 minutes
       total_poll_timeout_millis: 1200000 # 20 minutes
-  - name: ImportInstance
-    flattening:
-      groups:
-      - parameters:
-        - name
-        - input_config
-    required_fields:
-    - name
-    - input_config
-    retry_codes_name: non_idempotent
-    retry_params_name: default
-    field_name_patterns:
-      name: instance
-    long_running:
-      return_type: google.cloud.redis.v1.Instance
-      metadata_type: google.cloud.redis.v1.OperationMetadata
-      initial_poll_delay_millis: 60000 # 1 minutes
-      poll_delay_multiplier: 1.5
-      max_poll_delay_millis: 360000 # 6 minutes
-      total_poll_timeout_millis: 18000000 # 300 minutes
-    timeout_millis: 60000
-  - name: ExportInstance
-    flattening:
-      groups:
-      - parameters:
-        - name
-        - output_config
-    required_fields:
-    - name
-    - output_config
-    retry_codes_name: non_idempotent
-    retry_params_name: default
-    field_name_patterns:
-      name: instance
-    long_running:
-      return_type: google.cloud.redis.v1.Instance
-      metadata_type: google.cloud.redis.v1.OperationMetadata
-      initial_poll_delay_millis: 60000 # 1 minutes
-      poll_delay_multiplier: 1.5
-      max_poll_delay_millis: 360000 # 6 minutes
-      total_poll_timeout_millis: 18000000 # 300 minutes
-    timeout_millis: 60000
   - name: FailoverInstance
     flattening:
       groups: