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

Commit 9aac609

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: replace java_outer_classname option with use_java_stubby_library, add DisableServiceAccountKey and EnableServiceAccountKey, and update comments (#170)
* feat: replace java_outer_classname option with use_java_stubby_library, add DisableServiceAccountKey and EnableServiceAccountKey, and update comments PiperOrigin-RevId: 474647927 Source-Link: googleapis/googleapis@a0a740c Source-Link: https://github.com/googleapis/googleapis-gen/commit/5849ad110f25eef1e08daf29bd5a81f11fb65424 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTg0OWFkMTEwZjI1ZWVmMWUwOGRhZjI5YmQ1YTgxZjExZmI2NTQyNCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent f3a0571 commit 9aac609

File tree

77 files changed

+4231
-1400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+4231
-1400
lines changed

‎google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/IAMClient.java‎

Lines changed: 303 additions & 35 deletions
Large diffs are not rendered by default.

‎google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/IAMSettings.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
import com.google.iam.admin.v1.DeleteRoleRequest;
4040
import com.google.iam.admin.v1.DeleteServiceAccountKeyRequest;
4141
import com.google.iam.admin.v1.DeleteServiceAccountRequest;
42+
import com.google.iam.admin.v1.DisableServiceAccountKeyRequest;
4243
import com.google.iam.admin.v1.DisableServiceAccountRequest;
44+
import com.google.iam.admin.v1.EnableServiceAccountKeyRequest;
4345
import com.google.iam.admin.v1.EnableServiceAccountRequest;
4446
import com.google.iam.admin.v1.GetRoleRequest;
4547
import com.google.iam.admin.v1.GetServiceAccountKeyRequest;
@@ -197,6 +199,18 @@ public UnaryCallSettings<DisableServiceAccountRequest, Empty> disableServiceAcco
197199
return ((IAMStubSettings) getStubSettings()).deleteServiceAccountKeySettings();
198200
}
199201

202+
/** Returns the object with the settings used for calls to disableServiceAccountKey. */
203+
public UnaryCallSettings<DisableServiceAccountKeyRequest, Empty>
204+
disableServiceAccountKeySettings() {
205+
return ((IAMStubSettings) getStubSettings()).disableServiceAccountKeySettings();
206+
}
207+
208+
/** Returns the object with the settings used for calls to enableServiceAccountKey. */
209+
public UnaryCallSettings<EnableServiceAccountKeyRequest, Empty>
210+
enableServiceAccountKeySettings() {
211+
return ((IAMStubSettings) getStubSettings()).enableServiceAccountKeySettings();
212+
}
213+
200214
/**
201215
* Returns the object with the settings used for calls to signBlob.
202216
*
@@ -474,6 +488,18 @@ public Builder applyToAllUnaryMethods(
474488
return getStubSettingsBuilder().deleteServiceAccountKeySettings();
475489
}
476490

491+
/** Returns the builder for the settings used for calls to disableServiceAccountKey. */
492+
public UnaryCallSettings.Builder<DisableServiceAccountKeyRequest, Empty>
493+
disableServiceAccountKeySettings() {
494+
return getStubSettingsBuilder().disableServiceAccountKeySettings();
495+
}
496+
497+
/** Returns the builder for the settings used for calls to enableServiceAccountKey. */
498+
public UnaryCallSettings.Builder<EnableServiceAccountKeyRequest, Empty>
499+
enableServiceAccountKeySettings() {
500+
return getStubSettingsBuilder().enableServiceAccountKeySettings();
501+
}
502+
477503
/**
478504
* Returns the builder for the settings used for calls to signBlob.
479505
*

‎google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/gapic_metadata.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,15 @@
3131
"DisableServiceAccount": {
3232
"methods": ["disableServiceAccount", "disableServiceAccountCallable"]
3333
},
34+
"DisableServiceAccountKey": {
35+
"methods": ["disableServiceAccountKey", "disableServiceAccountKey", "disableServiceAccountKey", "disableServiceAccountKeyCallable"]
36+
},
3437
"EnableServiceAccount": {
3538
"methods": ["enableServiceAccount", "enableServiceAccountCallable"]
3639
},
40+
"EnableServiceAccountKey": {
41+
"methods": ["enableServiceAccountKey", "enableServiceAccountKey", "enableServiceAccountKey", "enableServiceAccountKeyCallable"]
42+
},
3743
"GetIamPolicy": {
3844
"methods": ["getIamPolicy", "getIamPolicy", "getIamPolicy", "getIamPolicyCallable"]
3945
},

‎google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/package-info.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
/**
18-
* The interfaces provided are listed below, along with usage samples.
18+
* A client to Identity and Access Management (IAM) API
19+
*
20+
* <p>The interfaces provided are listed below, along with usage samples.
1921
*
2022
* <p>======================= IAMClient =======================
2123
*
@@ -29,9 +31,9 @@
2931
* <li>&#42;&#42;Service account keys&#42;&#42;, which service accounts use to authenticate with
3032
* Google APIs
3133
* <li>&#42;&#42;IAM policies for service accounts&#42;&#42;, which specify the roles that a
32-
* member has for the service account
34+
* principal has for the service account
3335
* <li>&#42;&#42;IAM custom roles&#42;&#42;, which help you limit the number of permissions that
34-
* you grant to members
36+
* you grant to principals
3537
* </ul>
3638
*
3739
* <p>In addition, you can use this service to complete the following tasks, among others:
@@ -42,6 +44,14 @@
4244
* <li>Lint, or validate, condition expressions in an IAM policy
4345
* </ul>
4446
*
47+
* <p>When you read data from the IAM API, each read is eventually consistent. In other words, if
48+
* you write data with the IAM API, then immediately read that data, the read operation might return
49+
* an older version of the data. To deal with this behavior, your application can retry the request
50+
* with truncated exponential backoff.
51+
*
52+
* <p>In contrast, writing data to the IAM API is sequentially consistent. In other words, write
53+
* operations are always processed in the order in which they were received.
54+
*
4555
* <p>Sample for IAMClient:
4656
*
4757
* <pre>{@code

‎google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/stub/GrpcIAMStub.java‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
import com.google.iam.admin.v1.DeleteRoleRequest;
3535
import com.google.iam.admin.v1.DeleteServiceAccountKeyRequest;
3636
import com.google.iam.admin.v1.DeleteServiceAccountRequest;
37+
import com.google.iam.admin.v1.DisableServiceAccountKeyRequest;
3738
import com.google.iam.admin.v1.DisableServiceAccountRequest;
39+
import com.google.iam.admin.v1.EnableServiceAccountKeyRequest;
3840
import com.google.iam.admin.v1.EnableServiceAccountRequest;
3941
import com.google.iam.admin.v1.GetRoleRequest;
4042
import com.google.iam.admin.v1.GetServiceAccountKeyRequest;
@@ -233,6 +235,26 @@ public class GrpcIAMStub extends IAMStub {
233235
.setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
234236
.build();
235237

238+
private static final MethodDescriptor<DisableServiceAccountKeyRequest, Empty>
239+
disableServiceAccountKeyMethodDescriptor =
240+
MethodDescriptor.<DisableServiceAccountKeyRequest, Empty>newBuilder()
241+
.setType(MethodDescriptor.MethodType.UNARY)
242+
.setFullMethodName("google.iam.admin.v1.IAM/DisableServiceAccountKey")
243+
.setRequestMarshaller(
244+
ProtoUtils.marshaller(DisableServiceAccountKeyRequest.getDefaultInstance()))
245+
.setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
246+
.build();
247+
248+
private static final MethodDescriptor<EnableServiceAccountKeyRequest, Empty>
249+
enableServiceAccountKeyMethodDescriptor =
250+
MethodDescriptor.<EnableServiceAccountKeyRequest, Empty>newBuilder()
251+
.setType(MethodDescriptor.MethodType.UNARY)
252+
.setFullMethodName("google.iam.admin.v1.IAM/EnableServiceAccountKey")
253+
.setRequestMarshaller(
254+
ProtoUtils.marshaller(EnableServiceAccountKeyRequest.getDefaultInstance()))
255+
.setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
256+
.build();
257+
236258
private static final MethodDescriptor<SignBlobRequest, SignBlobResponse>
237259
signBlobMethodDescriptor =
238260
MethodDescriptor.<SignBlobRequest, SignBlobResponse>newBuilder()
@@ -397,6 +419,10 @@ public class GrpcIAMStub extends IAMStub {
397419
uploadServiceAccountKeyCallable;
398420
private final UnaryCallable<DeleteServiceAccountKeyRequest, Empty>
399421
deleteServiceAccountKeyCallable;
422+
private final UnaryCallable<DisableServiceAccountKeyRequest, Empty>
423+
disableServiceAccountKeyCallable;
424+
private final UnaryCallable<EnableServiceAccountKeyRequest, Empty>
425+
enableServiceAccountKeyCallable;
400426
private final UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable;
401427
private final UnaryCallable<SignJwtRequest, SignJwtResponse> signJwtCallable;
402428
private final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable;
@@ -613,6 +639,28 @@ protected GrpcIAMStub(
613639
return params.build();
614640
})
615641
.build();
642+
GrpcCallSettings<DisableServiceAccountKeyRequest, Empty>
643+
disableServiceAccountKeyTransportSettings =
644+
GrpcCallSettings.<DisableServiceAccountKeyRequest, Empty>newBuilder()
645+
.setMethodDescriptor(disableServiceAccountKeyMethodDescriptor)
646+
.setParamsExtractor(
647+
request -> {
648+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
649+
params.put("name", String.valueOf(request.getName()));
650+
return params.build();
651+
})
652+
.build();
653+
GrpcCallSettings<EnableServiceAccountKeyRequest, Empty>
654+
enableServiceAccountKeyTransportSettings =
655+
GrpcCallSettings.<EnableServiceAccountKeyRequest, Empty>newBuilder()
656+
.setMethodDescriptor(enableServiceAccountKeyMethodDescriptor)
657+
.setParamsExtractor(
658+
request -> {
659+
ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
660+
params.put("name", String.valueOf(request.getName()));
661+
return params.build();
662+
})
663+
.build();
616664
GrpcCallSettings<SignBlobRequest, SignBlobResponse> signBlobTransportSettings =
617665
GrpcCallSettings.<SignBlobRequest, SignBlobResponse>newBuilder()
618666
.setMethodDescriptor(signBlobMethodDescriptor)
@@ -821,6 +869,16 @@ protected GrpcIAMStub(
821869
deleteServiceAccountKeyTransportSettings,
822870
settings.deleteServiceAccountKeySettings(),
823871
clientContext);
872+
this.disableServiceAccountKeyCallable =
873+
callableFactory.createUnaryCallable(
874+
disableServiceAccountKeyTransportSettings,
875+
settings.disableServiceAccountKeySettings(),
876+
clientContext);
877+
this.enableServiceAccountKeyCallable =
878+
callableFactory.createUnaryCallable(
879+
enableServiceAccountKeyTransportSettings,
880+
settings.enableServiceAccountKeySettings(),
881+
clientContext);
824882
this.signBlobCallable =
825883
callableFactory.createUnaryCallable(
826884
signBlobTransportSettings, settings.signBlobSettings(), clientContext);
@@ -978,6 +1036,16 @@ public UnaryCallable<DeleteServiceAccountKeyRequest, Empty> deleteServiceAccount
9781036
return deleteServiceAccountKeyCallable;
9791037
}
9801038

1039+
@Override
1040+
public UnaryCallable<DisableServiceAccountKeyRequest, Empty> disableServiceAccountKeyCallable() {
1041+
return disableServiceAccountKeyCallable;
1042+
}
1043+
1044+
@Override
1045+
public UnaryCallable<EnableServiceAccountKeyRequest, Empty> enableServiceAccountKeyCallable() {
1046+
return enableServiceAccountKeyCallable;
1047+
}
1048+
9811049
@Override
9821050
public UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable() {
9831051
return signBlobCallable;

‎google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/stub/IAMStub.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
import com.google.iam.admin.v1.DeleteRoleRequest;
3030
import com.google.iam.admin.v1.DeleteServiceAccountKeyRequest;
3131
import com.google.iam.admin.v1.DeleteServiceAccountRequest;
32+
import com.google.iam.admin.v1.DisableServiceAccountKeyRequest;
3233
import com.google.iam.admin.v1.DisableServiceAccountRequest;
34+
import com.google.iam.admin.v1.EnableServiceAccountKeyRequest;
3335
import com.google.iam.admin.v1.EnableServiceAccountRequest;
3436
import com.google.iam.admin.v1.GetRoleRequest;
3537
import com.google.iam.admin.v1.GetServiceAccountKeyRequest;
@@ -145,6 +147,14 @@ public UnaryCallable<DeleteServiceAccountKeyRequest, Empty> deleteServiceAccount
145147
throw new UnsupportedOperationException("Not implemented: deleteServiceAccountKeyCallable()");
146148
}
147149

150+
public UnaryCallable<DisableServiceAccountKeyRequest, Empty> disableServiceAccountKeyCallable() {
151+
throw new UnsupportedOperationException("Not implemented: disableServiceAccountKeyCallable()");
152+
}
153+
154+
public UnaryCallable<EnableServiceAccountKeyRequest, Empty> enableServiceAccountKeyCallable() {
155+
throw new UnsupportedOperationException("Not implemented: enableServiceAccountKeyCallable()");
156+
}
157+
148158
@Deprecated
149159
public UnaryCallable<SignBlobRequest, SignBlobResponse> signBlobCallable() {
150160
throw new UnsupportedOperationException("Not implemented: signBlobCallable()");

‎google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/stub/IAMStubSettings.java‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353
import com.google.iam.admin.v1.DeleteRoleRequest;
5454
import com.google.iam.admin.v1.DeleteServiceAccountKeyRequest;
5555
import com.google.iam.admin.v1.DeleteServiceAccountRequest;
56+
import com.google.iam.admin.v1.DisableServiceAccountKeyRequest;
5657
import com.google.iam.admin.v1.DisableServiceAccountRequest;
58+
import com.google.iam.admin.v1.EnableServiceAccountKeyRequest;
5759
import com.google.iam.admin.v1.EnableServiceAccountRequest;
5860
import com.google.iam.admin.v1.GetRoleRequest;
5961
import com.google.iam.admin.v1.GetServiceAccountKeyRequest;
@@ -162,6 +164,10 @@ public class IAMStubSettings extends StubSettings<IAMStubSettings> {
162164
uploadServiceAccountKeySettings;
163165
private final UnaryCallSettings<DeleteServiceAccountKeyRequest, Empty>
164166
deleteServiceAccountKeySettings;
167+
private final UnaryCallSettings<DisableServiceAccountKeyRequest, Empty>
168+
disableServiceAccountKeySettings;
169+
private final UnaryCallSettings<EnableServiceAccountKeyRequest, Empty>
170+
enableServiceAccountKeySettings;
165171
private final UnaryCallSettings<SignBlobRequest, SignBlobResponse> signBlobSettings;
166172
private final UnaryCallSettings<SignJwtRequest, SignJwtResponse> signJwtSettings;
167173
private final UnaryCallSettings<GetIamPolicyRequest, Policy> getIamPolicySettings;
@@ -510,6 +516,18 @@ public UnaryCallSettings<DisableServiceAccountRequest, Empty> disableServiceAcco
510516
return deleteServiceAccountKeySettings;
511517
}
512518

519+
/** Returns the object with the settings used for calls to disableServiceAccountKey. */
520+
public UnaryCallSettings<DisableServiceAccountKeyRequest, Empty>
521+
disableServiceAccountKeySettings() {
522+
return disableServiceAccountKeySettings;
523+
}
524+
525+
/** Returns the object with the settings used for calls to enableServiceAccountKey. */
526+
public UnaryCallSettings<EnableServiceAccountKeyRequest, Empty>
527+
enableServiceAccountKeySettings() {
528+
return enableServiceAccountKeySettings;
529+
}
530+
513531
/**
514532
* Returns the object with the settings used for calls to signBlob.
515533
*
@@ -692,6 +710,8 @@ protected IAMStubSettings(Builder settingsBuilder) throws IOException {
692710
createServiceAccountKeySettings = settingsBuilder.createServiceAccountKeySettings().build();
693711
uploadServiceAccountKeySettings = settingsBuilder.uploadServiceAccountKeySettings().build();
694712
deleteServiceAccountKeySettings = settingsBuilder.deleteServiceAccountKeySettings().build();
713+
disableServiceAccountKeySettings = settingsBuilder.disableServiceAccountKeySettings().build();
714+
enableServiceAccountKeySettings = settingsBuilder.enableServiceAccountKeySettings().build();
695715
signBlobSettings = settingsBuilder.signBlobSettings().build();
696716
signJwtSettings = settingsBuilder.signJwtSettings().build();
697717
getIamPolicySettings = settingsBuilder.getIamPolicySettings().build();
@@ -745,6 +765,10 @@ public static class Builder extends StubSettings.Builder<IAMStubSettings, Builde
745765
uploadServiceAccountKeySettings;
746766
private final UnaryCallSettings.Builder<DeleteServiceAccountKeyRequest, Empty>
747767
deleteServiceAccountKeySettings;
768+
private final UnaryCallSettings.Builder<DisableServiceAccountKeyRequest, Empty>
769+
disableServiceAccountKeySettings;
770+
private final UnaryCallSettings.Builder<EnableServiceAccountKeyRequest, Empty>
771+
enableServiceAccountKeySettings;
748772
private final UnaryCallSettings.Builder<SignBlobRequest, SignBlobResponse> signBlobSettings;
749773
private final UnaryCallSettings.Builder<SignJwtRequest, SignJwtResponse> signJwtSettings;
750774
private final UnaryCallSettings.Builder<GetIamPolicyRequest, Policy> getIamPolicySettings;
@@ -842,6 +866,8 @@ protected Builder(ClientContext clientContext) {
842866
createServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
843867
uploadServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
844868
deleteServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
869+
disableServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
870+
enableServiceAccountKeySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
845871
signBlobSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
846872
signJwtSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
847873
getIamPolicySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -876,6 +902,8 @@ protected Builder(ClientContext clientContext) {
876902
createServiceAccountKeySettings,
877903
uploadServiceAccountKeySettings,
878904
deleteServiceAccountKeySettings,
905+
disableServiceAccountKeySettings,
906+
enableServiceAccountKeySettings,
879907
signBlobSettings,
880908
signJwtSettings,
881909
getIamPolicySettings,
@@ -911,6 +939,8 @@ protected Builder(IAMStubSettings settings) {
911939
createServiceAccountKeySettings = settings.createServiceAccountKeySettings.toBuilder();
912940
uploadServiceAccountKeySettings = settings.uploadServiceAccountKeySettings.toBuilder();
913941
deleteServiceAccountKeySettings = settings.deleteServiceAccountKeySettings.toBuilder();
942+
disableServiceAccountKeySettings = settings.disableServiceAccountKeySettings.toBuilder();
943+
enableServiceAccountKeySettings = settings.enableServiceAccountKeySettings.toBuilder();
914944
signBlobSettings = settings.signBlobSettings.toBuilder();
915945
signJwtSettings = settings.signJwtSettings.toBuilder();
916946
getIamPolicySettings = settings.getIamPolicySettings.toBuilder();
@@ -943,6 +973,8 @@ protected Builder(IAMStubSettings settings) {
943973
createServiceAccountKeySettings,
944974
uploadServiceAccountKeySettings,
945975
deleteServiceAccountKeySettings,
976+
disableServiceAccountKeySettings,
977+
enableServiceAccountKeySettings,
946978
signBlobSettings,
947979
signJwtSettings,
948980
getIamPolicySettings,
@@ -1044,6 +1076,16 @@ private static Builder initDefaults(Builder builder) {
10441076
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
10451077
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
10461078

1079+
builder
1080+
.disableServiceAccountKeySettings()
1081+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
1082+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
1083+
1084+
builder
1085+
.enableServiceAccountKeySettings()
1086+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
1087+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
1088+
10471089
builder
10481090
.signBlobSettings()
10491091
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
@@ -1224,6 +1266,18 @@ public Builder applyToAllUnaryMethods(
12241266
return deleteServiceAccountKeySettings;
12251267
}
12261268

1269+
/** Returns the builder for the settings used for calls to disableServiceAccountKey. */
1270+
public UnaryCallSettings.Builder<DisableServiceAccountKeyRequest, Empty>
1271+
disableServiceAccountKeySettings() {
1272+
return disableServiceAccountKeySettings;
1273+
}
1274+
1275+
/** Returns the builder for the settings used for calls to enableServiceAccountKey. */
1276+
public UnaryCallSettings.Builder<EnableServiceAccountKeyRequest, Empty>
1277+
enableServiceAccountKeySettings() {
1278+
return enableServiceAccountKeySettings;
1279+
}
1280+
12271281
/**
12281282
* Returns the builder for the settings used for calls to signBlob.
12291283
*

0 commit comments

Comments
 (0)