Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(spanner): add progress field to UpdateDatabaseDdlMetadata #1063

Merged
merged 1 commit into from Apr 15, 2021
Merged

feat(spanner): add progress field to UpdateDatabaseDdlMetadata #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
81 changes: 69 additions & 12 deletions ...spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
View file
Open in desktop
Expand Up @@ -980,7 +980,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);
* }
Expand Down Expand Up @@ -1015,7 +1017,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);
* }
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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<Policy> future = databaseAdminClient.setIamPolicyCallable().futureCall(request);
Expand All @@ -1105,7 +1124,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>
Expand Down Expand Up @@ -1136,7 +1157,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>
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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<Policy> future = databaseAdminClient.getIamPolicyCallable().futureCall(request);
Expand All @@ -1223,7 +1261,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);
Expand Down Expand Up @@ -1261,7 +1301,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);
Expand Down Expand Up @@ -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<String>())
* .build();
* TestIamPermissionsResponse response = databaseAdminClient.testIamPermissions(request);
Expand Down Expand Up @@ -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<String>())
* .build();
* ApiFuture<TestIamPermissionsResponse> future =
Expand Down
25 changes: 19 additions & 6 deletions ...ner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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");
Expand Down Expand Up @@ -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);
Expand All @@ -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) {
Expand Down Expand Up @@ -812,7 +821,9 @@ public void testIamPermissionsTest() throws Exception {
TestIamPermissionsResponse.newBuilder().addAllPermissions(new ArrayList<String>()).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<String> permissions = new ArrayList<>();

TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
Expand All @@ -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<String> permissions = new ArrayList<>();
client.testIamPermissions(resource, permissions);
Assert.fail("No exception raised");
Expand Down