Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit bd2d8b3

Browse files
feat: In Secret Manager, users can now use filter to customize the output of ListSecrets/ListSecretVersions calls (#544)
PiperOrigin-RevId: 387156636 Source-Author: Google APIs <noreply@google.com> Source-Date: Tue Jul 27 11:29:48 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: 2948f31dd210514f87ce6e1e08bce48ecf4660d1 Source-Link: googleapis/googleapis@2948f31 Co-authored-by: Neenu Shaji <Neenu1995@users.noreply.github.com>
1 parent ed61ecb commit bd2d8b3

File tree

8 files changed

+625
-124
lines changed

8 files changed

+625
-124
lines changed

google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceClient.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ public final ListSecretsPagedResponse listSecrets(String parent) {
235235
* .setParent(ProjectName.of("[PROJECT]").toString())
236236
* .setPageSize(883849137)
237237
* .setPageToken("pageToken873572522")
238+
* .setFilter("filter-1274492040")
238239
* .build();
239240
* for (Secret element : secretManagerServiceClient.listSecrets(request).iterateAll()) {
240241
* // doThingsWith(element);
@@ -263,6 +264,7 @@ public final ListSecretsPagedResponse listSecrets(ListSecretsRequest request) {
263264
* .setParent(ProjectName.of("[PROJECT]").toString())
264265
* .setPageSize(883849137)
265266
* .setPageToken("pageToken873572522")
267+
* .setFilter("filter-1274492040")
266268
* .build();
267269
* ApiFuture<Secret> future =
268270
* secretManagerServiceClient.listSecretsPagedCallable().futureCall(request);
@@ -292,6 +294,7 @@ public final ListSecretsPagedResponse listSecrets(ListSecretsRequest request) {
292294
* .setParent(ProjectName.of("[PROJECT]").toString())
293295
* .setPageSize(883849137)
294296
* .setPageToken("pageToken873572522")
297+
* .setFilter("filter-1274492040")
295298
* .build();
296299
* while (true) {
297300
* ListSecretsResponse response =
@@ -896,6 +899,7 @@ public final ListSecretVersionsPagedResponse listSecretVersions(String parent) {
896899
* .setParent(SecretName.of("[PROJECT]", "[SECRET]").toString())
897900
* .setPageSize(883849137)
898901
* .setPageToken("pageToken873572522")
902+
* .setFilter("filter-1274492040")
899903
* .build();
900904
* for (SecretVersion element :
901905
* secretManagerServiceClient.listSecretVersions(request).iterateAll()) {
@@ -927,6 +931,7 @@ public final ListSecretVersionsPagedResponse listSecretVersions(
927931
* .setParent(SecretName.of("[PROJECT]", "[SECRET]").toString())
928932
* .setPageSize(883849137)
929933
* .setPageToken("pageToken873572522")
934+
* .setFilter("filter-1274492040")
930935
* .build();
931936
* ApiFuture<SecretVersion> future =
932937
* secretManagerServiceClient.listSecretVersionsPagedCallable().futureCall(request);
@@ -957,6 +962,7 @@ public final ListSecretVersionsPagedResponse listSecretVersions(
957962
* .setParent(SecretName.of("[PROJECT]", "[SECRET]").toString())
958963
* .setPageSize(883849137)
959964
* .setPageToken("pageToken873572522")
965+
* .setFilter("filter-1274492040")
960966
* .build();
961967
* while (true) {
962968
* ListSecretVersionsResponse response =

proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/ListSecretVersionsRequest.java

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ private ListSecretVersionsRequest(com.google.protobuf.GeneratedMessageV3.Builder
4040
private ListSecretVersionsRequest() {
4141
parent_ = "";
4242
pageToken_ = "";
43+
filter_ = "";
4344
}
4445

4546
@java.lang.Override
@@ -90,6 +91,13 @@ private ListSecretVersionsRequest(
9091
pageToken_ = s;
9192
break;
9293
}
94+
case 34:
95+
{
96+
java.lang.String s = input.readStringRequireUtf8();
97+
98+
filter_ = s;
99+
break;
100+
}
93101
default:
94102
{
95103
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -252,6 +260,63 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
252260
}
253261
}
254262

263+
public static final int FILTER_FIELD_NUMBER = 4;
264+
private volatile java.lang.Object filter_;
265+
/**
266+
*
267+
*
268+
* <pre>
269+
* Optional. Filter string, adhering to the rules in
270+
* [List-operation
271+
* filtering](https://cloud.google.com/secret-manager/docs/filtering). List
272+
* only secret versions matching the filter. If filter is empty, all secret
273+
* versions are listed.
274+
* </pre>
275+
*
276+
* <code>string filter = 4 [(.google.api.field_behavior) = OPTIONAL];</code>
277+
*
278+
* @return The filter.
279+
*/
280+
@java.lang.Override
281+
public java.lang.String getFilter() {
282+
java.lang.Object ref = filter_;
283+
if (ref instanceof java.lang.String) {
284+
return (java.lang.String) ref;
285+
} else {
286+
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
287+
java.lang.String s = bs.toStringUtf8();
288+
filter_ = s;
289+
return s;
290+
}
291+
}
292+
/**
293+
*
294+
*
295+
* <pre>
296+
* Optional. Filter string, adhering to the rules in
297+
* [List-operation
298+
* filtering](https://cloud.google.com/secret-manager/docs/filtering). List
299+
* only secret versions matching the filter. If filter is empty, all secret
300+
* versions are listed.
301+
* </pre>
302+
*
303+
* <code>string filter = 4 [(.google.api.field_behavior) = OPTIONAL];</code>
304+
*
305+
* @return The bytes for filter.
306+
*/
307+
@java.lang.Override
308+
public com.google.protobuf.ByteString getFilterBytes() {
309+
java.lang.Object ref = filter_;
310+
if (ref instanceof java.lang.String) {
311+
com.google.protobuf.ByteString b =
312+
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
313+
filter_ = b;
314+
return b;
315+
} else {
316+
return (com.google.protobuf.ByteString) ref;
317+
}
318+
}
319+
255320
private byte memoizedIsInitialized = -1;
256321

257322
@java.lang.Override
@@ -275,6 +340,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
275340
if (!getPageTokenBytes().isEmpty()) {
276341
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pageToken_);
277342
}
343+
if (!getFilterBytes().isEmpty()) {
344+
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, filter_);
345+
}
278346
unknownFields.writeTo(output);
279347
}
280348

@@ -293,6 +361,9 @@ public int getSerializedSize() {
293361
if (!getPageTokenBytes().isEmpty()) {
294362
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pageToken_);
295363
}
364+
if (!getFilterBytes().isEmpty()) {
365+
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, filter_);
366+
}
296367
size += unknownFields.getSerializedSize();
297368
memoizedSize = size;
298369
return size;
@@ -312,6 +383,7 @@ public boolean equals(final java.lang.Object obj) {
312383
if (!getParent().equals(other.getParent())) return false;
313384
if (getPageSize() != other.getPageSize()) return false;
314385
if (!getPageToken().equals(other.getPageToken())) return false;
386+
if (!getFilter().equals(other.getFilter())) return false;
315387
if (!unknownFields.equals(other.unknownFields)) return false;
316388
return true;
317389
}
@@ -329,6 +401,8 @@ public int hashCode() {
329401
hash = (53 * hash) + getPageSize();
330402
hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
331403
hash = (53 * hash) + getPageToken().hashCode();
404+
hash = (37 * hash) + FILTER_FIELD_NUMBER;
405+
hash = (53 * hash) + getFilter().hashCode();
332406
hash = (29 * hash) + unknownFields.hashCode();
333407
memoizedHashCode = hash;
334408
return hash;
@@ -481,6 +555,8 @@ public Builder clear() {
481555

482556
pageToken_ = "";
483557

558+
filter_ = "";
559+
484560
return this;
485561
}
486562

@@ -511,6 +587,7 @@ public com.google.cloud.secretmanager.v1.ListSecretVersionsRequest buildPartial(
511587
result.parent_ = parent_;
512588
result.pageSize_ = pageSize_;
513589
result.pageToken_ = pageToken_;
590+
result.filter_ = filter_;
514591
onBuilt();
515592
return result;
516593
}
@@ -572,6 +649,10 @@ public Builder mergeFrom(com.google.cloud.secretmanager.v1.ListSecretVersionsReq
572649
pageToken_ = other.pageToken_;
573650
onChanged();
574651
}
652+
if (!other.getFilter().isEmpty()) {
653+
filter_ = other.filter_;
654+
onChanged();
655+
}
575656
this.mergeUnknownFields(other.unknownFields);
576657
onChanged();
577658
return this;
@@ -897,6 +978,132 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
897978
return this;
898979
}
899980

981+
private java.lang.Object filter_ = "";
982+
/**
983+
*
984+
*
985+
* <pre>
986+
* Optional. Filter string, adhering to the rules in
987+
* [List-operation
988+
* filtering](https://cloud.google.com/secret-manager/docs/filtering). List
989+
* only secret versions matching the filter. If filter is empty, all secret
990+
* versions are listed.
991+
* </pre>
992+
*
993+
* <code>string filter = 4 [(.google.api.field_behavior) = OPTIONAL];</code>
994+
*
995+
* @return The filter.
996+
*/
997+
public java.lang.String getFilter() {
998+
java.lang.Object ref = filter_;
999+
if (!(ref instanceof java.lang.String)) {
1000+
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
1001+
java.lang.String s = bs.toStringUtf8();
1002+
filter_ = s;
1003+
return s;
1004+
} else {
1005+
return (java.lang.String) ref;
1006+
}
1007+
}
1008+
/**
1009+
*
1010+
*
1011+
* <pre>
1012+
* Optional. Filter string, adhering to the rules in
1013+
* [List-operation
1014+
* filtering](https://cloud.google.com/secret-manager/docs/filtering). List
1015+
* only secret versions matching the filter. If filter is empty, all secret
1016+
* versions are listed.
1017+
* </pre>
1018+
*
1019+
* <code>string filter = 4 [(.google.api.field_behavior) = OPTIONAL];</code>
1020+
*
1021+
* @return The bytes for filter.
1022+
*/
1023+
public com.google.protobuf.ByteString getFilterBytes() {
1024+
java.lang.Object ref = filter_;
1025+
if (ref instanceof String) {
1026+
com.google.protobuf.ByteString b =
1027+
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
1028+
filter_ = b;
1029+
return b;
1030+
} else {
1031+
return (com.google.protobuf.ByteString) ref;
1032+
}
1033+
}
1034+
/**
1035+
*
1036+
*
1037+
* <pre>
1038+
* Optional. Filter string, adhering to the rules in
1039+
* [List-operation
1040+
* filtering](https://cloud.google.com/secret-manager/docs/filtering). List
1041+
* only secret versions matching the filter. If filter is empty, all secret
1042+
* versions are listed.
1043+
* </pre>
1044+
*
1045+
* <code>string filter = 4 [(.google.api.field_behavior) = OPTIONAL];</code>
1046+
*
1047+
* @param value The filter to set.
1048+
* @return This builder for chaining.
1049+
*/
1050+
public Builder setFilter(java.lang.String value) {
1051+
if (value == null) {
1052+
throw new NullPointerException();
1053+
}
1054+
1055+
filter_ = value;
1056+
onChanged();
1057+
return this;
1058+
}
1059+
/**
1060+
*
1061+
*
1062+
* <pre>
1063+
* Optional. Filter string, adhering to the rules in
1064+
* [List-operation
1065+
* filtering](https://cloud.google.com/secret-manager/docs/filtering). List
1066+
* only secret versions matching the filter. If filter is empty, all secret
1067+
* versions are listed.
1068+
* </pre>
1069+
*
1070+
* <code>string filter = 4 [(.google.api.field_behavior) = OPTIONAL];</code>
1071+
*
1072+
* @return This builder for chaining.
1073+
*/
1074+
public Builder clearFilter() {
1075+
1076+
filter_ = getDefaultInstance().getFilter();
1077+
onChanged();
1078+
return this;
1079+
}
1080+
/**
1081+
*
1082+
*
1083+
* <pre>
1084+
* Optional. Filter string, adhering to the rules in
1085+
* [List-operation
1086+
* filtering](https://cloud.google.com/secret-manager/docs/filtering). List
1087+
* only secret versions matching the filter. If filter is empty, all secret
1088+
* versions are listed.
1089+
* </pre>
1090+
*
1091+
* <code>string filter = 4 [(.google.api.field_behavior) = OPTIONAL];</code>
1092+
*
1093+
* @param value The bytes for filter to set.
1094+
* @return This builder for chaining.
1095+
*/
1096+
public Builder setFilterBytes(com.google.protobuf.ByteString value) {
1097+
if (value == null) {
1098+
throw new NullPointerException();
1099+
}
1100+
checkByteStringIsUtf8(value);
1101+
1102+
filter_ = value;
1103+
onChanged();
1104+
return this;
1105+
}
1106+
9001107
@java.lang.Override
9011108
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
9021109
return super.setUnknownFields(unknownFields);

proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/ListSecretVersionsRequestOrBuilder.java

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,37 @@ public interface ListSecretVersionsRequestOrBuilder
9797
* @return The bytes for pageToken.
9898
*/
9999
com.google.protobuf.ByteString getPageTokenBytes();
100+
101+
/**
102+
*
103+
*
104+
* <pre>
105+
* Optional. Filter string, adhering to the rules in
106+
* [List-operation
107+
* filtering](https://cloud.google.com/secret-manager/docs/filtering). List
108+
* only secret versions matching the filter. If filter is empty, all secret
109+
* versions are listed.
110+
* </pre>
111+
*
112+
* <code>string filter = 4 [(.google.api.field_behavior) = OPTIONAL];</code>
113+
*
114+
* @return The filter.
115+
*/
116+
java.lang.String getFilter();
117+
/**
118+
*
119+
*
120+
* <pre>
121+
* Optional. Filter string, adhering to the rules in
122+
* [List-operation
123+
* filtering](https://cloud.google.com/secret-manager/docs/filtering). List
124+
* only secret versions matching the filter. If filter is empty, all secret
125+
* versions are listed.
126+
* </pre>
127+
*
128+
* <code>string filter = 4 [(.google.api.field_behavior) = OPTIONAL];</code>
129+
*
130+
* @return The bytes for filter.
131+
*/
132+
com.google.protobuf.ByteString getFilterBytes();
100133
}

0 commit comments

Comments
 (0)