Skip to content

Commit d841094

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [cloudchannel] Add billing account to entitlement definitions for Cloud Channel API (#9410)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 529744735 Source-Link: https://togithub.com/googleapis/googleapis/commit/1ebad326d278bc783d5c048f09b6635e4a7a31c3 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/bef559b2fc10c063ba63d2bc3018e9af1e06c4d6 Copy-Tag: eyJwIjoiamF2YS1jaGFubmVsLy5Pd2xCb3QueWFtbCIsImgiOiJiZWY1NTliMmZjMTBjMDYzYmE2M2QyYmMzMDE4ZTlhZjFlMDZjNGQ2In0=
1 parent bc3cddf commit d841094

File tree

20 files changed

+318
-78
lines changed

20 files changed

+318
-78
lines changed

‎java-channel/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>libraries-bom</artifactId>
23-
<version>26.11.0</version>
23+
<version>26.14.0</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
@@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
195195
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
196196
[stability-image]: https://img.shields.io/badge/stability-stable-green
197197
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-channel.svg
198-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-channel/3.18.0
198+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-channel/3.20.0
199199
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
200200
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
201201
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎java-channel/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4016,7 +4016,7 @@ public final CustomerRepricingConfig getCustomerRepricingConfig(
40164016
* for each resource is displayed in the ascending order of:
40174017
*
40184018
* <ul>
4019-
* <li>customer ID
4019+
* <li>Customer ID
40204020
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
40214021
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
40224022
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
@@ -4075,7 +4075,7 @@ public final ListCustomerRepricingConfigsPagedResponse listCustomerRepricingConf
40754075
* for each resource is displayed in the ascending order of:
40764076
*
40774077
* <ul>
4078-
* <li>customer ID
4078+
* <li>Customer ID
40794079
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
40804080
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
40814081
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
@@ -4132,7 +4132,7 @@ public final ListCustomerRepricingConfigsPagedResponse listCustomerRepricingConf
41324132
* for each resource is displayed in the ascending order of:
41334133
*
41344134
* <ul>
4135-
* <li>customer ID
4135+
* <li>Customer ID
41364136
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
41374137
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
41384138
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
@@ -4191,7 +4191,7 @@ public final ListCustomerRepricingConfigsPagedResponse listCustomerRepricingConf
41914191
* for each resource is displayed in the ascending order of:
41924192
*
41934193
* <ul>
4194-
* <li>customer ID
4194+
* <li>Customer ID
41954195
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
41964196
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
41974197
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
@@ -4250,7 +4250,7 @@ public final ListCustomerRepricingConfigsPagedResponse listCustomerRepricingConf
42504250
* for each resource is displayed in the ascending order of:
42514251
*
42524252
* <ul>
4253-
* <li>customer ID
4253+
* <li>Customer ID
42544254
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
42554255
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
42564256
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
@@ -5182,7 +5182,7 @@ public final ChannelPartnerRepricingConfig getChannelPartnerRepricingConfig(
51825182
* resources. The data for each resource is displayed in the ascending order of:
51835183
*
51845184
* <ul>
5185-
* <li>channel partner ID
5185+
* <li>Channel Partner ID
51865186
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
51875187
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
51885188
* </ul>
@@ -5244,7 +5244,7 @@ public final ListChannelPartnerRepricingConfigsPagedResponse listChannelPartnerR
52445244
* resources. The data for each resource is displayed in the ascending order of:
52455245
*
52465246
* <ul>
5247-
* <li>channel partner ID
5247+
* <li>Channel Partner ID
52485248
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
52495249
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
52505250
* </ul>
@@ -5303,7 +5303,7 @@ public final ListChannelPartnerRepricingConfigsPagedResponse listChannelPartnerR
53035303
* resources. The data for each resource is displayed in the ascending order of:
53045304
*
53055305
* <ul>
5306-
* <li>channel partner ID
5306+
* <li>Channel Partner ID
53075307
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
53085308
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
53095309
* </ul>
@@ -5364,7 +5364,7 @@ public final ListChannelPartnerRepricingConfigsPagedResponse listChannelPartnerR
53645364
* resources. The data for each resource is displayed in the ascending order of:
53655365
*
53665366
* <ul>
5367-
* <li>channel partner ID
5367+
* <li>Channel Partner ID
53685368
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
53695369
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
53705370
* </ul>
@@ -5428,7 +5428,7 @@ public final ListChannelPartnerRepricingConfigsPagedResponse listChannelPartnerR
54285428
* resources. The data for each resource is displayed in the ascending order of:
54295429
*
54305430
* <ul>
5431-
* <li>channel partner ID
5431+
* <li>Channel Partner ID
54325432
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
54335433
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
54345434
* </ul>

‎java-channel/google-cloud-channel/src/test/java/com/google/cloud/channel/v1/CloudChannelServiceClientHttpJsonTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,7 @@ public void getEntitlementTest() throws Exception {
907907
.setTrialSettings(TrialSettings.newBuilder().build())
908908
.setAssociationInfo(AssociationInfo.newBuilder().build())
909909
.addAllParameters(new ArrayList<Parameter>())
910+
.setBillingAccount("billingAccount708726578")
910911
.build();
911912
mockService.addResponse(expectedResponse);
912913

@@ -967,6 +968,7 @@ public void createEntitlementTest() throws Exception {
967968
.setTrialSettings(TrialSettings.newBuilder().build())
968969
.setAssociationInfo(AssociationInfo.newBuilder().build())
969970
.addAllParameters(new ArrayList<Parameter>())
971+
.setBillingAccount("billingAccount708726578")
970972
.build();
971973
Operation resultOperation =
972974
Operation.newBuilder()
@@ -1036,6 +1038,7 @@ public void changeParametersTest() throws Exception {
10361038
.setTrialSettings(TrialSettings.newBuilder().build())
10371039
.setAssociationInfo(AssociationInfo.newBuilder().build())
10381040
.addAllParameters(new ArrayList<Parameter>())
1041+
.setBillingAccount("billingAccount708726578")
10391042
.build();
10401043
Operation resultOperation =
10411044
Operation.newBuilder()
@@ -1108,6 +1111,7 @@ public void changeRenewalSettingsTest() throws Exception {
11081111
.setTrialSettings(TrialSettings.newBuilder().build())
11091112
.setAssociationInfo(AssociationInfo.newBuilder().build())
11101113
.addAllParameters(new ArrayList<Parameter>())
1114+
.setBillingAccount("billingAccount708726578")
11111115
.build();
11121116
Operation resultOperation =
11131117
Operation.newBuilder()
@@ -1178,6 +1182,7 @@ public void changeOfferTest() throws Exception {
11781182
.setTrialSettings(TrialSettings.newBuilder().build())
11791183
.setAssociationInfo(AssociationInfo.newBuilder().build())
11801184
.addAllParameters(new ArrayList<Parameter>())
1185+
.setBillingAccount("billingAccount708726578")
11811186
.build();
11821187
Operation resultOperation =
11831188
Operation.newBuilder()
@@ -1252,6 +1257,7 @@ public void startPaidServiceTest() throws Exception {
12521257
.setTrialSettings(TrialSettings.newBuilder().build())
12531258
.setAssociationInfo(AssociationInfo.newBuilder().build())
12541259
.addAllParameters(new ArrayList<Parameter>())
1260+
.setBillingAccount("billingAccount708726578")
12551261
.build();
12561262
Operation resultOperation =
12571263
Operation.newBuilder()
@@ -1320,6 +1326,7 @@ public void suspendEntitlementTest() throws Exception {
13201326
.setTrialSettings(TrialSettings.newBuilder().build())
13211327
.setAssociationInfo(AssociationInfo.newBuilder().build())
13221328
.addAllParameters(new ArrayList<Parameter>())
1329+
.setBillingAccount("billingAccount708726578")
13231330
.build();
13241331
Operation resultOperation =
13251332
Operation.newBuilder()
@@ -1442,6 +1449,7 @@ public void activateEntitlementTest() throws Exception {
14421449
.setTrialSettings(TrialSettings.newBuilder().build())
14431450
.setAssociationInfo(AssociationInfo.newBuilder().build())
14441451
.addAllParameters(new ArrayList<Parameter>())
1452+
.setBillingAccount("billingAccount708726578")
14451453
.build();
14461454
Operation resultOperation =
14471455
Operation.newBuilder()

‎java-channel/google-cloud-channel/src/test/java/com/google/cloud/channel/v1/CloudChannelServiceClientTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,7 @@ public void getEntitlementTest() throws Exception {
839839
.setTrialSettings(TrialSettings.newBuilder().build())
840840
.setAssociationInfo(AssociationInfo.newBuilder().build())
841841
.addAllParameters(new ArrayList<Parameter>())
842+
.setBillingAccount("billingAccount708726578")
842843
.build();
843844
mockCloudChannelService.addResponse(expectedResponse);
844845

@@ -893,6 +894,7 @@ public void createEntitlementTest() throws Exception {
893894
.setTrialSettings(TrialSettings.newBuilder().build())
894895
.setAssociationInfo(AssociationInfo.newBuilder().build())
895896
.addAllParameters(new ArrayList<Parameter>())
897+
.setBillingAccount("billingAccount708726578")
896898
.build();
897899
Operation resultOperation =
898900
Operation.newBuilder()
@@ -961,6 +963,7 @@ public void changeParametersTest() throws Exception {
961963
.setTrialSettings(TrialSettings.newBuilder().build())
962964
.setAssociationInfo(AssociationInfo.newBuilder().build())
963965
.addAllParameters(new ArrayList<Parameter>())
966+
.setBillingAccount("billingAccount708726578")
964967
.build();
965968
Operation resultOperation =
966969
Operation.newBuilder()
@@ -1032,6 +1035,7 @@ public void changeRenewalSettingsTest() throws Exception {
10321035
.setTrialSettings(TrialSettings.newBuilder().build())
10331036
.setAssociationInfo(AssociationInfo.newBuilder().build())
10341037
.addAllParameters(new ArrayList<Parameter>())
1038+
.setBillingAccount("billingAccount708726578")
10351039
.build();
10361040
Operation resultOperation =
10371041
Operation.newBuilder()
@@ -1101,6 +1105,7 @@ public void changeOfferTest() throws Exception {
11011105
.setTrialSettings(TrialSettings.newBuilder().build())
11021106
.setAssociationInfo(AssociationInfo.newBuilder().build())
11031107
.addAllParameters(new ArrayList<Parameter>())
1108+
.setBillingAccount("billingAccount708726578")
11041109
.build();
11051110
Operation resultOperation =
11061111
Operation.newBuilder()
@@ -1175,6 +1180,7 @@ public void startPaidServiceTest() throws Exception {
11751180
.setTrialSettings(TrialSettings.newBuilder().build())
11761181
.setAssociationInfo(AssociationInfo.newBuilder().build())
11771182
.addAllParameters(new ArrayList<Parameter>())
1183+
.setBillingAccount("billingAccount708726578")
11781184
.build();
11791185
Operation resultOperation =
11801186
Operation.newBuilder()
@@ -1240,6 +1246,7 @@ public void suspendEntitlementTest() throws Exception {
12401246
.setTrialSettings(TrialSettings.newBuilder().build())
12411247
.setAssociationInfo(AssociationInfo.newBuilder().build())
12421248
.addAllParameters(new ArrayList<Parameter>())
1249+
.setBillingAccount("billingAccount708726578")
12431250
.build();
12441251
Operation resultOperation =
12451252
Operation.newBuilder()
@@ -1356,6 +1363,7 @@ public void activateEntitlementTest() throws Exception {
13561363
.setTrialSettings(TrialSettings.newBuilder().build())
13571364
.setAssociationInfo(AssociationInfo.newBuilder().build())
13581365
.addAllParameters(new ArrayList<Parameter>())
1366+
.setBillingAccount("billingAccount708726578")
13591367
.build();
13601368
Operation resultOperation =
13611369
Operation.newBuilder()

‎java-channel/grpc-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceGrpc.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3152,7 +3152,7 @@ default void getCustomerRepricingConfig(
31523152
* [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig]
31533153
* resources. The data for each resource is displayed in the ascending order
31543154
* of:
3155-
* * customer ID
3155+
* * Customer ID
31563156
* * [RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
31573157
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
31583158
* * [CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
@@ -3333,7 +3333,7 @@ default void getChannelPartnerRepricingConfig(
33333333
* [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig]
33343334
* resources. The data for each resource is displayed in the ascending order
33353335
* of:
3336-
* * channel partner ID
3336+
* * Channel Partner ID
33373337
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
33383338
* * [ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
33393339
* If unsuccessful, returns an error.
@@ -4616,7 +4616,7 @@ public void getCustomerRepricingConfig(
46164616
* [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig]
46174617
* resources. The data for each resource is displayed in the ascending order
46184618
* of:
4619-
* * customer ID
4619+
* * Customer ID
46204620
* * [RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
46214621
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
46224622
* * [CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
@@ -4807,7 +4807,7 @@ public void getChannelPartnerRepricingConfig(
48074807
* [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig]
48084808
* resources. The data for each resource is displayed in the ascending order
48094809
* of:
4810-
* * channel partner ID
4810+
* * Channel Partner ID
48114811
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
48124812
* * [ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
48134813
* If unsuccessful, returns an error.
@@ -5995,7 +5995,7 @@ public com.google.cloud.channel.v1.CustomerRepricingConfig getCustomerRepricingC
59955995
* [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig]
59965996
* resources. The data for each resource is displayed in the ascending order
59975997
* of:
5998-
* * customer ID
5998+
* * Customer ID
59995999
* * [RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
60006000
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
60016001
* * [CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
@@ -6168,7 +6168,7 @@ public com.google.protobuf.Empty deleteCustomerRepricingConfig(
61686168
* [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig]
61696169
* resources. The data for each resource is displayed in the ascending order
61706170
* of:
6171-
* * channel partner ID
6171+
* * Channel Partner ID
61726172
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
61736173
* * [ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
61746174
* If unsuccessful, returns an error.
@@ -7325,7 +7325,7 @@ protected CloudChannelServiceFutureStub build(
73257325
* [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig]
73267326
* resources. The data for each resource is displayed in the ascending order
73277327
* of:
7328-
* * customer ID
7328+
* * Customer ID
73297329
* * [RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
73307330
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
73317331
* * [CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
@@ -7509,7 +7509,7 @@ protected CloudChannelServiceFutureStub build(
75097509
* [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig]
75107510
* resources. The data for each resource is displayed in the ascending order
75117511
* of:
7512-
* * channel partner ID
7512+
* * Channel Partner ID
75137513
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
75147514
* * [ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
75157515
* If unsuccessful, returns an error.

0 commit comments

Comments
 (0)