chore: adds CMEK fields to backup and database (#897)

* chore: update gapic-generator-java to 0.0.20 Committer: @miraleung PiperOrigin-RevId: 357800868 Source-Author: Google APIs <noreply@google.com> Source-Date: Tue Feb 16 14:06:04 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: e8bc4471a88ac5f60defe3ed436f517174e59ba0 Source-Link: googleapis/googleapis@e8bc447 * chore: release gapic-generator-java v0.0.21 with gapic_metadata.json support Committer: @miraleung PiperOrigin-RevId: 358516065 Source-Author: Google APIs <noreply@google.com> Source-Date: Fri Feb 19 17:43:23 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: af8f71dae961ee036a0ac52a1965270149a6b2c9 Source-Link: googleapis/googleapis@af8f71d * feat(spanner): add CMEK fields to backup and database PiperOrigin-RevId: 358725120 Source-Author: Google APIs <noreply@google.com> Source-Date: Sun Feb 21 17:58:05 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: f829b1334cce86aa3738f3c0698d814b56664445 Source-Link: googleapis/googleapis@f829b13 * chore: update protobuf v3.15.3 This release makes --experimental_allow_proto3_optional no longer necessary. PiperOrigin-RevId: 359781040 Source-Author: Google APIs <noreply@google.com> Source-Date: Fri Feb 26 09:59:49 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: f6dd7e47620566925a4b3f1ce029e74e1b2f2516 Source-Link: googleapis/googleapis@f6dd7e4 * feat(spanner): add `optimizer_statistics_package` field in `QueryOptions` PiperOrigin-RevId: 360758638 Source-Author: Google APIs <noreply@google.com> Source-Date: Wed Mar 3 14:32:33 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: dff6e4625d4ea0a16fc44d3b9be115219c403f07 Source-Link: googleapis/googleapis@dff6e46 * chore(release): update Java microgenerator to 1.0.1 Committer: @miraleung PiperOrigin-RevId: 360805639 Source-Author: Google APIs <noreply@google.com> Source-Date: Wed Mar 3 18:34:03 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: 3befd26ca55723d3e8111909331eac1249837987 Source-Link: googleapis/googleapis@3befd26 Co-authored-by: Thiago Nunes <thiagotnunes@google.com>
googleapis · Mar 9, 2021 · ed9d735 · ed9d735
1 parent 55fa0cc
commit ed9d735
Show file tree

Hide file tree

Showing 113 changed files with 11,142 additions and 1,448 deletions.
diff --git a/...spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java b/...spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -432,6 +432,7 @@ public final OperationFuture<Database, CreateDatabaseMetadata> createDatabaseAsy
    *           .setParent(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
    *           .setCreateStatement("createStatement744686547")
    *           .addAllExtraStatements(new ArrayList<String>())
+   *           .setEncryptionConfig(EncryptionConfig.newBuilder().build())
    *           .build();
    *   Database response = databaseAdminClient.createDatabaseAsync(request).get();
    * }
@@ -464,6 +465,7 @@ public final OperationFuture<Database, CreateDatabaseMetadata> createDatabaseAsy
    *           .setParent(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
    *           .setCreateStatement("createStatement744686547")
    *           .addAllExtraStatements(new ArrayList<String>())
+   *           .setEncryptionConfig(EncryptionConfig.newBuilder().build())
    *           .build();
    *   OperationFuture<Database, CreateDatabaseMetadata> future =
    *       databaseAdminClient.createDatabaseOperationCallable().futureCall(request);
@@ -496,6 +498,7 @@ public final OperationFuture<Database, CreateDatabaseMetadata> createDatabaseAsy
    *           .setParent(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
    *           .setCreateStatement("createStatement744686547")
    *           .addAllExtraStatements(new ArrayList<String>())
+   *           .setEncryptionConfig(EncryptionConfig.newBuilder().build())
    *           .build();
    *   ApiFuture<Operation> future =
    *       databaseAdminClient.createDatabaseCallable().futureCall(request);
@@ -971,7 +974,9 @@ public final GetDatabaseDdlResponse getDatabaseDdl(GetDatabaseDdlRequest request
    *
    * <pre>{@code
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-   *   ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+   *   ResourceName resource =
+   *       CryptoKeyVersionName.of(
+   *           "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
    *   Policy policy = Policy.newBuilder().build();
    *   Policy response = databaseAdminClient.setIamPolicy(resource, policy);
    * }
@@ -1006,7 +1011,10 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
    *
    * <pre>{@code
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-   *   String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
+   *   String resource =
+   *       CryptoKeyVersionName.of(
+   *               "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
+   *           .toString();
    *   Policy policy = Policy.newBuilder().build();
    *   Policy response = databaseAdminClient.setIamPolicy(resource, policy);
    * }
@@ -1040,7 +1048,14 @@ public final Policy setIamPolicy(String resource, Policy policy) {
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+   *           .setResource(
+   *               CryptoKeyVersionName.of(
+   *                       "[PROJECT]",
+   *                       "[LOCATION]",
+   *                       "[KEY_RING]",
+   *                       "[CRYPTO_KEY]",
+   *                       "[CRYPTO_KEY_VERSION]")
+   *                   .toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   Policy response = databaseAdminClient.setIamPolicy(request);
@@ -1069,7 +1084,14 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+   *           .setResource(
+   *               CryptoKeyVersionName.of(
+   *                       "[PROJECT]",
+   *                       "[LOCATION]",
+   *                       "[KEY_RING]",
+   *                       "[CRYPTO_KEY]",
+   *                       "[CRYPTO_KEY_VERSION]")
+   *                   .toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = databaseAdminClient.setIamPolicyCallable().futureCall(request);
@@ -1096,7 +1118,9 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
    *
    * <pre>{@code
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-   *   ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+   *   ResourceName resource =
+   *       CryptoKeyVersionName.of(
+   *           "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
    *   Policy response = databaseAdminClient.getIamPolicy(resource);
    * }
    * }</pre>
@@ -1127,7 +1151,10 @@ public final Policy getIamPolicy(ResourceName resource) {
    *
    * <pre>{@code
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-   *   String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
+   *   String resource =
+   *       CryptoKeyVersionName.of(
+   *               "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
+   *           .toString();
    *   Policy response = databaseAdminClient.getIamPolicy(resource);
    * }
    * }</pre>
@@ -1157,7 +1184,14 @@ public final Policy getIamPolicy(String resource) {
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+   *           .setResource(
+   *               CryptoKeyVersionName.of(
+   *                       "[PROJECT]",
+   *                       "[LOCATION]",
+   *                       "[KEY_RING]",
+   *                       "[CRYPTO_KEY]",
+   *                       "[CRYPTO_KEY_VERSION]")
+   *                   .toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   Policy response = databaseAdminClient.getIamPolicy(request);
@@ -1187,7 +1221,14 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+   *           .setResource(
+   *               CryptoKeyVersionName.of(
+   *                       "[PROJECT]",
+   *                       "[LOCATION]",
+   *                       "[KEY_RING]",
+   *                       "[CRYPTO_KEY]",
+   *                       "[CRYPTO_KEY_VERSION]")
+   *                   .toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future = databaseAdminClient.getIamPolicyCallable().futureCall(request);
@@ -1214,7 +1255,9 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
    *
    * <pre>{@code
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-   *   ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+   *   ResourceName resource =
+   *       CryptoKeyVersionName.of(
+   *           "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
    *   List<String> permissions = new ArrayList<>();
    *   TestIamPermissionsResponse response =
    *       databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1252,7 +1295,10 @@ public final TestIamPermissionsResponse testIamPermissions(
    *
    * <pre>{@code
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
-   *   String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
+   *   String resource =
+   *       CryptoKeyVersionName.of(
+   *               "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
+   *           .toString();
    *   List<String> permissions = new ArrayList<>();
    *   TestIamPermissionsResponse response =
    *       databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1292,7 +1338,14 @@ public final TestIamPermissionsResponse testIamPermissions(
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+   *           .setResource(
+   *               CryptoKeyVersionName.of(
+   *                       "[PROJECT]",
+   *                       "[LOCATION]",
+   *                       "[KEY_RING]",
+   *                       "[CRYPTO_KEY]",
+   *                       "[CRYPTO_KEY_VERSION]")
+   *                   .toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   TestIamPermissionsResponse response = databaseAdminClient.testIamPermissions(request);
@@ -1322,7 +1375,14 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    * try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
+   *           .setResource(
+   *               CryptoKeyVersionName.of(
+   *                       "[PROJECT]",
+   *                       "[LOCATION]",
+   *                       "[KEY_RING]",
+   *                       "[CRYPTO_KEY]",
+   *                       "[CRYPTO_KEY_VERSION]")
+   *                   .toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   ApiFuture<TestIamPermissionsResponse> future =
@@ -1449,6 +1509,7 @@ public final OperationFuture<Backup, CreateBackupMetadata> createBackupAsync(
    *           .setParent(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
    *           .setBackupId("backupId2121930365")
    *           .setBackup(Backup.newBuilder().build())
+   *           .setEncryptionConfig(CreateBackupEncryptionConfig.newBuilder().build())
    *           .build();
    *   Backup response = databaseAdminClient.createBackupAsync(request).get();
    * }
@@ -1484,6 +1545,7 @@ public final OperationFuture<Backup, CreateBackupMetadata> createBackupAsync(
    *           .setParent(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
    *           .setBackupId("backupId2121930365")
    *           .setBackup(Backup.newBuilder().build())
+   *           .setEncryptionConfig(CreateBackupEncryptionConfig.newBuilder().build())
    *           .build();
    *   OperationFuture<Backup, CreateBackupMetadata> future =
    *       databaseAdminClient.createBackupOperationCallable().futureCall(request);
@@ -1519,6 +1581,7 @@ public final OperationFuture<Backup, CreateBackupMetadata> createBackupAsync(
    *           .setParent(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
    *           .setBackupId("backupId2121930365")
    *           .setBackup(Backup.newBuilder().build())
+   *           .setEncryptionConfig(CreateBackupEncryptionConfig.newBuilder().build())
    *           .build();
    *   ApiFuture<Operation> future = databaseAdminClient.createBackupCallable().futureCall(request);
    *   // Do something.
@@ -2158,6 +2221,7 @@ public final OperationFuture<Database, RestoreDatabaseMetadata> restoreDatabaseA
    *       RestoreDatabaseRequest.newBuilder()
    *           .setParent(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
    *           .setDatabaseId("databaseId1688905718")
+   *           .setEncryptionConfig(RestoreDatabaseEncryptionConfig.newBuilder().build())
    *           .build();
    *   Database response = databaseAdminClient.restoreDatabaseAsync(request).get();
    * }
@@ -2196,6 +2260,7 @@ public final OperationFuture<Database, RestoreDatabaseMetadata> restoreDatabaseA
    *       RestoreDatabaseRequest.newBuilder()
    *           .setParent(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
    *           .setDatabaseId("databaseId1688905718")
+   *           .setEncryptionConfig(RestoreDatabaseEncryptionConfig.newBuilder().build())
    *           .build();
    *   OperationFuture<Database, RestoreDatabaseMetadata> future =
    *       databaseAdminClient.restoreDatabaseOperationCallable().futureCall(request);
@@ -2234,6 +2299,7 @@ public final OperationFuture<Database, RestoreDatabaseMetadata> restoreDatabaseA
    *       RestoreDatabaseRequest.newBuilder()
    *           .setParent(InstanceName.of("[PROJECT]", "[INSTANCE]").toString())
    *           .setDatabaseId("databaseId1688905718")
+   *           .setEncryptionConfig(RestoreDatabaseEncryptionConfig.newBuilder().build())
    *           .build();
    *   ApiFuture<Operation> future =
    *       databaseAdminClient.restoreDatabaseCallable().futureCall(request);

diff --git a/...anner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java b/...anner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2021 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/...loud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/gapic_metadata.json b/...loud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/gapic_metadata.json
@@ -0,0 +1,69 @@
+{
+  "schema": "1.0",
+  "comment": "This file maps proto services/RPCs to the corresponding library clients/methods",
+  "language": "java",
+  "protoPackage": "google.spanner.admin.database.v1",
+  "libraryPackage": "com.google.cloud.spanner.admin.database.v1",
+  "services": {
+    "DatabaseAdmin": {
+      "clients": {
+        "grpc": {
+          "libraryClient": "DatabaseAdminClient",
+          "rpcs": {
+            "CreateBackup": {
+              "methods": ["createBackupAsync", "createBackupAsync", "createBackupAsync", "createBackupOperationCallable", "createBackupCallable"]
+            },
+            "CreateDatabase": {
+              "methods": ["createDatabaseAsync", "createDatabaseAsync", "createDatabaseAsync", "createDatabaseOperationCallable", "createDatabaseCallable"]
+            },
+            "DeleteBackup": {
+              "methods": ["deleteBackup", "deleteBackup", "deleteBackup", "deleteBackupCallable"]
+            },
+            "DropDatabase": {
+              "methods": ["dropDatabase", "dropDatabase", "dropDatabase", "dropDatabaseCallable"]
+            },
+            "GetBackup": {
+              "methods": ["getBackup", "getBackup", "getBackup", "getBackupCallable"]
+            },
+            "GetDatabase": {
+              "methods": ["getDatabase", "getDatabase", "getDatabase", "getDatabaseCallable"]
+            },
+            "GetDatabaseDdl": {
+              "methods": ["getDatabaseDdl", "getDatabaseDdl", "getDatabaseDdl", "getDatabaseDdlCallable"]
+            },
+            "GetIamPolicy": {
+              "methods": ["getIamPolicy", "getIamPolicy", "getIamPolicy", "getIamPolicyCallable"]
+            },
+            "ListBackupOperations": {
+              "methods": ["listBackupOperations", "listBackupOperations", "listBackupOperations", "listBackupOperationsPagedCallable", "listBackupOperationsCallable"]
+            },
+            "ListBackups": {
+              "methods": ["listBackups", "listBackups", "listBackups", "listBackupsPagedCallable", "listBackupsCallable"]
+            },
+            "ListDatabaseOperations": {
+              "methods": ["listDatabaseOperations", "listDatabaseOperations", "listDatabaseOperations", "listDatabaseOperationsPagedCallable", "listDatabaseOperationsCallable"]
+            },
+            "ListDatabases": {
+              "methods": ["listDatabases", "listDatabases", "listDatabases", "listDatabasesPagedCallable", "listDatabasesCallable"]
+            },
+            "RestoreDatabase": {
+              "methods": ["restoreDatabaseAsync", "restoreDatabaseAsync", "restoreDatabaseAsync", "restoreDatabaseAsync", "restoreDatabaseAsync", "restoreDatabaseOperationCallable", "restoreDatabaseCallable"]
+            },
+            "SetIamPolicy": {
+              "methods": ["setIamPolicy", "setIamPolicy", "setIamPolicy", "setIamPolicyCallable"]
+            },
+            "TestIamPermissions": {
+              "methods": ["testIamPermissions", "testIamPermissions", "testIamPermissions", "testIamPermissionsCallable"]
+            },
+            "UpdateBackup": {
+              "methods": ["updateBackup", "updateBackup", "updateBackupCallable"]
+            },
+            "UpdateDatabaseDdl": {
+              "methods": ["updateDatabaseDdlAsync", "updateDatabaseDdlAsync", "updateDatabaseDdlAsync", "updateDatabaseDdlOperationCallable", "updateDatabaseDdlCallable"]
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/...-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java b/...-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2021 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/...nner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java b/...nner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2021 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/.../main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java b/.../main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2021 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/...ava/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java b/...ava/com/google/cloud/spanner/admin/database/v1/stub/GrpcDatabaseAdminCallableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.