Merge branch 'googleapis:main' into main

Author: surbhigarg92

.gitignore

@@ -12,4 +12,3 @@ system-test/*key.json
 .DS_Store
 package-lock.json
 __pycache__
-.vscode

package.json

@@ -66,7 +66,7 @@
     "events-intercept": "^2.0.0",
     "extend": "^3.0.2",
     "google-auth-library": "^9.0.0",
-    "google-gax": "4.3.1",
+    "google-gax": "4.3.2",
     "grpc-gcp": "^1.0.0",
     "is": "^3.2.1",
     "lodash.snakecase": "^4.1.1",

protos/google/spanner/admin/instance/v1/common.proto

@@ -1,4 +1,4 @@
-// Copyright 2022 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.
@@ -40,3 +40,17 @@ message OperationProgress {
   // successfully.
   google.protobuf.Timestamp end_time = 3;
 }
+
+// Indicates the expected fulfillment period of an operation.
+enum FulfillmentPeriod {
+  // Not specified.
+  FULFILLMENT_PERIOD_UNSPECIFIED = 0;
+
+  // Normal fulfillment period. The operation is expected to complete within
+  // minutes.
+  FULFILLMENT_PERIOD_NORMAL = 1;
+
+  // Extended fulfillment period. It can take up to an hour for the operation
+  // to complete.
+  FULFILLMENT_PERIOD_EXTENDED = 2;
+}

protos/google/spanner/admin/instance/v1/spanner_instance_admin.proto

@@ -1282,6 +1282,9 @@ message CreateInstanceMetadata {
 
   // The time at which this operation failed or was completed successfully.
   google.protobuf.Timestamp end_time = 4;
+
+  // The expected fulfillment period of this create operation.
+  FulfillmentPeriod expected_fulfillment_period = 5;
 }
 
 // Metadata type for the operation returned by
@@ -1302,6 +1305,9 @@ message UpdateInstanceMetadata {
 
   // The time at which this operation failed or was completed successfully.
   google.protobuf.Timestamp end_time = 4;
+
+  // The expected fulfillment period of this update operation.
+  FulfillmentPeriod expected_fulfillment_period = 5;
 }
 
 // Metadata type for the operation returned by

protos/google/spanner/executor/v1/cloud_executor.proto

@@ -78,6 +78,9 @@ message SpannerAction {
   // database path if it applies to the same database as the previous action.
   string database_path = 1;
 
+  // Configuration options for Spanner backend
+  SpannerOptions spanner_options = 2;
+
   // Action represents a spanner action kind, there will only be one action kind
   // per SpannerAction.
   oneof action {
@@ -565,8 +568,8 @@ message AdminAction {
     // Action that cancels an operation.
     CancelOperationAction cancel_operation = 26;
 
-    // Action that reconfigures a Cloud Spanner database.
-    ReconfigureCloudDatabaseAction reconfigure_cloud_database = 28;
+    // Action that changes quorum of a Cloud Spanner database.
+    ChangeQuorumCloudDatabaseAction change_quorum_cloud_database = 28;
   }
 }
 
@@ -772,9 +775,9 @@ message DropCloudDatabaseAction {
   string database_id = 3;
 }
 
-// Action that reconfigures a Cloud Spanner database.
-message ReconfigureCloudDatabaseAction {
-  // The fully qualified uri of the database to be reconfigured.
+// Action that changes quorum of a Cloud Spanner database.
+message ChangeQuorumCloudDatabaseAction {
+  // The fully qualified uri of the database whose quorum has to be changed.
   optional string database_uri = 1;
 
   // The locations of the serving regions, e.g. "asia-south1".
@@ -877,6 +880,10 @@ message RestoreCloudDatabaseAction {
   // The id of the database to create and restore to, e.g. "db0". Note that this
   // database must not already exist.
   string database_id = 5;
+
+  // The KMS key(s) used to encrypt the restored database to be created if the
+  // restored database should be CMEK protected.
+  google.spanner.admin.database.v1.EncryptionConfig encryption_config = 7;
 }
 
 // Action that gets a Cloud Spanner database.
@@ -916,6 +923,10 @@ message CreateCloudBackupAction {
   // [earliest_version_time, NOW], where earliest_version_time is retrieved by
   // cloud spanner frontend API (See details: go/cs-pitr-lite-design).
   optional google.protobuf.Timestamp version_time = 6;
+
+  // The KMS key(s) used to encrypt the backup to be created if the backup
+  // should be CMEK protected.
+  google.spanner.admin.database.v1.EncryptionConfig encryption_config = 7;
 }
 
 // Action that copies a Cloud Spanner database backup.
@@ -1481,3 +1492,16 @@ message HeartbeatRecord {
   // Timestamp for this heartbeat check.
   google.protobuf.Timestamp heartbeat_time = 1;
 }
+
+// Options for Cloud Spanner Service.
+message SpannerOptions {
+  // Options for configuring the session pool
+  SessionPoolOptions session_pool_options = 1;
+}
+
+// Options for the session pool used by the DatabaseClient.
+message SessionPoolOptions {
+  // passing this as true, will make applicable RPCs use multiplexed sessions
+  // instead of regular sessions
+  bool use_multiplexed = 1;
+}