Skip to content

Commit 2f492a8

Browse files
renovate-boteaball35
renovate-bot
and
eaball35
authored
chore(deps): update dependency com.google.apis:google-api-services-cloudresourcemanager to v3 (GoogleCloudPlatform#5543)
* chore(deps): update dependency com.google.apis:google-api-services-cloudresourcemanager to v3 * chore: change back * chore: update package names * chore: remove space * chore: include projects/ prefix Co-authored-by: Emily Ball <emilyball@google.com>
1 parent 74ee52d commit 2f492a8

File tree

10 files changed

+34
-34
lines changed

10 files changed

+34
-34
lines changed

‎iam/api-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.apis</groupId>
4242
<artifactId>google-api-services-cloudresourcemanager</artifactId>
43-
<version>v1-rev20210613-1.32.1</version><!-- v1 required here, v2 is different - DO NOT UPDATE to v2 -->
43+
<version>v3-rev20210601-1.31.5</version><!-- v1 required here, v2 is different - DO NOT UPDATE to v2 -->
4444
</dependency>
4545
<dependency>
4646
<groupId>com.google.auth</groupId>

‎iam/api-client/src/main/java/iam/snippets/AddBinding.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package iam.snippets;
1717

1818
// [START iam_modify_policy_add_role]
19-
import com.google.api.services.cloudresourcemanager.model.Binding;
20-
import com.google.api.services.cloudresourcemanager.model.Policy;
19+
import com.google.api.services.cloudresourcemanager.v3.model.Binding;
20+
import com.google.api.services.cloudresourcemanager.v3.model.Policy;
2121
import java.util.ArrayList;
2222
import java.util.List;
2323

‎iam/api-client/src/main/java/iam/snippets/AddMember.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package iam.snippets;
1717

1818
// [START iam_modify_policy_add_member]
19-
import com.google.api.services.cloudresourcemanager.model.Binding;
20-
import com.google.api.services.cloudresourcemanager.model.Policy;
19+
import com.google.api.services.cloudresourcemanager.v3.model.Binding;
20+
import com.google.api.services.cloudresourcemanager.v3.model.Policy;
2121
import java.util.List;
2222

2323
public class AddMember {

‎iam/api-client/src/main/java/iam/snippets/GetPolicy.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
// [START iam_get_policy]
1919
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
2020
import com.google.api.client.json.jackson2.JacksonFactory;
21-
import com.google.api.services.cloudresourcemanager.CloudResourceManager;
22-
import com.google.api.services.cloudresourcemanager.model.GetIamPolicyRequest;
23-
import com.google.api.services.cloudresourcemanager.model.Policy;
21+
import com.google.api.services.cloudresourcemanager.v3.CloudResourceManager;
22+
import com.google.api.services.cloudresourcemanager.v3.model.GetIamPolicyRequest;
23+
import com.google.api.services.cloudresourcemanager.v3.model.Policy;
2424
import com.google.api.services.iam.v1.IamScopes;
2525
import com.google.auth.http.HttpCredentialsAdapter;
2626
import com.google.auth.oauth2.GoogleCredentials;

‎iam/api-client/src/main/java/iam/snippets/Quickstart.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
// [START iam_quickstart]
1919
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
2020
import com.google.api.client.json.jackson2.JacksonFactory;
21-
import com.google.api.services.cloudresourcemanager.CloudResourceManager;
22-
import com.google.api.services.cloudresourcemanager.model.Binding;
23-
import com.google.api.services.cloudresourcemanager.model.GetIamPolicyRequest;
24-
import com.google.api.services.cloudresourcemanager.model.Policy;
25-
import com.google.api.services.cloudresourcemanager.model.SetIamPolicyRequest;
21+
import com.google.api.services.cloudresourcemanager.v3.CloudResourceManager;
22+
import com.google.api.services.cloudresourcemanager.v3.model.Binding;
23+
import com.google.api.services.cloudresourcemanager.v3.model.GetIamPolicyRequest;
24+
import com.google.api.services.cloudresourcemanager.v3.model.Policy;
25+
import com.google.api.services.cloudresourcemanager.v3.model.SetIamPolicyRequest;
2626
import com.google.api.services.iam.v1.IamScopes;
2727
import com.google.auth.http.HttpCredentialsAdapter;
2828
import com.google.auth.oauth2.GoogleCredentials;

‎iam/api-client/src/main/java/iam/snippets/RemoveMember.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package iam.snippets;
1717

1818
// [START iam_modify_policy_remove_member]
19-
import com.google.api.services.cloudresourcemanager.model.Binding;
20-
import com.google.api.services.cloudresourcemanager.model.Policy;
19+
import com.google.api.services.cloudresourcemanager.v3.model.Binding;
20+
import com.google.api.services.cloudresourcemanager.v3.model.Policy;
2121
import java.util.List;
2222

2323
public class RemoveMember {

‎iam/api-client/src/main/java/iam/snippets/SetPolicy.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
// [START iam_set_policy]
1919
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
2020
import com.google.api.client.json.jackson2.JacksonFactory;
21-
import com.google.api.services.cloudresourcemanager.CloudResourceManager;
22-
import com.google.api.services.cloudresourcemanager.model.Policy;
23-
import com.google.api.services.cloudresourcemanager.model.SetIamPolicyRequest;
21+
import com.google.api.services.cloudresourcemanager.v3.CloudResourceManager;
22+
import com.google.api.services.cloudresourcemanager.v3.model.Policy;
23+
import com.google.api.services.cloudresourcemanager.v3.model.SetIamPolicyRequest;
2424
import com.google.api.services.iam.v1.IamScopes;
2525
import com.google.auth.http.HttpCredentialsAdapter;
2626
import com.google.auth.oauth2.GoogleCredentials;

‎iam/api-client/src/main/java/iam/snippets/TestPermissions.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
// [START iam_test_permissions]
1919
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
2020
import com.google.api.client.json.jackson2.JacksonFactory;
21-
import com.google.api.services.cloudresourcemanager.CloudResourceManager;
22-
import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsRequest;
23-
import com.google.api.services.cloudresourcemanager.model.TestIamPermissionsResponse;
21+
import com.google.api.services.cloudresourcemanager.v3.CloudResourceManager;
22+
import com.google.api.services.cloudresourcemanager.v3.model.TestIamPermissionsRequest;
23+
import com.google.api.services.cloudresourcemanager.v3.model.TestIamPermissionsResponse;
2424
import com.google.api.services.iam.v1.IamScopes;
2525
import com.google.auth.http.HttpCredentialsAdapter;
2626
import com.google.auth.oauth2.GoogleCredentials;

‎iam/api-client/src/test/java/iam/snippets/AccessTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import static org.hamcrest.core.StringContains.containsString;
2020
import static org.junit.Assert.assertNotNull;
2121

22-
import com.google.api.services.cloudresourcemanager.model.Binding;
23-
import com.google.api.services.cloudresourcemanager.model.Policy;
22+
import com.google.api.services.cloudresourcemanager.v3.model.Binding;
23+
import com.google.api.services.cloudresourcemanager.v3.model.Policy;
2424
import java.io.ByteArrayOutputStream;
2525
import java.io.PrintStream;
2626
import java.util.ArrayList;
@@ -75,15 +75,15 @@ public void tearDown() {
7575

7676
@Test
7777
public void testGetPolicy() {
78-
GetPolicy.getPolicy(PROJECT_ID);
78+
GetPolicy.getPolicy("projects/" + PROJECT_ID);
7979
String got = bout.toString();
8080
assertThat(got, containsString("Policy retrieved: "));
8181
}
8282

8383
@Test
8484
public void testSetPolicy() {
85-
Policy policy = GetPolicy.getPolicy(PROJECT_ID);
86-
SetPolicy.setPolicy(policy, PROJECT_ID);
85+
Policy policy = GetPolicy.getPolicy("projects/" + PROJECT_ID);
86+
SetPolicy.setPolicy(policy, "projects/" + PROJECT_ID);
8787
String got = bout.toString();
8888
assertThat(got, containsString("Policy retrieved: "));
8989
}
@@ -116,7 +116,7 @@ public void testRemoveMember() {
116116

117117
@Test
118118
public void testTestPermissions() {
119-
TestPermissions.testPermissions(PROJECT_ID);
119+
TestPermissions.testPermissions("projects/" + PROJECT_ID);
120120
String got = bout.toString();
121121
assertThat(
122122
got,

‎iam/api-client/src/test/java/iam/snippets/QuickstartTests.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
2424
import com.google.api.client.json.jackson2.JacksonFactory;
25-
import com.google.api.services.cloudresourcemanager.CloudResourceManager;
26-
import com.google.api.services.cloudresourcemanager.model.Binding;
27-
import com.google.api.services.cloudresourcemanager.model.Policy;
25+
import com.google.api.services.cloudresourcemanager.v3.CloudResourceManager;
26+
import com.google.api.services.cloudresourcemanager.v3.model.Binding;
27+
import com.google.api.services.cloudresourcemanager.v3.model.Policy;
2828
import com.google.api.services.iam.v1.Iam;
2929
import com.google.api.services.iam.v1.IamScopes;
3030
import com.google.api.services.iam.v1.model.CreateServiceAccountRequest;
@@ -123,10 +123,10 @@ public void testQuickstart() throws Exception {
123123
CloudResourceManager crmService = Quickstart.initializeService();
124124

125125
// Tests addBinding()
126-
Quickstart.addBinding(crmService, PROJECT_ID, member, role);
126+
Quickstart.addBinding(crmService, "projects/" + PROJECT_ID, member, role);
127127

128128
// Get the project's polcy and confirm that the member is in the policy
129-
Policy policy = Quickstart.getPolicy(crmService, PROJECT_ID);
129+
Policy policy = Quickstart.getPolicy(crmService, "projects/" + PROJECT_ID);
130130
Binding binding = null;
131131
List<Binding> bindings = policy.getBindings();
132132
for (Binding b : bindings) {
@@ -138,9 +138,9 @@ public void testQuickstart() throws Exception {
138138
assertThat(binding.getMembers(), hasItem(member));
139139

140140
// Tests removeMember()
141-
Quickstart.removeMember(crmService, PROJECT_ID, member, role);
141+
Quickstart.removeMember(crmService, "projects/" + PROJECT_ID, member, role);
142142
// Confirm that the member has been removed
143-
policy = Quickstart.getPolicy(crmService, PROJECT_ID);
143+
policy = Quickstart.getPolicy(crmService, "projects/" + PROJECT_ID);
144144
binding = null;
145145
bindings = policy.getBindings();
146146
for (Binding b : bindings) {

0 commit comments

Comments
 (0)