Skip to content

Commit bdd19f6

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(bazel): [orgpolicy] update protobuf to v3.21.12 (#9000)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 503267695 Source-Link: https://togithub.com/googleapis/googleapis/commit/c79059008c6d2e66d4cc65a1a7d8bee7160e3f83 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/b98230b9e68a3828cf138296e9a20e03749ae0a0 Copy-Tag: eyJwIjoiamF2YS1vcmdwb2xpY3kvLk93bEJvdC55YW1sIiwiaCI6ImI5ODIzMGI5ZTY4YTM4MjhjZjEzODI5NmU5YTIwZTAzNzQ5YWUwYTAifQ== BEGIN_NESTED_COMMIT feat: [orgpolicy] support for OrgPolicy dry runs PiperOrigin-RevId: 502948090 Source-Link: https://togithub.com/googleapis/googleapis/commit/8f29315954d0b873bd15ad0e95a4b0ddfa337d90 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/cf63d958bd009761ae7ca0f219d4f506ff78b81d Copy-Tag: eyJwIjoiamF2YS1vcmdwb2xpY3kvLk93bEJvdC55YW1sIiwiaCI6ImNmNjNkOTU4YmQwMDk3NjFhZTdjYTBmMjE5ZDRmNTA2ZmY3OGI4MWQifQ== END_NESTED_COMMIT
1 parent 46532b4 commit bdd19f6

32 files changed

+1711
-755
lines changed

‎java-orgpolicy/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>google-cloud-orgpolicy</artifactId>
22-
<version>2.7.0</version>
22+
<version>2.8.0</version>
2323
</dependency>
2424
```
2525

2626
If you are using Gradle without BOM, add this to your dependencies:
2727

2828
```Groovy
29-
implementation 'com.google.cloud:google-cloud-orgpolicy:2.7.0'
29+
implementation 'com.google.cloud:google-cloud-orgpolicy:2.8.0'
3030
```
3131

3232
If you are using SBT, add this to your dependencies:
3333

3434
```Scala
35-
libraryDependencies += "com.google.cloud" % "google-cloud-orgpolicy" % "2.7.0"
35+
libraryDependencies += "com.google.cloud" % "google-cloud-orgpolicy" % "2.8.0"
3636
```
3737

3838
## Authentication

‎java-orgpolicy/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicyClient.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,10 @@ public final Policy updatePolicy(Policy policy) {
12301230
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
12311231
* try (OrgPolicyClient orgPolicyClient = OrgPolicyClient.create()) {
12321232
* UpdatePolicyRequest request =
1233-
* UpdatePolicyRequest.newBuilder().setPolicy(Policy.newBuilder().build()).build();
1233+
* UpdatePolicyRequest.newBuilder()
1234+
* .setPolicy(Policy.newBuilder().build())
1235+
* .setUpdateMask(FieldMask.newBuilder().build())
1236+
* .build();
12341237
* Policy response = orgPolicyClient.updatePolicy(request);
12351238
* }
12361239
* }</pre>
@@ -1262,7 +1265,10 @@ public final Policy updatePolicy(UpdatePolicyRequest request) {
12621265
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
12631266
* try (OrgPolicyClient orgPolicyClient = OrgPolicyClient.create()) {
12641267
* UpdatePolicyRequest request =
1265-
* UpdatePolicyRequest.newBuilder().setPolicy(Policy.newBuilder().build()).build();
1268+
* UpdatePolicyRequest.newBuilder()
1269+
* .setPolicy(Policy.newBuilder().build())
1270+
* .setUpdateMask(FieldMask.newBuilder().build())
1271+
* .build();
12661272
* ApiFuture<Policy> future = orgPolicyClient.updatePolicyCallable().futureCall(request);
12671273
* // Do something.
12681274
* Policy response = future.get();

‎java-orgpolicy/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/package-info.java

Lines changed: 3 additions & 1 deletion
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 Organization Policy API
19+
*
20+
* <p>The interfaces provided are listed below, along with usage samples.
1921
*
2022
* <p>======================= OrgPolicyClient =======================
2123
*

‎java-orgpolicy/google-cloud-orgpolicy/src/main/java/com/google/cloud/orgpolicy/v2/stub/HttpJsonOrgPolicyStub.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ public class HttpJsonOrgPolicyStub extends OrgPolicyStub {
278278
Map<String, List<String>> fields = new HashMap<>();
279279
ProtoRestSerializer<UpdatePolicyRequest> serializer =
280280
ProtoRestSerializer.create();
281+
serializer.putQueryParam(fields, "updateMask", request.getUpdateMask());
281282
serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
282283
return fields;
283284
})

‎java-orgpolicy/google-cloud-orgpolicy/src/test/java/com/google/cloud/orgpolicy/v2/OrgPolicyClientHttpJsonTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ public void getPolicyTest() throws Exception {
483483
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
484484
.setSpec(PolicySpec.newBuilder().build())
485485
.setAlternate(AlternatePolicySpec.newBuilder().build())
486+
.setDryRunSpec(PolicySpec.newBuilder().build())
486487
.build();
487488
mockService.addResponse(expectedResponse);
488489

@@ -529,6 +530,7 @@ public void getPolicyTest2() throws Exception {
529530
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
530531
.setSpec(PolicySpec.newBuilder().build())
531532
.setAlternate(AlternatePolicySpec.newBuilder().build())
533+
.setDryRunSpec(PolicySpec.newBuilder().build())
532534
.build();
533535
mockService.addResponse(expectedResponse);
534536

@@ -575,6 +577,7 @@ public void getEffectivePolicyTest() throws Exception {
575577
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
576578
.setSpec(PolicySpec.newBuilder().build())
577579
.setAlternate(AlternatePolicySpec.newBuilder().build())
580+
.setDryRunSpec(PolicySpec.newBuilder().build())
578581
.build();
579582
mockService.addResponse(expectedResponse);
580583

@@ -621,6 +624,7 @@ public void getEffectivePolicyTest2() throws Exception {
621624
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
622625
.setSpec(PolicySpec.newBuilder().build())
623626
.setAlternate(AlternatePolicySpec.newBuilder().build())
627+
.setDryRunSpec(PolicySpec.newBuilder().build())
624628
.build();
625629
mockService.addResponse(expectedResponse);
626630

@@ -667,6 +671,7 @@ public void createPolicyTest() throws Exception {
667671
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
668672
.setSpec(PolicySpec.newBuilder().build())
669673
.setAlternate(AlternatePolicySpec.newBuilder().build())
674+
.setDryRunSpec(PolicySpec.newBuilder().build())
670675
.build();
671676
mockService.addResponse(expectedResponse);
672677

@@ -715,6 +720,7 @@ public void createPolicyTest2() throws Exception {
715720
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
716721
.setSpec(PolicySpec.newBuilder().build())
717722
.setAlternate(AlternatePolicySpec.newBuilder().build())
723+
.setDryRunSpec(PolicySpec.newBuilder().build())
718724
.build();
719725
mockService.addResponse(expectedResponse);
720726

@@ -763,6 +769,7 @@ public void createPolicyTest3() throws Exception {
763769
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
764770
.setSpec(PolicySpec.newBuilder().build())
765771
.setAlternate(AlternatePolicySpec.newBuilder().build())
772+
.setDryRunSpec(PolicySpec.newBuilder().build())
766773
.build();
767774
mockService.addResponse(expectedResponse);
768775

@@ -811,6 +818,7 @@ public void createPolicyTest4() throws Exception {
811818
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
812819
.setSpec(PolicySpec.newBuilder().build())
813820
.setAlternate(AlternatePolicySpec.newBuilder().build())
821+
.setDryRunSpec(PolicySpec.newBuilder().build())
814822
.build();
815823
mockService.addResponse(expectedResponse);
816824

@@ -859,6 +867,7 @@ public void updatePolicyTest() throws Exception {
859867
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
860868
.setSpec(PolicySpec.newBuilder().build())
861869
.setAlternate(AlternatePolicySpec.newBuilder().build())
870+
.setDryRunSpec(PolicySpec.newBuilder().build())
862871
.build();
863872
mockService.addResponse(expectedResponse);
864873

@@ -867,6 +876,7 @@ public void updatePolicyTest() throws Exception {
867876
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
868877
.setSpec(PolicySpec.newBuilder().build())
869878
.setAlternate(AlternatePolicySpec.newBuilder().build())
879+
.setDryRunSpec(PolicySpec.newBuilder().build())
870880
.build();
871881

872882
Policy actualResponse = client.updatePolicy(policy);
@@ -900,6 +910,7 @@ public void updatePolicyExceptionTest() throws Exception {
900910
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
901911
.setSpec(PolicySpec.newBuilder().build())
902912
.setAlternate(AlternatePolicySpec.newBuilder().build())
913+
.setDryRunSpec(PolicySpec.newBuilder().build())
903914
.build();
904915
client.updatePolicy(policy);
905916
Assert.fail("No exception raised");

‎java-orgpolicy/google-cloud-orgpolicy/src/test/java/com/google/cloud/orgpolicy/v2/OrgPolicyClientTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ public void getPolicyTest() throws Exception {
439439
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
440440
.setSpec(PolicySpec.newBuilder().build())
441441
.setAlternate(AlternatePolicySpec.newBuilder().build())
442+
.setDryRunSpec(PolicySpec.newBuilder().build())
442443
.build();
443444
mockOrgPolicy.addResponse(expectedResponse);
444445

@@ -479,6 +480,7 @@ public void getPolicyTest2() throws Exception {
479480
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
480481
.setSpec(PolicySpec.newBuilder().build())
481482
.setAlternate(AlternatePolicySpec.newBuilder().build())
483+
.setDryRunSpec(PolicySpec.newBuilder().build())
482484
.build();
483485
mockOrgPolicy.addResponse(expectedResponse);
484486

@@ -519,6 +521,7 @@ public void getEffectivePolicyTest() throws Exception {
519521
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
520522
.setSpec(PolicySpec.newBuilder().build())
521523
.setAlternate(AlternatePolicySpec.newBuilder().build())
524+
.setDryRunSpec(PolicySpec.newBuilder().build())
522525
.build();
523526
mockOrgPolicy.addResponse(expectedResponse);
524527

@@ -559,6 +562,7 @@ public void getEffectivePolicyTest2() throws Exception {
559562
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
560563
.setSpec(PolicySpec.newBuilder().build())
561564
.setAlternate(AlternatePolicySpec.newBuilder().build())
565+
.setDryRunSpec(PolicySpec.newBuilder().build())
562566
.build();
563567
mockOrgPolicy.addResponse(expectedResponse);
564568

@@ -599,6 +603,7 @@ public void createPolicyTest() throws Exception {
599603
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
600604
.setSpec(PolicySpec.newBuilder().build())
601605
.setAlternate(AlternatePolicySpec.newBuilder().build())
606+
.setDryRunSpec(PolicySpec.newBuilder().build())
602607
.build();
603608
mockOrgPolicy.addResponse(expectedResponse);
604609

@@ -642,6 +647,7 @@ public void createPolicyTest2() throws Exception {
642647
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
643648
.setSpec(PolicySpec.newBuilder().build())
644649
.setAlternate(AlternatePolicySpec.newBuilder().build())
650+
.setDryRunSpec(PolicySpec.newBuilder().build())
645651
.build();
646652
mockOrgPolicy.addResponse(expectedResponse);
647653

@@ -685,6 +691,7 @@ public void createPolicyTest3() throws Exception {
685691
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
686692
.setSpec(PolicySpec.newBuilder().build())
687693
.setAlternate(AlternatePolicySpec.newBuilder().build())
694+
.setDryRunSpec(PolicySpec.newBuilder().build())
688695
.build();
689696
mockOrgPolicy.addResponse(expectedResponse);
690697

@@ -728,6 +735,7 @@ public void createPolicyTest4() throws Exception {
728735
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
729736
.setSpec(PolicySpec.newBuilder().build())
730737
.setAlternate(AlternatePolicySpec.newBuilder().build())
738+
.setDryRunSpec(PolicySpec.newBuilder().build())
731739
.build();
732740
mockOrgPolicy.addResponse(expectedResponse);
733741

@@ -771,6 +779,7 @@ public void updatePolicyTest() throws Exception {
771779
.setName(PolicyName.ofProjectPolicyName("[PROJECT]", "[POLICY]").toString())
772780
.setSpec(PolicySpec.newBuilder().build())
773781
.setAlternate(AlternatePolicySpec.newBuilder().build())
782+
.setDryRunSpec(PolicySpec.newBuilder().build())
774783
.build();
775784
mockOrgPolicy.addResponse(expectedResponse);
776785

0 commit comments

Comments
 (0)