Skip to content

Commit e039386

Browse files
yoshi-automationkolea2
yoshi-automation
and
kolea2
authored
feat: publish new fields for CMEK support (#646)
* chore: update gapic-generator-java to 0.0.20 Committer: @miraleung PiperOrigin-RevId: 357800868 Source-Author: Google APIs <[email protected]> Source-Date: Tue Feb 16 14:06:04 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: e8bc4471a88ac5f60defe3ed436f517174e59ba0 Source-Link: googleapis/googleapis@e8bc447 * chore: release gapic-generator-java v0.0.21 with gapic_metadata.json support Committer: @miraleung PiperOrigin-RevId: 358516065 Source-Author: Google APIs <[email protected]> Source-Date: Fri Feb 19 17:43:23 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: af8f71dae961ee036a0ac52a1965270149a6b2c9 Source-Link: googleapis/googleapis@af8f71d * feat: Publish new fields to support Customer Managed Encryption Keys (CMEK) on the existing Cloud Bigtable service methods. PiperOrigin-RevId: 359130387 Source-Author: Google APIs <[email protected]> Source-Date: Tue Feb 23 14:08:20 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: eabec5a21219401bad79e1cc7d900c1658aee5fd Source-Link: googleapis/googleapis@eabec5a * fix build Co-authored-by: Kristen O'Leary <[email protected]>
1 parent c5049c1 commit e039386

30 files changed

+5058
-211
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,6 +1141,8 @@ public final UnaryCallable<ListClustersRequest, ListClustersResponse> listCluste
11411141
* .setName(ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]").toString())
11421142
* .setLocation(LocationName.of("[PROJECT]", "[LOCATION]").toString())
11431143
* .setServeNodes(-1288838783)
1144+
* .setDefaultStorageType(StorageType.forNumber(0))
1145+
* .setEncryptionConfig(Cluster.EncryptionConfig.newBuilder().build())
11441146
* .build();
11451147
* Cluster response = baseBigtableInstanceAdminClient.updateClusterAsync(request).get();
11461148
* }
@@ -1167,6 +1169,8 @@ public final OperationFuture<Cluster, UpdateClusterMetadata> updateClusterAsync(
11671169
* .setName(ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]").toString())
11681170
* .setLocation(LocationName.of("[PROJECT]", "[LOCATION]").toString())
11691171
* .setServeNodes(-1288838783)
1172+
* .setDefaultStorageType(StorageType.forNumber(0))
1173+
* .setEncryptionConfig(Cluster.EncryptionConfig.newBuilder().build())
11701174
* .build();
11711175
* OperationFuture<Cluster, UpdateClusterMetadata> future =
11721176
* baseBigtableInstanceAdminClient.updateClusterOperationCallable().futureCall(request);
@@ -1194,6 +1198,8 @@ public final OperationFuture<Cluster, UpdateClusterMetadata> updateClusterAsync(
11941198
* .setName(ClusterName.of("[PROJECT]", "[INSTANCE]", "[CLUSTER]").toString())
11951199
* .setLocation(LocationName.of("[PROJECT]", "[LOCATION]").toString())
11961200
* .setServeNodes(-1288838783)
1201+
* .setDefaultStorageType(StorageType.forNumber(0))
1202+
* .setEncryptionConfig(Cluster.EncryptionConfig.newBuilder().build())
11971203
* .build();
11981204
* ApiFuture<Operation> future =
11991205
* baseBigtableInstanceAdminClient.updateClusterCallable().futureCall(request);

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/gapic_metadata.json‎

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
{
2+
"schema": "1.0",
3+
"comment": "This file maps proto services/RPCs to the corresponding library clients/methods",
4+
"language": "java",
5+
"protoPackage": "google.bigtable.admin.v2",
6+
"libraryPackage": "com.google.cloud.bigtable.admin.v2",
7+
"services": {
8+
"BigtableInstanceAdmin": {
9+
"clients": {
10+
"grpc": {
11+
"libraryClient": "BaseBigtableInstanceAdminClient",
12+
"rpcs": {
13+
"CreateAppProfile": {
14+
"methods": ["createAppProfile", "createAppProfile", "createAppProfile", "createAppProfileCallable"]
15+
},
16+
"CreateCluster": {
17+
"methods": ["createClusterAsync", "createClusterAsync", "createClusterAsync", "createClusterOperationCallable", "createClusterCallable"]
18+
},
19+
"CreateInstance": {
20+
"methods": ["createInstanceAsync", "createInstanceAsync", "createInstanceAsync", "createInstanceOperationCallable", "createInstanceCallable"]
21+
},
22+
"DeleteAppProfile": {
23+
"methods": ["deleteAppProfile", "deleteAppProfile", "deleteAppProfile", "deleteAppProfileCallable"]
24+
},
25+
"DeleteCluster": {
26+
"methods": ["deleteCluster", "deleteCluster", "deleteCluster", "deleteClusterCallable"]
27+
},
28+
"DeleteInstance": {
29+
"methods": ["deleteInstance", "deleteInstance", "deleteInstance", "deleteInstanceCallable"]
30+
},
31+
"GetAppProfile": {
32+
"methods": ["getAppProfile", "getAppProfile", "getAppProfile", "getAppProfileCallable"]
33+
},
34+
"GetCluster": {
35+
"methods": ["getCluster", "getCluster", "getCluster", "getClusterCallable"]
36+
},
37+
"GetIamPolicy": {
38+
"methods": ["getIamPolicy", "getIamPolicy", "getIamPolicy", "getIamPolicyCallable"]
39+
},
40+
"GetInstance": {
41+
"methods": ["getInstance", "getInstance", "getInstance", "getInstanceCallable"]
42+
},
43+
"ListAppProfiles": {
44+
"methods": ["listAppProfiles", "listAppProfiles", "listAppProfiles", "listAppProfilesPagedCallable", "listAppProfilesCallable"]
45+
},
46+
"ListClusters": {
47+
"methods": ["listClusters", "listClusters", "listClusters", "listClustersCallable"]
48+
},
49+
"ListInstances": {
50+
"methods": ["listInstances", "listInstances", "listInstances", "listInstancesCallable"]
51+
},
52+
"PartialUpdateInstance": {
53+
"methods": ["partialUpdateInstanceAsync", "partialUpdateInstanceAsync", "partialUpdateInstanceOperationCallable", "partialUpdateInstanceCallable"]
54+
},
55+
"SetIamPolicy": {
56+
"methods": ["setIamPolicy", "setIamPolicy", "setIamPolicy", "setIamPolicyCallable"]
57+
},
58+
"TestIamPermissions": {
59+
"methods": ["testIamPermissions", "testIamPermissions", "testIamPermissions", "testIamPermissionsCallable"]
60+
},
61+
"UpdateAppProfile": {
62+
"methods": ["updateAppProfileAsync", "updateAppProfileAsync", "updateAppProfileOperationCallable", "updateAppProfileCallable"]
63+
},
64+
"UpdateCluster": {
65+
"methods": ["updateClusterAsync", "updateClusterOperationCallable", "updateClusterCallable"]
66+
},
67+
"UpdateInstance": {
68+
"methods": ["updateInstance", "updateInstanceCallable"]
69+
}
70+
}
71+
}
72+
}
73+
},
74+
"BigtableTableAdmin": {
75+
"clients": {
76+
"grpc": {
77+
"libraryClient": "BaseBigtableTableAdminClient",
78+
"rpcs": {
79+
"CheckConsistency": {
80+
"methods": ["checkConsistency", "checkConsistency", "checkConsistency", "checkConsistencyCallable"]
81+
},
82+
"CreateBackup": {
83+
"methods": ["createBackupAsync", "createBackupAsync", "createBackupAsync", "createBackupOperationCallable", "createBackupCallable"]
84+
},
85+
"CreateTable": {
86+
"methods": ["createTable", "createTable", "createTable", "createTableCallable"]
87+
},
88+
"CreateTableFromSnapshot": {
89+
"methods": ["createTableFromSnapshotAsync", "createTableFromSnapshotAsync", "createTableFromSnapshotAsync", "createTableFromSnapshotAsync", "createTableFromSnapshotAsync", "createTableFromSnapshotOperationCallable", "createTableFromSnapshotCallable"]
90+
},
91+
"DeleteBackup": {
92+
"methods": ["deleteBackup", "deleteBackup", "deleteBackup", "deleteBackupCallable"]
93+
},
94+
"DeleteSnapshot": {
95+
"methods": ["deleteSnapshot", "deleteSnapshot", "deleteSnapshot", "deleteSnapshotCallable"]
96+
},
97+
"DeleteTable": {
98+
"methods": ["deleteTable", "deleteTable", "deleteTable", "deleteTableCallable"]
99+
},
100+
"DropRowRange": {
101+
"methods": ["dropRowRange", "dropRowRangeCallable"]
102+
},
103+
"GenerateConsistencyToken": {
104+
"methods": ["generateConsistencyToken", "generateConsistencyToken", "generateConsistencyToken", "generateConsistencyTokenCallable"]
105+
},
106+
"GetBackup": {
107+
"methods": ["getBackup", "getBackup", "getBackup", "getBackupCallable"]
108+
},
109+
"GetIamPolicy": {
110+
"methods": ["getIamPolicy", "getIamPolicy", "getIamPolicy", "getIamPolicyCallable"]
111+
},
112+
"GetSnapshot": {
113+
"methods": ["getSnapshot", "getSnapshot", "getSnapshot", "getSnapshotCallable"]
114+
},
115+
"GetTable": {
116+
"methods": ["getTable", "getTable", "getTable", "getTableCallable"]
117+
},
118+
"ListBackups": {
119+
"methods": ["listBackups", "listBackups", "listBackups", "listBackupsPagedCallable", "listBackupsCallable"]
120+
},
121+
"ListSnapshots": {
122+
"methods": ["listSnapshots", "listSnapshots", "listSnapshots", "listSnapshotsPagedCallable", "listSnapshotsCallable"]
123+
},
124+
"ListTables": {
125+
"methods": ["listTables", "listTables", "listTables", "listTablesPagedCallable", "listTablesCallable"]
126+
},
127+
"ModifyColumnFamilies": {
128+
"methods": ["modifyColumnFamilies", "modifyColumnFamilies", "modifyColumnFamilies", "modifyColumnFamiliesCallable"]
129+
},
130+
"RestoreTable": {
131+
"methods": ["restoreTableAsync", "restoreTableOperationCallable", "restoreTableCallable"]
132+
},
133+
"SetIamPolicy": {
134+
"methods": ["setIamPolicy", "setIamPolicy", "setIamPolicy", "setIamPolicyCallable"]
135+
},
136+
"SnapshotTable": {
137+
"methods": ["snapshotTableAsync", "snapshotTableAsync", "snapshotTableAsync", "snapshotTableAsync", "snapshotTableAsync", "snapshotTableOperationCallable", "snapshotTableCallable"]
138+
},
139+
"TestIamPermissions": {
140+
"methods": ["testIamPermissions", "testIamPermissions", "testIamPermissions", "testIamPermissionsCallable"]
141+
},
142+
"UpdateBackup": {
143+
"methods": ["updateBackup", "updateBackup", "updateBackupCallable"]
144+
}
145+
}
146+
}
147+
}
148+
}
149+
}
150+
}

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,108 +689,133 @@ public GrpcOperationsStub getOperationsStub() {
689689
return operationsStub;
690690
}
691691

692+
@Override
692693
public UnaryCallable<CreateInstanceRequest, Operation> createInstanceCallable() {
693694
return createInstanceCallable;
694695
}
695696

697+
@Override
696698
public OperationCallable<CreateInstanceRequest, Instance, CreateInstanceMetadata>
697699
createInstanceOperationCallable() {
698700
return createInstanceOperationCallable;
699701
}
700702

703+
@Override
701704
public UnaryCallable<GetInstanceRequest, Instance> getInstanceCallable() {
702705
return getInstanceCallable;
703706
}
704707

708+
@Override
705709
public UnaryCallable<ListInstancesRequest, ListInstancesResponse> listInstancesCallable() {
706710
return listInstancesCallable;
707711
}
708712

713+
@Override
709714
public UnaryCallable<Instance, Instance> updateInstanceCallable() {
710715
return updateInstanceCallable;
711716
}
712717

718+
@Override
713719
public UnaryCallable<PartialUpdateInstanceRequest, Operation> partialUpdateInstanceCallable() {
714720
return partialUpdateInstanceCallable;
715721
}
716722

723+
@Override
717724
public OperationCallable<PartialUpdateInstanceRequest, Instance, UpdateInstanceMetadata>
718725
partialUpdateInstanceOperationCallable() {
719726
return partialUpdateInstanceOperationCallable;
720727
}
721728

729+
@Override
722730
public UnaryCallable<DeleteInstanceRequest, Empty> deleteInstanceCallable() {
723731
return deleteInstanceCallable;
724732
}
725733

734+
@Override
726735
public UnaryCallable<CreateClusterRequest, Operation> createClusterCallable() {
727736
return createClusterCallable;
728737
}
729738

739+
@Override
730740
public OperationCallable<CreateClusterRequest, Cluster, CreateClusterMetadata>
731741
createClusterOperationCallable() {
732742
return createClusterOperationCallable;
733743
}
734744

745+
@Override
735746
public UnaryCallable<GetClusterRequest, Cluster> getClusterCallable() {
736747
return getClusterCallable;
737748
}
738749

750+
@Override
739751
public UnaryCallable<ListClustersRequest, ListClustersResponse> listClustersCallable() {
740752
return listClustersCallable;
741753
}
742754

755+
@Override
743756
public UnaryCallable<Cluster, Operation> updateClusterCallable() {
744757
return updateClusterCallable;
745758
}
746759

760+
@Override
747761
public OperationCallable<Cluster, Cluster, UpdateClusterMetadata>
748762
updateClusterOperationCallable() {
749763
return updateClusterOperationCallable;
750764
}
751765

766+
@Override
752767
public UnaryCallable<DeleteClusterRequest, Empty> deleteClusterCallable() {
753768
return deleteClusterCallable;
754769
}
755770

771+
@Override
756772
public UnaryCallable<CreateAppProfileRequest, AppProfile> createAppProfileCallable() {
757773
return createAppProfileCallable;
758774
}
759775

776+
@Override
760777
public UnaryCallable<GetAppProfileRequest, AppProfile> getAppProfileCallable() {
761778
return getAppProfileCallable;
762779
}
763780

781+
@Override
764782
public UnaryCallable<ListAppProfilesRequest, ListAppProfilesResponse> listAppProfilesCallable() {
765783
return listAppProfilesCallable;
766784
}
767785

786+
@Override
768787
public UnaryCallable<ListAppProfilesRequest, ListAppProfilesPagedResponse>
769788
listAppProfilesPagedCallable() {
770789
return listAppProfilesPagedCallable;
771790
}
772791

792+
@Override
773793
public UnaryCallable<UpdateAppProfileRequest, Operation> updateAppProfileCallable() {
774794
return updateAppProfileCallable;
775795
}
776796

797+
@Override
777798
public OperationCallable<UpdateAppProfileRequest, AppProfile, UpdateAppProfileMetadata>
778799
updateAppProfileOperationCallable() {
779800
return updateAppProfileOperationCallable;
780801
}
781802

803+
@Override
782804
public UnaryCallable<DeleteAppProfileRequest, Empty> deleteAppProfileCallable() {
783805
return deleteAppProfileCallable;
784806
}
785807

808+
@Override
786809
public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
787810
return getIamPolicyCallable;
788811
}
789812

813+
@Override
790814
public UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
791815
return setIamPolicyCallable;
792816
}
793817

818+
@Override
794819
public UnaryCallable<TestIamPermissionsRequest, TestIamPermissionsResponse>
795820
testIamPermissionsCallable() {
796821
return testIamPermissionsCallable;

0 commit comments

Comments
 (0)