Skip to content

Commit 734b4e6

Browse files
yoshi-automationyoshi-automation
authored
chore(bigtable): fix service name in resource annotation Type URIs (#1055)
* chore(bigtable): fix service name in resource annotation Type URIs PiperOrigin-RevId: 406846449 Source-Author: Google APIs <noreply@google.com> Source-Date: Mon Nov 1 09:36:19 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: f2afd8f4e897bcf8b6235ff3d5bd1860323877fb Source-Link: googleapis/googleapis@f2afd8f * chore: update Java and Python dependencies PiperOrigin-RevId: 408420890 Source-Author: Google APIs <noreply@google.com> Source-Date: Mon Nov 8 13:03:45 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: 2921f9fb3bfbd16f6b2da0104373e2b47a80a65e Source-Link: googleapis/googleapis@2921f9f
1 parent 57c4a42 commit 734b4e6

16 files changed

Lines changed: 670 additions & 661 deletions

File tree

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import com.google.bigtable.admin.v2.PartialUpdateInstanceRequest;
5353
import com.google.bigtable.admin.v2.ProjectName;
5454
import com.google.bigtable.admin.v2.StorageType;
55-
import com.google.bigtable.admin.v2.TableName;
5655
import com.google.bigtable.admin.v2.UpdateAppProfileRequest;
5756
import com.google.common.collect.Lists;
5857
import com.google.iam.v1.Binding;
@@ -1385,7 +1384,7 @@ public void getIamPolicyTest() throws Exception {
13851384
.build();
13861385
mockBigtableInstanceAdmin.addResponse(expectedResponse);
13871386

1388-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
1387+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
13891388

13901389
Policy actualResponse = client.getIamPolicy(resource);
13911390
Assert.assertEquals(expectedResponse, actualResponse);
@@ -1407,7 +1406,7 @@ public void getIamPolicyExceptionTest() throws Exception {
14071406
mockBigtableInstanceAdmin.addException(exception);
14081407

14091408
try {
1410-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
1409+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
14111410
client.getIamPolicy(resource);
14121411
Assert.fail("No exception raised");
14131412
} catch (InvalidArgumentException e) {
@@ -1465,7 +1464,7 @@ public void setIamPolicyTest() throws Exception {
14651464
.build();
14661465
mockBigtableInstanceAdmin.addResponse(expectedResponse);
14671466

1468-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
1467+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
14691468
Policy policy = Policy.newBuilder().build();
14701469

14711470
Policy actualResponse = client.setIamPolicy(resource, policy);
@@ -1489,7 +1488,7 @@ public void setIamPolicyExceptionTest() throws Exception {
14891488
mockBigtableInstanceAdmin.addException(exception);
14901489

14911490
try {
1492-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
1491+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
14931492
Policy policy = Policy.newBuilder().build();
14941493
client.setIamPolicy(resource, policy);
14951494
Assert.fail("No exception raised");
@@ -1547,7 +1546,7 @@ public void testIamPermissionsTest() throws Exception {
15471546
TestIamPermissionsResponse.newBuilder().addAllPermissions(new ArrayList<String>()).build();
15481547
mockBigtableInstanceAdmin.addResponse(expectedResponse);
15491548

1550-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
1549+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
15511550
List<String> permissions = new ArrayList<>();
15521551

15531552
TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
@@ -1571,7 +1570,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
15711570
mockBigtableInstanceAdmin.addException(exception);
15721571

15731572
try {
1574-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
1573+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
15751574
List<String> permissions = new ArrayList<>();
15761575
client.testIamPermissions(resource, permissions);
15771576
Assert.fail("No exception raised");

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.api.gax.rpc.InvalidArgumentException;
3030
import com.google.api.gax.rpc.StatusCode;
3131
import com.google.api.resourcenames.ResourceName;
32+
import com.google.bigtable.admin.v2.AppProfileName;
3233
import com.google.bigtable.admin.v2.Backup;
3334
import com.google.bigtable.admin.v2.BackupName;
3435
import com.google.bigtable.admin.v2.CheckConsistencyRequest;
@@ -1953,7 +1954,7 @@ public void getIamPolicyTest() throws Exception {
19531954
.build();
19541955
mockBigtableTableAdmin.addResponse(expectedResponse);
19551956

1956-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
1957+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
19571958

19581959
Policy actualResponse = client.getIamPolicy(resource);
19591960
Assert.assertEquals(expectedResponse, actualResponse);
@@ -1975,7 +1976,7 @@ public void getIamPolicyExceptionTest() throws Exception {
19751976
mockBigtableTableAdmin.addException(exception);
19761977

19771978
try {
1978-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
1979+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
19791980
client.getIamPolicy(resource);
19801981
Assert.fail("No exception raised");
19811982
} catch (InvalidArgumentException e) {
@@ -2033,7 +2034,7 @@ public void setIamPolicyTest() throws Exception {
20332034
.build();
20342035
mockBigtableTableAdmin.addResponse(expectedResponse);
20352036

2036-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
2037+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
20372038
Policy policy = Policy.newBuilder().build();
20382039

20392040
Policy actualResponse = client.setIamPolicy(resource, policy);
@@ -2057,7 +2058,7 @@ public void setIamPolicyExceptionTest() throws Exception {
20572058
mockBigtableTableAdmin.addException(exception);
20582059

20592060
try {
2060-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
2061+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
20612062
Policy policy = Policy.newBuilder().build();
20622063
client.setIamPolicy(resource, policy);
20632064
Assert.fail("No exception raised");
@@ -2115,7 +2116,7 @@ public void testIamPermissionsTest() throws Exception {
21152116
TestIamPermissionsResponse.newBuilder().addAllPermissions(new ArrayList<String>()).build();
21162117
mockBigtableTableAdmin.addResponse(expectedResponse);
21172118

2118-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
2119+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
21192120
List<String> permissions = new ArrayList<>();
21202121

21212122
TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
@@ -2139,7 +2140,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
21392140
mockBigtableTableAdmin.addException(exception);
21402141

21412142
try {
2142-
ResourceName resource = TableName.of("[PROJECT]", "[INSTANCE]", "[TABLE]");
2143+
ResourceName resource = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
21432144
List<String> permissions = new ArrayList<>();
21442145
client.testIamPermissions(resource, permissions);
21452146
Assert.fail("No exception raised");

‎grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminGrpc.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
@javax.annotation.Generated(
3030
value = "by gRPC proto compiler",
3131
comments = "Source: google/bigtable/admin/v2/bigtable_instance_admin.proto")
32+
@io.grpc.stub.annotations.GrpcGenerated
3233
public final class BigtableInstanceAdminGrpc {
3334

3435
private BigtableInstanceAdminGrpc() {}

‎grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
@javax.annotation.Generated(
3030
value = "by gRPC proto compiler",
3131
comments = "Source: google/bigtable/admin/v2/bigtable_table_admin.proto")
32+
@io.grpc.stub.annotations.GrpcGenerated
3233
public final class BigtableTableAdminGrpc {
3334

3435
private BigtableTableAdminGrpc() {}

‎grpc-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/BigtableGrpc.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
@javax.annotation.Generated(
2828
value = "by gRPC proto compiler",
2929
comments = "Source: google/bigtable/v2/bigtable.proto")
30+
@io.grpc.stub.annotations.GrpcGenerated
3031
public final class BigtableGrpc {
3132

3233
private BigtableGrpc() {}

0 commit comments

Comments
 (0)