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

Commit 3946bd5

Browse files
yoshi-automationchingor13
yoshi-automation
and
chingor13
authored
feat!: switch to ResourceName for IAM methods (#125)
BREAKING CHANGE: This is binary breaking change as the method signatures for the IAM methods have been relaxed from IamResourceName to com.google.api.resourcenames.ResourceName (its parent). * enable gapic v2 for containeranalysis. committer: @hzyi-google PiperOrigin-RevId: 303821111 Source-Author: Google APIs <noreply@google.com> Source-Date: Mon Mar 30 14:17:14 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: ad895ce95f1f6d2261fbbc3e8897958294e4f017 Source-Link: googleapis/googleapis@ad895ce * fix: change config_schema_version to 2.0.0 for containeranalysis v1 gapic config. committer: @hzyi-google PiperOrigin-RevId: 304672648 Source-Author: Google APIs <noreply@google.com> Source-Date: Fri Apr 3 12:40:16 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 0f7b1509a9a452808c3d07fe90fedfcea763d7d5 Source-Link: googleapis/googleapis@0f7b150 * chore: regenerate * chore: allow resource name change for IAM methods * chore: allow not using classes from proto-google-cloud-containeranalysis-v1 Co-authored-by: Jeff Ching <chingor@google.com>
1 parent b9af328 commit 3946bd5

7 files changed

Lines changed: 57 additions & 34 deletions

File tree

‎google-cloud-containeranalysis-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<version>0.5.0</version>
1212
</parent>
1313

14-
<name>Google Cloud containeranalysis BOM</name>
14+
<name>Google Cloud Container Analysis BOM</name>
1515
<url>https://github.com/googleapis/java-containeranalysis</url>
1616
<description>
1717
BOM for Google Cloud Container Analysis

‎google-cloud-containeranalysis/clirr-ignored-differences.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<!-- TODO: remove after 0.120.0 -->
5+
<difference>
6+
<differenceType>7005</differenceType>
7+
<className>com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClient</className>
8+
<method>com.google.iam.v1.* *Iam*(com.google.containeranalysis.v1.IamResourceName*)</method>
9+
<to>com.google.iam.v1.* *Iam*(com.google.api.resourcenames.ResourceName*)</to>
10+
</difference>
11+
</differences>

‎google-cloud-containeranalysis/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,18 @@
115115
</dependencies>
116116
</profile>
117117
</profiles>
118+
119+
<build>
120+
<pluginManagement>
121+
<plugins>
122+
<plugin>
123+
<groupId>org.apache.maven.plugins</groupId>
124+
<artifactId>maven-dependency-plugin</artifactId>
125+
<configuration>
126+
<ignoredUnusedDeclaredDependencies>com.google.api.grpc:proto-google-cloud-containeranalysis-v1</ignoredUnusedDeclaredDependencies>
127+
</configuration>
128+
</plugin>
129+
</plugins>
130+
</pluginManagement>
131+
</build>
118132
</project>

‎google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClient.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import com.google.api.core.BetaApi;
1919
import com.google.api.gax.core.BackgroundResource;
2020
import com.google.api.gax.rpc.UnaryCallable;
21+
import com.google.api.resourcenames.ResourceName;
2122
import com.google.cloud.devtools.containeranalysis.v1.stub.ContainerAnalysisStub;
2223
import com.google.cloud.devtools.containeranalysis.v1.stub.ContainerAnalysisStubSettings;
23-
import com.google.containeranalysis.v1.IamResourceName;
2424
import com.google.iam.v1.GetIamPolicyRequest;
2525
import com.google.iam.v1.Policy;
2626
import com.google.iam.v1.SetIamPolicyRequest;
@@ -52,7 +52,7 @@
5252
* <pre>
5353
* <code>
5454
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
55-
* IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
55+
* String resource = "";
5656
* Policy policy = Policy.newBuilder().build();
5757
* Policy response = containerAnalysisClient.setIamPolicy(resource, policy);
5858
* }
@@ -185,7 +185,7 @@ public ContainerAnalysisStub getStub() {
185185
*
186186
* <pre><code>
187187
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
188-
* IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
188+
* String resource = "";
189189
* Policy policy = Policy.newBuilder().build();
190190
* Policy response = containerAnalysisClient.setIamPolicy(resource, policy);
191191
* }
@@ -198,7 +198,7 @@ public ContainerAnalysisStub getStub() {
198198
* Platform services (such as Projects) might reject them.
199199
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
200200
*/
201-
public final Policy setIamPolicy(IamResourceName resource, Policy policy) {
201+
public final Policy setIamPolicy(ResourceName resource, Policy policy) {
202202
SetIamPolicyRequest request =
203203
SetIamPolicyRequest.newBuilder()
204204
.setResource(resource == null ? null : resource.toString())
@@ -220,7 +220,7 @@ public final Policy setIamPolicy(IamResourceName resource, Policy policy) {
220220
*
221221
* <pre><code>
222222
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
223-
* IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
223+
* String resource = "";
224224
* Policy policy = Policy.newBuilder().build();
225225
* Policy response = containerAnalysisClient.setIamPolicy(resource.toString(), policy);
226226
* }
@@ -252,7 +252,7 @@ public final Policy setIamPolicy(String resource, Policy policy) {
252252
*
253253
* <pre><code>
254254
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
255-
* ResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
255+
* String resource = "";
256256
* Policy policy = Policy.newBuilder().build();
257257
* SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
258258
* .setResource(resource.toString())
@@ -282,7 +282,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
282282
*
283283
* <pre><code>
284284
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
285-
* ResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
285+
* String resource = "";
286286
* Policy policy = Policy.newBuilder().build();
287287
* SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder()
288288
* .setResource(resource.toString())
@@ -311,7 +311,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
311311
*
312312
* <pre><code>
313313
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
314-
* IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
314+
* String resource = "";
315315
* Policy response = containerAnalysisClient.getIamPolicy(resource);
316316
* }
317317
* </code></pre>
@@ -320,7 +320,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
320320
* operation documentation for the appropriate value for this field.
321321
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
322322
*/
323-
public final Policy getIamPolicy(IamResourceName resource) {
323+
public final Policy getIamPolicy(ResourceName resource) {
324324
GetIamPolicyRequest request =
325325
GetIamPolicyRequest.newBuilder()
326326
.setResource(resource == null ? null : resource.toString())
@@ -341,7 +341,7 @@ public final Policy getIamPolicy(IamResourceName resource) {
341341
*
342342
* <pre><code>
343343
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
344-
* IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
344+
* String resource = "";
345345
* Policy response = containerAnalysisClient.getIamPolicy(resource.toString());
346346
* }
347347
* </code></pre>
@@ -368,7 +368,7 @@ public final Policy getIamPolicy(String resource) {
368368
*
369369
* <pre><code>
370370
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
371-
* ResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
371+
* String resource = "";
372372
* GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
373373
* .setResource(resource.toString())
374374
* .build();
@@ -396,7 +396,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
396396
*
397397
* <pre><code>
398398
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
399-
* ResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
399+
* String resource = "";
400400
* GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder()
401401
* .setResource(resource.toString())
402402
* .build();
@@ -422,7 +422,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
422422
*
423423
* <pre><code>
424424
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
425-
* IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
425+
* String resource = "";
426426
* List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
427427
* TestIamPermissionsResponse response = containerAnalysisClient.testIamPermissions(resource, permissions);
428428
* }
@@ -436,7 +436,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
436436
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
437437
*/
438438
public final TestIamPermissionsResponse testIamPermissions(
439-
IamResourceName resource, List<String> permissions) {
439+
ResourceName resource, List<String> permissions) {
440440
TestIamPermissionsRequest request =
441441
TestIamPermissionsRequest.newBuilder()
442442
.setResource(resource == null ? null : resource.toString())
@@ -457,7 +457,7 @@ public final TestIamPermissionsResponse testIamPermissions(
457457
*
458458
* <pre><code>
459459
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
460-
* IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
460+
* String resource = "";
461461
* List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
462462
* TestIamPermissionsResponse response = containerAnalysisClient.testIamPermissions(resource.toString(), permissions);
463463
* }
@@ -492,7 +492,7 @@ public final TestIamPermissionsResponse testIamPermissions(
492492
*
493493
* <pre><code>
494494
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
495-
* ResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
495+
* String resource = "";
496496
* List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
497497
* TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
498498
* .setResource(resource.toString())
@@ -521,7 +521,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
521521
*
522522
* <pre><code>
523523
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
524-
* ResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
524+
* String resource = "";
525525
* List&lt;String&gt; permissions = new ArrayList&lt;&gt;();
526526
* TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder()
527527
* .setResource(resource.toString())

‎google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/package-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* <pre>
3939
* <code>
4040
* try (ContainerAnalysisClient containerAnalysisClient = ContainerAnalysisClient.create()) {
41-
* IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
41+
* String resource = "";
4242
* Policy policy = Policy.newBuilder().build();
4343
* Policy response = containerAnalysisClient.setIamPolicy(resource, policy);
4444
* }

‎google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClientTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import com.google.api.gax.grpc.testing.MockServiceHelper;
2323
import com.google.api.gax.rpc.ApiClientHeaderProvider;
2424
import com.google.api.gax.rpc.InvalidArgumentException;
25-
import com.google.containeranalysis.v1.IamResourceName;
26-
import com.google.containeranalysis.v1.NoteName;
2725
import com.google.iam.v1.GetIamPolicyRequest;
2826
import com.google.iam.v1.Policy;
2927
import com.google.iam.v1.SetIamPolicyRequest;
@@ -92,7 +90,7 @@ public void setIamPolicyTest() {
9290
Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build();
9391
mockContainerAnalysis.addResponse(expectedResponse);
9492

95-
IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
93+
String resource = "resource-341064690";
9694
Policy policy = Policy.newBuilder().build();
9795

9896
Policy actualResponse = client.setIamPolicy(resource, policy);
@@ -117,7 +115,7 @@ public void setIamPolicyExceptionTest() throws Exception {
117115
mockContainerAnalysis.addException(exception);
118116

119117
try {
120-
IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
118+
String resource = "resource-341064690";
121119
Policy policy = Policy.newBuilder().build();
122120

123121
client.setIamPolicy(resource, policy);
@@ -135,7 +133,7 @@ public void getIamPolicyTest() {
135133
Policy expectedResponse = Policy.newBuilder().setVersion(version).setEtag(etag).build();
136134
mockContainerAnalysis.addResponse(expectedResponse);
137135

138-
IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
136+
String resource = "resource-341064690";
139137

140138
Policy actualResponse = client.getIamPolicy(resource);
141139
Assert.assertEquals(expectedResponse, actualResponse);
@@ -158,7 +156,7 @@ public void getIamPolicyExceptionTest() throws Exception {
158156
mockContainerAnalysis.addException(exception);
159157

160158
try {
161-
IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
159+
String resource = "resource-341064690";
162160

163161
client.getIamPolicy(resource);
164162
Assert.fail("No exception raised");
@@ -173,7 +171,7 @@ public void testIamPermissionsTest() {
173171
TestIamPermissionsResponse expectedResponse = TestIamPermissionsResponse.newBuilder().build();
174172
mockContainerAnalysis.addResponse(expectedResponse);
175173

176-
IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
174+
String resource = "resource-341064690";
177175
List<String> permissions = new ArrayList<>();
178176

179177
TestIamPermissionsResponse actualResponse = client.testIamPermissions(resource, permissions);
@@ -198,7 +196,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
198196
mockContainerAnalysis.addException(exception);
199197

200198
try {
201-
IamResourceName resource = NoteName.of("[PROJECT]", "[NOTE]");
199+
String resource = "resource-341064690";
202200
List<String> permissions = new ArrayList<>();
203201

204202
client.testIamPermissions(resource, permissions);

‎synth.metadata‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@
33
{
44
"git": {
55
"name": ".",
6-
"remote": "https://github.com/googleapis/java-containeranalysis.git",
7-
"sha": "4962d7de12b02f57cb4b3caeee9d9b57ce09ba78"
6+
"remote": "git@github.com:googleapis/java-containeranalysis.git",
7+
"sha": "e1cb830688e4c1efd3f1be1cbae49cd8a5a326ee"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "googleapis",
1313
"remote": "https://github.com/googleapis/googleapis.git",
14-
"sha": "0e07113e776bdd8fcc0783372e08bb6e76cb1b5b",
15-
"internalRef": "302892245"
14+
"sha": "42ee97c1b93a0e3759bbba3013da309f670a90ab",
15+
"internalRef": "307114445"
1616
}
1717
},
1818
{
1919
"git": {
2020
"name": "googleapis",
2121
"remote": "https://github.com/googleapis/googleapis.git",
22-
"sha": "0e07113e776bdd8fcc0783372e08bb6e76cb1b5b",
23-
"internalRef": "302892245"
22+
"sha": "42ee97c1b93a0e3759bbba3013da309f670a90ab",
23+
"internalRef": "307114445"
2424
}
2525
},
2626
{
2727
"git": {
2828
"name": "synthtool",
2929
"remote": "https://github.com/googleapis/synthtool.git",
30-
"sha": "f8a9933e5e98202b04ef427f28d1d79221190fa4"
30+
"sha": "f5e4c17dc78a966dbf29961dd01f9bbd63e20a04"
3131
}
3232
}
3333
],

0 commit comments

Comments
 (0)