From 7fe264ff6f364eaa1bf1c67cf672b63bbb13c138 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Tue, 12 Nov 2019 00:38:01 -0800 Subject: [PATCH 1/3] Regenerate spanner client --- .../spanner/v1/stub/SpannerStubSettings.java | 8 ++++---- .../database/v1/DatabaseAdminClientTest.java | 18 ++++++++++++------ .../instance/v1/InstanceAdminClientTest.java | 12 ++++++------ .../google-cloud-spanner/synth.metadata | 6 +++--- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java index 9ff8e044b342..a3059e7a9282 100644 --- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java +++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java @@ -401,9 +401,9 @@ public static class Builder extends StubSettings.Builder permissions = new ArrayList<>(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); @@ -427,7 +432,8 @@ public void testIamPermissionsExceptionTest() throws Exception { mockDatabaseAdmin.addException(exception); try { - ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); + ResourceName resource = + com.google.iam.v1.DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); List permissions = new ArrayList<>(); client.testIamPermissions(resource, permissions); diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java index ff9b20922e3e..48e63db661cf 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java @@ -456,7 +456,7 @@ public void setIamPolicyTest() { Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build(); mockInstanceAdmin.addResponse(expectedResponse); - ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); Policy policy = Policy.newBuilder().build(); Policy actualResponse = client.setIamPolicy(resource, policy); @@ -481,7 +481,7 @@ public void setIamPolicyExceptionTest() throws Exception { mockInstanceAdmin.addException(exception); try { - ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); Policy policy = Policy.newBuilder().build(); client.setIamPolicy(resource, policy); @@ -499,7 +499,7 @@ public void getIamPolicyTest() { Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build(); mockInstanceAdmin.addResponse(expectedResponse); - ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); @@ -522,7 +522,7 @@ public void getIamPolicyExceptionTest() throws Exception { mockInstanceAdmin.addException(exception); try { - ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); client.getIamPolicy(resource); Assert.fail("No exception raised"); @@ -537,7 +537,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse expectedResponse = TestIamPermissionsResponse.newBuilder().build(); mockInstanceAdmin.addResponse(expectedResponse); - ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); List permissions = new ArrayList<>(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); @@ -562,7 +562,7 @@ public void testIamPermissionsExceptionTest() throws Exception { mockInstanceAdmin.addException(exception); try { - ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); List permissions = new ArrayList<>(); client.testIamPermissions(resource, permissions); diff --git a/google-cloud-clients/google-cloud-spanner/synth.metadata b/google-cloud-clients/google-cloud-spanner/synth.metadata index 38424bd5e112..5d57371a5e21 100644 --- a/google-cloud-clients/google-cloud-spanner/synth.metadata +++ b/google-cloud-clients/google-cloud-spanner/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-11-10T08:39:49.702759Z", + "updateTime": "2019-11-12T08:38:01.293009Z", "sources": [ { "generator": { @@ -12,8 +12,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "1ef3bed9594674bb571ce20418af307505e3f609", - "internalRef": "279518887" + "sha": "f69562be0608904932bdcfbc5ad8b9a22d9dceb8", + "internalRef": "279774957" } } ], From 2104adeb3bc5cc7dd1d0f062cae77b6e0853bc1b Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Tue, 12 Nov 2019 21:53:21 +1100 Subject: [PATCH 2/3] Fix testSpannerDefaultRetrySettings test. Timeout parameters are updated to reflect timeout changes to spanner_gapic.yaml in googleapis/googleapis commit 6b12595. --- .../java/com/google/cloud/spanner/SpannerOptionsTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java index 8ca3e475fb64..d3cebbfc24f0 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java @@ -83,9 +83,9 @@ public void testSpannerDefaultRetrySettings() { .setInitialRetryDelay(Duration.ofMillis(250L)) .setRetryDelayMultiplier(1.3) .setMaxRetryDelay(Duration.ofMillis(32000L)) - .setInitialRpcTimeout(Duration.ofMillis(360000L)) + .setInitialRpcTimeout(Duration.ofMillis(3600000L)) .setRpcTimeoutMultiplier(1.0) - .setMaxRpcTimeout(Duration.ofMillis(360000L)) + .setMaxRpcTimeout(Duration.ofMillis(3600000L)) .setTotalTimeout(Duration.ofMillis(3600000L)) .build(); RetrySettings streamingRetrySettings = @@ -93,9 +93,9 @@ public void testSpannerDefaultRetrySettings() { .setInitialRetryDelay(Duration.ofMillis(250L)) .setRetryDelayMultiplier(1.3) .setMaxRetryDelay(Duration.ofMillis(32000L)) - .setInitialRpcTimeout(Duration.ofMillis(360000L)) + .setInitialRpcTimeout(Duration.ofMillis(3600000L)) .setRpcTimeoutMultiplier(1.0) - .setMaxRpcTimeout(Duration.ofMillis(360000L)) + .setMaxRpcTimeout(Duration.ofMillis(3600000L)) .setTotalTimeout(Duration.ofMillis(3600000L)) .build(); RetrySettings longRunningRetrySettings = From cdf6f2805ba209f5fbf449c014073a77f78c6148 Mon Sep 17 00:00:00 2001 From: Shanika Kuruppu Date: Tue, 12 Nov 2019 21:56:29 +1100 Subject: [PATCH 3/3] Remove incorrect "com.google.iam.v1." prefix. synthtool incorrectly generated code with a "com.google.iam.v1." prefix for DatabaseName and InstanceName. --- .../database/v1/DatabaseAdminClientTest.java | 18 ++++++------------ .../instance/v1/InstanceAdminClientTest.java | 12 ++++++------ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java index f852cfc9a706..a6c2e6bc6732 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java @@ -321,8 +321,7 @@ public void setIamPolicyTest() { Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build(); mockDatabaseAdmin.addResponse(expectedResponse); - ResourceName resource = - com.google.iam.v1.DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); + ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); Policy policy = Policy.newBuilder().build(); Policy actualResponse = client.setIamPolicy(resource, policy); @@ -347,8 +346,7 @@ public void setIamPolicyExceptionTest() throws Exception { mockDatabaseAdmin.addException(exception); try { - ResourceName resource = - com.google.iam.v1.DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); + ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); Policy policy = Policy.newBuilder().build(); client.setIamPolicy(resource, policy); @@ -366,8 +364,7 @@ public void getIamPolicyTest() { Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build(); mockDatabaseAdmin.addResponse(expectedResponse); - ResourceName resource = - com.google.iam.v1.DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); + ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); @@ -390,8 +387,7 @@ public void getIamPolicyExceptionTest() throws Exception { mockDatabaseAdmin.addException(exception); try { - ResourceName resource = - com.google.iam.v1.DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); + ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); client.getIamPolicy(resource); Assert.fail("No exception raised"); @@ -406,8 +402,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse expectedResponse = TestIamPermissionsResponse.newBuilder().build(); mockDatabaseAdmin.addResponse(expectedResponse); - ResourceName resource = - com.google.iam.v1.DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); + ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); List permissions = new ArrayList<>(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); @@ -432,8 +427,7 @@ public void testIamPermissionsExceptionTest() throws Exception { mockDatabaseAdmin.addException(exception); try { - ResourceName resource = - com.google.iam.v1.DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); + ResourceName resource = DatabaseName.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"); List permissions = new ArrayList<>(); client.testIamPermissions(resource, permissions); diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java index 48e63db661cf..ff9b20922e3e 100644 --- a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java +++ b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/instance/v1/InstanceAdminClientTest.java @@ -456,7 +456,7 @@ public void setIamPolicyTest() { Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build(); mockInstanceAdmin.addResponse(expectedResponse); - ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); Policy policy = Policy.newBuilder().build(); Policy actualResponse = client.setIamPolicy(resource, policy); @@ -481,7 +481,7 @@ public void setIamPolicyExceptionTest() throws Exception { mockInstanceAdmin.addException(exception); try { - ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); Policy policy = Policy.newBuilder().build(); client.setIamPolicy(resource, policy); @@ -499,7 +499,7 @@ public void getIamPolicyTest() { Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build(); mockInstanceAdmin.addResponse(expectedResponse); - ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); Policy actualResponse = client.getIamPolicy(resource); Assert.assertEquals(expectedResponse, actualResponse); @@ -522,7 +522,7 @@ public void getIamPolicyExceptionTest() throws Exception { mockInstanceAdmin.addException(exception); try { - ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); client.getIamPolicy(resource); Assert.fail("No exception raised"); @@ -537,7 +537,7 @@ public void testIamPermissionsTest() { TestIamPermissionsResponse expectedResponse = TestIamPermissionsResponse.newBuilder().build(); mockInstanceAdmin.addResponse(expectedResponse); - ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); List permissions = new ArrayList<>(); TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions); @@ -562,7 +562,7 @@ public void testIamPermissionsExceptionTest() throws Exception { mockInstanceAdmin.addException(exception); try { - ResourceName resource = com.google.iam.v1.InstanceName.of("[PROJECT]", "[INSTANCE]"); + ResourceName resource = InstanceName.of("[PROJECT]", "[INSTANCE]"); List permissions = new ArrayList<>(); client.testIamPermissions(resource, permissions);