Source-Date: Fri Apr 9 11:54:34 2021 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 94c6e8461bc03382ee475c7b93e954f288c1d1f4
Source-Link: https://github.com/googleapis/googleapis/commit/94c6e8461bc03382ee475c7b93e954f288c1d1f4
---
.../database/v1/DatabaseAdminClient.java | 81 ++++++++++++++++---
.../database/v1/DatabaseAdminClientTest.java | 25 ++++--
synth.metadata | 4 +-
3 files changed, 90 insertions(+), 20 deletions(-)
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
index d6bd422c242..2ee431beccb 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
@@ -980,7 +980,9 @@ public final GetDatabaseDdlResponse getDatabaseDdl(GetDatabaseDdlRequest request
*
* {@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);
* }
@@ -1015,7 +1017,10 @@ public final Policy setIamPolicy(ResourceName resource, Policy policy) {
*
* {@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);
* }
@@ -1049,7 +1054,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);
@@ -1078,7 +1090,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 future = databaseAdminClient.setIamPolicyCallable().futureCall(request);
@@ -1105,7 +1124,9 @@ public final UnaryCallable setIamPolicyCallable() {
*
* {@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);
* }
* }
@@ -1136,7 +1157,10 @@ public final Policy getIamPolicy(ResourceName resource) {
*
* {@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);
* }
* }
@@ -1166,7 +1190,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);
@@ -1196,7 +1227,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 future = databaseAdminClient.getIamPolicyCallable().futureCall(request);
@@ -1223,7 +1261,9 @@ public final UnaryCallable getIamPolicyCallable() {
*
* {@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 permissions = new ArrayList<>();
* TestIamPermissionsResponse response =
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1261,7 +1301,10 @@ public final TestIamPermissionsResponse testIamPermissions(
*
* {@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 permissions = new ArrayList<>();
* TestIamPermissionsResponse response =
* databaseAdminClient.testIamPermissions(resource, permissions);
@@ -1301,7 +1344,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())
* .build();
* TestIamPermissionsResponse response = databaseAdminClient.testIamPermissions(request);
@@ -1331,7 +1381,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())
* .build();
* ApiFuture future =
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
index 083ab701b49..6def238529d 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
@@ -48,6 +48,7 @@
import com.google.spanner.admin.database.v1.BackupName;
import com.google.spanner.admin.database.v1.CreateBackupRequest;
import com.google.spanner.admin.database.v1.CreateDatabaseRequest;
+import com.google.spanner.admin.database.v1.CryptoKeyVersionName;
import com.google.spanner.admin.database.v1.Database;
import com.google.spanner.admin.database.v1.DatabaseName;
import com.google.spanner.admin.database.v1.DeleteBackupRequest;
@@ -650,7 +651,9 @@ public void setIamPolicyTest() throws Exception {
.build();
mockDatabaseAdmin.addResponse(expectedResponse);
- 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 actualResponse = client.setIamPolicy(resource, policy);
@@ -674,7 +677,9 @@ public void setIamPolicyExceptionTest() throws Exception {
mockDatabaseAdmin.addException(exception);
try {
- 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();
client.setIamPolicy(resource, policy);
Assert.fail("No exception raised");
@@ -736,7 +741,9 @@ public void getIamPolicyTest() throws Exception {
.build();
mockDatabaseAdmin.addResponse(expectedResponse);
- ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+ ResourceName resource =
+ CryptoKeyVersionName.of(
+ "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
Policy actualResponse = client.getIamPolicy(resource);
Assert.assertEquals(expectedResponse, actualResponse);
@@ -758,7 +765,9 @@ public void getIamPolicyExceptionTest() throws Exception {
mockDatabaseAdmin.addException(exception);
try {
- ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+ ResourceName resource =
+ CryptoKeyVersionName.of(
+ "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
client.getIamPolicy(resource);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
@@ -812,7 +821,9 @@ public void testIamPermissionsTest() throws Exception {
TestIamPermissionsResponse.newBuilder().addAllPermissions(new ArrayList()).build();
mockDatabaseAdmin.addResponse(expectedResponse);
- ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+ ResourceName resource =
+ CryptoKeyVersionName.of(
+ "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
List permissions = new ArrayList<>();
TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
@@ -836,7 +847,9 @@ public void testIamPermissionsExceptionTest() throws Exception {
mockDatabaseAdmin.addException(exception);
try {
- ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]");
+ ResourceName resource =
+ CryptoKeyVersionName.of(
+ "[PROJECT]", "[LOCATION]", "[KEY_RING]", "[CRYPTO_KEY]", "[CRYPTO_KEY_VERSION]");
List permissions = new ArrayList<>();
client.testIamPermissions(resource, permissions);
Assert.fail("No exception raised");
diff --git a/synth.metadata b/synth.metadata
index 8699c27e0f4..bd6267ce978 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,8 +11,8 @@
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
- "sha": "6ce40ff8faf68226782f507ca6b2d497a77044de",
- "internalRef": "365498709"
+ "sha": "94c6e8461bc03382ee475c7b93e954f288c1d1f4",
+ "internalRef": "367675548"
}
},
{
From 0b59b946b31c4b5ca95a2c279bdc835f23f1a923 Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate
Date: Tue, 13 Apr 2021 05:44:59 +0200
Subject: [PATCH 10/11] deps: update dependency
com.google.cloud:google-cloud-monitoring to v2.2.0 (#1054)
---
samples/install-without-bom/pom.xml | 2 +-
samples/snapshot/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 1a27d70eb48..0a1e9abdea5 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -23,7 +23,7 @@
UTF-8
0.28.3
1.3.1
- 2.1.0
+ 2.2.0
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 6fb69d5bd19..7060735fbf9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -23,7 +23,7 @@
UTF-8
0.28.3
1.3.1
- 2.1.0
+ 2.2.0
From 9a2a285931654c03efe1764be2f5f7fe99821d10 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 14:21:05 +1000
Subject: [PATCH 11/11] chore: release 6.2.1 (#1046)
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
CHANGELOG.md | 9 +++++++++
google-cloud-spanner-bom/pom.xml | 18 +++++++++---------
google-cloud-spanner/pom.xml | 4 ++--
.../pom.xml | 4 ++--
.../pom.xml | 4 ++--
grpc-google-cloud-spanner-v1/pom.xml | 4 ++--
pom.xml | 16 ++++++++--------
.../pom.xml | 4 ++--
.../pom.xml | 4 ++--
proto-google-cloud-spanner-v1/pom.xml | 4 ++--
samples/snapshot/pom.xml | 2 +-
versions.txt | 14 +++++++-------
12 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85027a625fc..d9c3034eed3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# Changelog
+### [6.2.1](https://www.github.com/googleapis/java-spanner/compare/v6.2.0...v6.2.1) (2021-04-13)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-monitoring to v2.2.0 ([#1054](https://www.github.com/googleapis/java-spanner/issues/1054)) ([0b59b94](https://www.github.com/googleapis/java-spanner/commit/0b59b946b31c4b5ca95a2c279bdc835f23f1a923))
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.0 ([#1045](https://www.github.com/googleapis/java-spanner/issues/1045)) ([94dcb46](https://www.github.com/googleapis/java-spanner/commit/94dcb468e807516f07777fc62faff345441ccdf6))
+* update dependency com.google.cloud:google-cloud-trace to v1.3.1 ([#1050](https://www.github.com/googleapis/java-spanner/issues/1050)) ([cbb1038](https://www.github.com/googleapis/java-spanner/commit/cbb103846e33210c914f51f64e1e47f32ff775da))
+
## [6.2.0](https://www.github.com/googleapis/java-spanner/compare/v6.1.0...v6.2.0) (2021-04-07)
diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml
index 7916b832e6a..0af487556f8 100644
--- a/google-cloud-spanner-bom/pom.xml
+++ b/google-cloud-spanner-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-spanner-bom
- 6.2.1-SNAPSHOT
+ 6.2.1
pom
com.google.cloud
@@ -64,43 +64,43 @@
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.2.1-SNAPSHOT
+ 6.2.1
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.2.1-SNAPSHOT
+ 6.2.1
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.2.1-SNAPSHOT
+ 6.2.1
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.2.1-SNAPSHOT
+ 6.2.1
com.google.cloud
google-cloud-spanner
- 6.2.1-SNAPSHOT
+ 6.2.1
com.google.cloud
google-cloud-spanner
test-jar
- 6.2.1-SNAPSHOT
+ 6.2.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.2.1-SNAPSHOT
+ 6.2.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.2.1-SNAPSHOT
+ 6.2.1