Skip to content

Commit

Permalink
chore: Integrate new gapic-generator-java and rules_gapic (#136)
Browse files Browse the repository at this point in the history 
- [ ] Regenerate this pull request now.

PiperOrigin-RevId: 454027580

Source-Link: googleapis/googleapis@1b22277

Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] authored Jun 13, 2022
1 parent c030baf commit 8af3fde
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
42 changes: 21 additions & 21 deletions java-iam-admin/google-iam-admin/src/main/java/com/google/cloud/iam/admin/v1/IAMClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public final ListServiceAccountsPagedResponse listServiceAccounts(
* while (true) {
* ListServiceAccountsResponse response =
* iAMClient.listServiceAccountsCallable().call(request);
* for (ServiceAccount element : response.getResponsesList()) {
* for (ServiceAccount element : response.getAccountsList()) {
* // doThingsWith(element);
* }
* String nextPageToken = response.getNextPageToken();
Expand Down Expand Up @@ -1979,7 +1979,7 @@ public final UnaryCallable<SignJwtRequest, SignJwtResponse> signJwtCallable() {
* // This snippet has been automatically generated for illustrative purposes only.
* // It may require modifications to work in your environment.
* try (IAMClient iAMClient = IAMClient.create()) {
* ResourceName resource = ProjectName.of("[PROJECT]");
* ResourceName resource = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
* Policy response = iAMClient.getIamPolicy(resource);
* }
* }</pre>
Expand Down Expand Up @@ -2048,7 +2048,7 @@ public final Policy getIamPolicy(String resource) {
* try (IAMClient iAMClient = IAMClient.create()) {
* GetIamPolicyRequest request =
* GetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
* .setOptions(GetPolicyOptions.newBuilder().build())
* .build();
* Policy response = iAMClient.getIamPolicy(request);
Expand Down Expand Up @@ -2082,7 +2082,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
* try (IAMClient iAMClient = IAMClient.create()) {
* GetIamPolicyRequest request =
* GetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
* .setOptions(GetPolicyOptions.newBuilder().build())
* .build();
* ApiFuture<Policy> future = iAMClient.getIamPolicyCallable().futureCall(request);
Expand Down Expand Up @@ -2118,7 +2118,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
* // This snippet has been automatically generated for illustrative purposes only.
* // It may require modifications to work in your environment.
* try (IAMClient iAMClient = IAMClient.create()) {
* ResourceName resource = ProjectName.of("[PROJECT]");
* ResourceName resource = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
* Policy policy = Policy.newBuilder().build();
* Policy response = iAMClient.setIamPolicy(resource, policy);
* }
Expand Down Expand Up @@ -2207,7 +2207,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
* try (IAMClient iAMClient = IAMClient.create()) {
* SetIamPolicyRequest request =
* SetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
* .setPolicy(Policy.newBuilder().build())
* .setUpdateMask(FieldMask.newBuilder().build())
* .build();
Expand Down Expand Up @@ -2247,7 +2247,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
* try (IAMClient iAMClient = IAMClient.create()) {
* SetIamPolicyRequest request =
* SetIamPolicyRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
* .setPolicy(Policy.newBuilder().build())
* .setUpdateMask(FieldMask.newBuilder().build())
* .build();
Expand All @@ -2272,7 +2272,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
* // This snippet has been automatically generated for illustrative purposes only.
* // It may require modifications to work in your environment.
* try (IAMClient iAMClient = IAMClient.create()) {
* ResourceName resource = ProjectName.of("[PROJECT]");
* ResourceName resource = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
* List<String> permissions = new ArrayList<>();
* TestIamPermissionsResponse response = iAMClient.testIamPermissions(resource, permissions);
* }
Expand Down Expand Up @@ -2342,7 +2342,7 @@ public final TestIamPermissionsResponse testIamPermissions(
* try (IAMClient iAMClient = IAMClient.create()) {
* TestIamPermissionsRequest request =
* TestIamPermissionsRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
* .addAllPermissions(new ArrayList<String>())
* .build();
* TestIamPermissionsResponse response = iAMClient.testIamPermissions(request);
Expand All @@ -2369,7 +2369,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
* try (IAMClient iAMClient = IAMClient.create()) {
* TestIamPermissionsRequest request =
* TestIamPermissionsRequest.newBuilder()
* .setResource(ProjectName.of("[PROJECT]").toString())
* .setResource(ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]").toString())
* .addAllPermissions(new ArrayList<String>())
* .build();
* ApiFuture<TestIamPermissionsResponse> future =
Expand Down Expand Up @@ -2499,7 +2499,7 @@ public final QueryGrantableRolesPagedResponse queryGrantableRoles(
* while (true) {
* QueryGrantableRolesResponse response =
* iAMClient.queryGrantableRolesCallable().call(request);
* for (Role element : response.getResponsesList()) {
* for (Role element : response.getRolesList()) {
* // doThingsWith(element);
* }
* String nextPageToken = response.getNextPageToken();
Expand Down Expand Up @@ -2601,7 +2601,7 @@ public final UnaryCallable<ListRolesRequest, ListRolesPagedResponse> listRolesPa
* .build();
* while (true) {
* ListRolesResponse response = iAMClient.listRolesCallable().call(request);
* for (Role element : response.getResponsesList()) {
* for (Role element : response.getRolesList()) {
* // doThingsWith(element);
* }
* String nextPageToken = response.getNextPageToken();
Expand Down Expand Up @@ -2629,7 +2629,7 @@ public final UnaryCallable<ListRolesRequest, ListRolesResponse> listRolesCallabl
* // It may require modifications to work in your environment.
* try (IAMClient iAMClient = IAMClient.create()) {
* GetRoleRequest request =
* GetRoleRequest.newBuilder().setName(ProjectName.of("[PROJECT]").toString()).build();
* GetRoleRequest.newBuilder().setName("GetRoleRequest84528163".toString()).build();
* Role response = iAMClient.getRole(request);
* }
* }</pre>
Expand All @@ -2652,7 +2652,7 @@ public final Role getRole(GetRoleRequest request) {
* // It may require modifications to work in your environment.
* try (IAMClient iAMClient = IAMClient.create()) {
* GetRoleRequest request =
* GetRoleRequest.newBuilder().setName(ProjectName.of("[PROJECT]").toString()).build();
* GetRoleRequest.newBuilder().setName("GetRoleRequest84528163".toString()).build();
* ApiFuture<Role> future = iAMClient.getRoleCallable().futureCall(request);
* // Do something.
* Role response = future.get();
Expand Down Expand Up @@ -2728,7 +2728,7 @@ public final UnaryCallable<CreateRoleRequest, Role> createRoleCallable() {
* try (IAMClient iAMClient = IAMClient.create()) {
* UpdateRoleRequest request =
* UpdateRoleRequest.newBuilder()
* .setName(ProjectName.of("[PROJECT]").toString())
* .setName("UpdateRoleRequest230834320".toString())
* .setRole(Role.newBuilder().build())
* .setUpdateMask(FieldMask.newBuilder().build())
* .build();
Expand All @@ -2755,7 +2755,7 @@ public final Role updateRole(UpdateRoleRequest request) {
* try (IAMClient iAMClient = IAMClient.create()) {
* UpdateRoleRequest request =
* UpdateRoleRequest.newBuilder()
* .setName(ProjectName.of("[PROJECT]").toString())
* .setName("UpdateRoleRequest230834320".toString())
* .setRole(Role.newBuilder().build())
* .setUpdateMask(FieldMask.newBuilder().build())
* .build();
Expand Down Expand Up @@ -2798,7 +2798,7 @@ public final UnaryCallable<UpdateRoleRequest, Role> updateRoleCallable() {
* try (IAMClient iAMClient = IAMClient.create()) {
* DeleteRoleRequest request =
* DeleteRoleRequest.newBuilder()
* .setName(ProjectName.of("[PROJECT]").toString())
* .setName("DeleteRoleRequest1468559982".toString())
* .setEtag(ByteString.EMPTY)
* .build();
* Role response = iAMClient.deleteRole(request);
Expand Down Expand Up @@ -2841,7 +2841,7 @@ public final Role deleteRole(DeleteRoleRequest request) {
* try (IAMClient iAMClient = IAMClient.create()) {
* DeleteRoleRequest request =
* DeleteRoleRequest.newBuilder()
* .setName(ProjectName.of("[PROJECT]").toString())
* .setName("DeleteRoleRequest1468559982".toString())
* .setEtag(ByteString.EMPTY)
* .build();
* ApiFuture<Role> future = iAMClient.deleteRoleCallable().futureCall(request);
Expand All @@ -2866,7 +2866,7 @@ public final UnaryCallable<DeleteRoleRequest, Role> deleteRoleCallable() {
* try (IAMClient iAMClient = IAMClient.create()) {
* UndeleteRoleRequest request =
* UndeleteRoleRequest.newBuilder()
* .setName(ProjectName.of("[PROJECT]").toString())
* .setName("UndeleteRoleRequest755355893".toString())
* .setEtag(ByteString.EMPTY)
* .build();
* Role response = iAMClient.undeleteRole(request);
Expand All @@ -2892,7 +2892,7 @@ public final Role undeleteRole(UndeleteRoleRequest request) {
* try (IAMClient iAMClient = IAMClient.create()) {
* UndeleteRoleRequest request =
* UndeleteRoleRequest.newBuilder()
* .setName(ProjectName.of("[PROJECT]").toString())
* .setName("UndeleteRoleRequest755355893".toString())
* .setEtag(ByteString.EMPTY)
* .build();
* ApiFuture<Role> future = iAMClient.undeleteRoleCallable().futureCall(request);
Expand Down Expand Up @@ -2987,7 +2987,7 @@ public final QueryTestablePermissionsPagedResponse queryTestablePermissions(
* while (true) {
* QueryTestablePermissionsResponse response =
* iAMClient.queryTestablePermissionsCallable().call(request);
* for (Permission element : response.getResponsesList()) {
* for (Permission element : response.getPermissionsList()) {
* // doThingsWith(element);
* }
* String nextPageToken = response.getNextPageToken();
Expand Down
28 changes: 14 additions & 14 deletions ...iam-admin/google-iam-admin/src/test/java/com/google/cloud/iam/admin/v1/IAMClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ public void getIamPolicyTest() throws Exception {
.build();
mockIAM.addResponse(expectedResponse);

ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");

Policy actualResponse = client.getIamPolicy(resource);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -1358,7 +1358,7 @@ public void getIamPolicyExceptionTest() throws Exception {
mockIAM.addException(exception);

try {
ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
client.getIamPolicy(resource);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
Expand Down Expand Up @@ -1418,7 +1418,7 @@ public void setIamPolicyTest() throws Exception {
.build();
mockIAM.addResponse(expectedResponse);

ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
Policy policy = Policy.newBuilder().build();

Policy actualResponse = client.setIamPolicy(resource, policy);
Expand All @@ -1442,7 +1442,7 @@ public void setIamPolicyExceptionTest() throws Exception {
mockIAM.addException(exception);

try {
ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
Policy policy = Policy.newBuilder().build();
client.setIamPolicy(resource, policy);
Assert.fail("No exception raised");
Expand Down Expand Up @@ -1501,7 +1501,7 @@ public void testIamPermissionsTest() throws Exception {
TestIamPermissionsResponse.newBuilder().addAllPermissions(new ArrayList<String>()).build();
mockIAM.addResponse(expectedResponse);

ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
List<String> permissions = new ArrayList<>();

TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
Expand All @@ -1525,7 +1525,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
mockIAM.addException(exception);

try {
ResourceName resource = ProjectName.of("[PROJECT]");
ResourceName resource = ServiceAccountName.of("[PROJECT]", "[SERVICE_ACCOUNT]");
List<String> permissions = new ArrayList<>();
client.testIamPermissions(resource, permissions);
Assert.fail("No exception raised");
Expand Down Expand Up @@ -1694,7 +1694,7 @@ public void getRoleTest() throws Exception {
mockIAM.addResponse(expectedResponse);

GetRoleRequest request =
GetRoleRequest.newBuilder().setName(ProjectName.of("[PROJECT]").toString()).build();
GetRoleRequest.newBuilder().setName("GetRoleRequest84528163".toString()).build();

Role actualResponse = client.getRole(request);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -1717,7 +1717,7 @@ public void getRoleExceptionTest() throws Exception {

try {
GetRoleRequest request =
GetRoleRequest.newBuilder().setName(ProjectName.of("[PROJECT]").toString()).build();
GetRoleRequest.newBuilder().setName("GetRoleRequest84528163".toString()).build();
client.getRole(request);
Assert.fail("No exception raised");
} catch (InvalidArgumentException e) {
Expand Down Expand Up @@ -1795,7 +1795,7 @@ public void updateRoleTest() throws Exception {

UpdateRoleRequest request =
UpdateRoleRequest.newBuilder()
.setName(ProjectName.of("[PROJECT]").toString())
.setName("UpdateRoleRequest230834320".toString())
.setRole(Role.newBuilder().build())
.setUpdateMask(FieldMask.newBuilder().build())
.build();
Expand Down Expand Up @@ -1824,7 +1824,7 @@ public void updateRoleExceptionTest() throws Exception {
try {
UpdateRoleRequest request =
UpdateRoleRequest.newBuilder()
.setName(ProjectName.of("[PROJECT]").toString())
.setName("UpdateRoleRequest230834320".toString())
.setRole(Role.newBuilder().build())
.setUpdateMask(FieldMask.newBuilder().build())
.build();
Expand All @@ -1850,7 +1850,7 @@ public void deleteRoleTest() throws Exception {

DeleteRoleRequest request =
DeleteRoleRequest.newBuilder()
.setName(ProjectName.of("[PROJECT]").toString())
.setName("DeleteRoleRequest1468559982".toString())
.setEtag(ByteString.EMPTY)
.build();

Expand All @@ -1877,7 +1877,7 @@ public void deleteRoleExceptionTest() throws Exception {
try {
DeleteRoleRequest request =
DeleteRoleRequest.newBuilder()
.setName(ProjectName.of("[PROJECT]").toString())
.setName("DeleteRoleRequest1468559982".toString())
.setEtag(ByteString.EMPTY)
.build();
client.deleteRole(request);
Expand All @@ -1902,7 +1902,7 @@ public void undeleteRoleTest() throws Exception {

UndeleteRoleRequest request =
UndeleteRoleRequest.newBuilder()
.setName(ProjectName.of("[PROJECT]").toString())
.setName("UndeleteRoleRequest755355893".toString())
.setEtag(ByteString.EMPTY)
.build();

Expand All @@ -1929,7 +1929,7 @@ public void undeleteRoleExceptionTest() throws Exception {
try {
UndeleteRoleRequest request =
UndeleteRoleRequest.newBuilder()
.setName(ProjectName.of("[PROJECT]").toString())
.setName("UndeleteRoleRequest755355893".toString())
.setEtag(ByteString.EMPTY)
.build();
client.undeleteRole(request);
Expand Down

0 comments on commit 8af3fde

Please sign in to comment.