Skip to content

Commit 7992342

Browse files
yoshi-automationyoshi-automation
authored
feat(spanner): add progress field to UpdateDatabaseDdlMetadata (#1063)
PiperOrigin-RevId: 368426665 Source-Author: Google APIs <[email protected]> Source-Date: Wed Apr 14 07:34:31 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: 3b236df084cf9222c529a2890f90e3a4ff0f2dfd Source-Link: googleapis/googleapis@3b236df
1 parent f997333 commit 7992342

File tree

65 files changed

+2691
-2068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2691
-2068
lines changed

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java‎

Lines changed: 69 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,9 @@ public final GetDatabaseDdlResponse getDatabaseDdl(GetDatabaseDdlRequest request
980980
*
981981
* <pre>{@code
982982
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
983-
* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
983+
* ResourceName resource =
984+
* CryptoKeyVersionName.of(
985+
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
984986
* Policy policy = Policy.newBuilder().build();
985987
* Policy response = databaseAdminClient.setIamPolicy(resource, policy);
986988
* }
@@ -1015,7 +1017,10 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
10151017
*
10161018
* <pre>{@code
10171019
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1018-
* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
1020+
* String resource =
1021+
* CryptoKeyVersionName.of(
1022+
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
1023+
* .toString();
10191024
* Policy policy = Policy.newBuilder().build();
10201025
* Policy response = databaseAdminClient.setIamPolicy(resource, policy);
10211026
* }
@@ -1049,7 +1054,14 @@ public final Policy setIamPolicy(String resource, Policy policy) {
10491054
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
10501055
* SetIamPolicyRequest request =
10511056
* SetIamPolicyRequest.newBuilder()
1052-
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
1057+
* .setResource(
1058+
* CryptoKeyVersionName.of(
1059+
* "[PROJECT]",
1060+
* "[LOCATION]",
1061+
* "[KEY_RING]",
1062+
* "[CRYPTO_KEY]",
1063+
* "[CRYPTO_KEY_VERSION]")
1064+
* .toString())
10531065
* .setPolicy(Policy.newBuilder().build())
10541066
* .build();
10551067
* Policy response = databaseAdminClient.setIamPolicy(request);
@@ -1078,7 +1090,14 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
10781090
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
10791091
* SetIamPolicyRequest request =
10801092
* SetIamPolicyRequest.newBuilder()
1081-
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
1093+
* .setResource(
1094+
* CryptoKeyVersionName.of(
1095+
* "[PROJECT]",
1096+
* "[LOCATION]",
1097+
* "[KEY_RING]",
1098+
* "[CRYPTO_KEY]",
1099+
* "[CRYPTO_KEY_VERSION]")
1100+
* .toString())
10821101
* .setPolicy(Policy.newBuilder().build())
10831102
* .build();
10841103
* ApiFuture<Policy> future = databaseAdminClient.setIamPolicyCallable().futureCall(request);
@@ -1105,7 +1124,9 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
11051124
*
11061125
* <pre>{@code
11071126
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1108-
* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
1127+
* ResourceName resource =
1128+
* CryptoKeyVersionName.of(
1129+
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
11091130
* Policy response = databaseAdminClient.getIamPolicy(resource);
11101131
* }
11111132
* }</pre>
@@ -1136,7 +1157,10 @@ public final Policy getIamPolicy(ResourceName resource) {
11361157
*
11371158
* <pre>{@code
11381159
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1139-
* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
1160+
* String resource =
1161+
* CryptoKeyVersionName.of(
1162+
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
1163+
* .toString();
11401164
* Policy response = databaseAdminClient.getIamPolicy(resource);
11411165
* }
11421166
* }</pre>
@@ -1166,7 +1190,14 @@ public final Policy getIamPolicy(String resource) {
11661190
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
11671191
* GetIamPolicyRequest request =
11681192
* GetIamPolicyRequest.newBuilder()
1169-
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
1193+
* .setResource(
1194+
* CryptoKeyVersionName.of(
1195+
* "[PROJECT]",
1196+
* "[LOCATION]",
1197+
* "[KEY_RING]",
1198+
* "[CRYPTO_KEY]",
1199+
* "[CRYPTO_KEY_VERSION]")
1200+
* .toString())
11701201
* .setOptions(GetPolicyOptions.newBuilder().build())
11711202
* .build();
11721203
* Policy response = databaseAdminClient.getIamPolicy(request);
@@ -1196,7 +1227,14 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
11961227
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
11971228
* GetIamPolicyRequest request =
11981229
* GetIamPolicyRequest.newBuilder()
1199-
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
1230+
* .setResource(
1231+
* CryptoKeyVersionName.of(
1232+
* "[PROJECT]",
1233+
* "[LOCATION]",
1234+
* "[KEY_RING]",
1235+
* "[CRYPTO_KEY]",
1236+
* "[CRYPTO_KEY_VERSION]")
1237+
* .toString())
12001238
* .setOptions(GetPolicyOptions.newBuilder().build())
12011239
* .build();
12021240
* ApiFuture<Policy> future = databaseAdminClient.getIamPolicyCallable().futureCall(request);
@@ -1223,7 +1261,9 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
12231261
*
12241262
* <pre>{@code
12251263
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1226-
* ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
1264+
* ResourceName resource =
1265+
* CryptoKeyVersionName.of(
1266+
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
12271267
* List<String> permissions = new ArrayList<>();
12281268
* TestIamPermissionsResponse response =
12291269
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1261,7 +1301,10 @@ public final TestIamPermissionsResponse testIamPermissions(
12611301
*
12621302
* <pre>{@code
12631303
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
1264-
* String resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString();
1304+
* String resource =
1305+
* CryptoKeyVersionName.of(
1306+
* "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]")
1307+
* .toString();
12651308
* List<String> permissions = new ArrayList<>();
12661309
* TestIamPermissionsResponse response =
12671310
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1301,7 +1344,14 @@ public final TestIamPermissionsResponse testIamPermissions(
13011344
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
13021345
* TestIamPermissionsRequest request =
13031346
* TestIamPermissionsRequest.newBuilder()
1304-
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
1347+
* .setResource(
1348+
* CryptoKeyVersionName.of(
1349+
* "[PROJECT]",
1350+
* "[LOCATION]",
1351+
* "[KEY_RING]",
1352+
* "[CRYPTO_KEY]",
1353+
* "[CRYPTO_KEY_VERSION]")
1354+
* .toString())
13051355
* .addAllPermissions(new ArrayList<String>())
13061356
* .build();
13071357
* TestIamPermissionsResponse response = databaseAdminClient.testIamPermissions(request);
@@ -1331,7 +1381,14 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
13311381
* try (DatabaseAdminClient databaseAdminClient = DatabaseAdminClient.create()) {
13321382
* TestIamPermissionsRequest request =
13331383
* TestIamPermissionsRequest.newBuilder()
1334-
* .setResource(DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]").toString())
1384+
* .setResource(
1385+
* CryptoKeyVersionName.of(
1386+
* "[PROJECT]",
1387+
* "[LOCATION]",
1388+
* "[KEY_RING]",
1389+
* "[CRYPTO_KEY]",
1390+
* "[CRYPTO_KEY_VERSION]")
1391+
* .toString())
13351392
* .addAllPermissions(new ArrayList<String>())
13361393
* .build();
13371394
* ApiFuture<TestIamPermissionsResponse> future =

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import com.google.spanner.admin.database.v1.BackupName;
4949
import com.google.spanner.admin.database.v1.CreateBackupRequest;
5050
import com.google.spanner.admin.database.v1.CreateDatabaseRequest;
51+
import com.google.spanner.admin.database.v1.CryptoKeyVersionName;
5152
import com.google.spanner.admin.database.v1.Database;
5253
import com.google.spanner.admin.database.v1.DatabaseName;
5354
import com.google.spanner.admin.database.v1.DeleteBackupRequest;
@@ -650,7 +651,9 @@ public void setIamPolicyTest() throws Exception {
650651
.build();
651652
mockDatabaseAdmin.addResponse(expectedResponse);
652653

653-
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
654+
ResourceName resource =
655+
CryptoKeyVersionName.of(
656+
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
654657
Policy policy = Policy.newBuilder().build();
655658

656659
Policy actualResponse = client.setIamPolicy(resource, policy);
@@ -674,7 +677,9 @@ public void setIamPolicyExceptionTest() throws Exception {
674677
mockDatabaseAdmin.addException(exception);
675678

676679
try {
677-
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
680+
ResourceName resource =
681+
CryptoKeyVersionName.of(
682+
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
678683
Policy policy = Policy.newBuilder().build();
679684
client.setIamPolicy(resource, policy);
680685
Assert.fail("No exception raised");
@@ -736,7 +741,9 @@ public void getIamPolicyTest() throws Exception {
736741
.build();
737742
mockDatabaseAdmin.addResponse(expectedResponse);
738743

739-
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
744+
ResourceName resource =
745+
CryptoKeyVersionName.of(
746+
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
740747

741748
Policy actualResponse = client.getIamPolicy(resource);
742749
Assert.assertEquals(expectedResponse, actualResponse);
@@ -758,7 +765,9 @@ public void getIamPolicyExceptionTest() throws Exception {
758765
mockDatabaseAdmin.addException(exception);
759766

760767
try {
761-
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
768+
ResourceName resource =
769+
CryptoKeyVersionName.of(
770+
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
762771
client.getIamPolicy(resource);
763772
Assert.fail("No exception raised");
764773
} catch (InvalidArgumentException e) {
@@ -812,7 +821,9 @@ public void testIamPermissionsTest() throws Exception {
812821
TestIamPermissionsResponse.newBuilder().addAllPermissions(new ArrayList<String>()).build();
813822
mockDatabaseAdmin.addResponse(expectedResponse);
814823

815-
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
824+
ResourceName resource =
825+
CryptoKeyVersionName.of(
826+
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
816827
List<String> permissions = new ArrayList<>();
817828

818829
TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
@@ -836,7 +847,9 @@ public void testIamPermissionsExceptionTest() throws Exception {
836847
mockDatabaseAdmin.addException(exception);
837848

838849
try {
839-
ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
850+
ResourceName resource =
851+
CryptoKeyVersionName.of(
852+
"[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
840853
List<String> permissions = new ArrayList<>();
841854
client.testIamPermissions(resource, permissions);
842855
Assert.fail("No exception raised");

0 commit comments

Comments
 (0)