Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: [cloudchannel] Add billing account to entitlement definitions for Cloud Channel API #9410

Merged
merged 2 commits into from
May 9, 2023
Merged

feat: [cloudchannel] Add billing account to entitlement definitions for Cloud Channel API #9410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3efc348
feat: Add billing account to entitlement definitions for Cloud Channe…
gcf-owl-bot[bot] May 5, 2023
889c5c7
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] May 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions java-channel/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.11.0</version>
<version>26.14.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-channel.svg
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-channel/3.18.0
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-channel/3.20.0
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
Expand Down
20 changes: 10 additions & 10 deletions ...le-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4016,7 +4016,7 @@ public final CustomerRepricingConfig getCustomerRepricingConfig(
* for each resource is displayed in the ascending order of:
*
* <ul>
* <li>customer ID
* <li>Customer ID
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
Expand Down Expand Up @@ -4075,7 +4075,7 @@ public final ListCustomerRepricingConfigsPagedResponse listCustomerRepricingConf
* for each resource is displayed in the ascending order of:
*
* <ul>
* <li>customer ID
* <li>Customer ID
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
Expand Down Expand Up @@ -4132,7 +4132,7 @@ public final ListCustomerRepricingConfigsPagedResponse listCustomerRepricingConf
* for each resource is displayed in the ascending order of:
*
* <ul>
* <li>customer ID
* <li>Customer ID
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
Expand Down Expand Up @@ -4191,7 +4191,7 @@ public final ListCustomerRepricingConfigsPagedResponse listCustomerRepricingConf
* for each resource is displayed in the ascending order of:
*
* <ul>
* <li>customer ID
* <li>Customer ID
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
Expand Down Expand Up @@ -4250,7 +4250,7 @@ public final ListCustomerRepricingConfigsPagedResponse listCustomerRepricingConf
* for each resource is displayed in the ascending order of:
*
* <ul>
* <li>customer ID
* <li>Customer ID
* <li>[RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
Expand Down Expand Up @@ -5182,7 +5182,7 @@ public final ChannelPartnerRepricingConfig getChannelPartnerRepricingConfig(
* resources. The data for each resource is displayed in the ascending order of:
*
* <ul>
* <li>channel partner ID
* <li>Channel Partner ID
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
* </ul>
Expand Down Expand Up @@ -5244,7 +5244,7 @@ public final ListChannelPartnerRepricingConfigsPagedResponse listChannelPartnerR
* resources. The data for each resource is displayed in the ascending order of:
*
* <ul>
* <li>channel partner ID
* <li>Channel Partner ID
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
* </ul>
Expand Down Expand Up @@ -5303,7 +5303,7 @@ public final ListChannelPartnerRepricingConfigsPagedResponse listChannelPartnerR
* resources. The data for each resource is displayed in the ascending order of:
*
* <ul>
* <li>channel partner ID
* <li>Channel Partner ID
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
* </ul>
Expand Down Expand Up @@ -5364,7 +5364,7 @@ public final ListChannelPartnerRepricingConfigsPagedResponse listChannelPartnerR
* resources. The data for each resource is displayed in the ascending order of:
*
* <ul>
* <li>channel partner ID
* <li>Channel Partner ID
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
* </ul>
Expand Down Expand Up @@ -5428,7 +5428,7 @@ public final ListChannelPartnerRepricingConfigsPagedResponse listChannelPartnerR
* resources. The data for each resource is displayed in the ascending order of:
*
* <ul>
* <li>channel partner ID
* <li>Channel Partner ID
* <li>[RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* <li>[ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
* </ul>
Expand Down
8 changes: 8 additions & 0 deletions ...nnel/src/test/java/com/google/cloud/channel/v1/CloudChannelServiceClientHttpJsonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@ public void getEntitlementTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
mockService.addResponse(expectedResponse);

Expand Down Expand Up @@ -967,6 +968,7 @@ public void createEntitlementTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1036,6 +1038,7 @@ public void changeParametersTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1108,6 +1111,7 @@ public void changeRenewalSettingsTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1178,6 +1182,7 @@ public void changeOfferTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1252,6 +1257,7 @@ public void startPaidServiceTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1320,6 +1326,7 @@ public void suspendEntitlementTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1442,6 +1449,7 @@ public void activateEntitlementTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down
8 changes: 8 additions & 0 deletions ...loud-channel/src/test/java/com/google/cloud/channel/v1/CloudChannelServiceClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,7 @@ public void getEntitlementTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
mockCloudChannelService.addResponse(expectedResponse);

Expand Down Expand Up @@ -893,6 +894,7 @@ public void createEntitlementTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -961,6 +963,7 @@ public void changeParametersTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1032,6 +1035,7 @@ public void changeRenewalSettingsTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1101,6 +1105,7 @@ public void changeOfferTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1175,6 +1180,7 @@ public void startPaidServiceTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1240,6 +1246,7 @@ public void suspendEntitlementTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down Expand Up @@ -1356,6 +1363,7 @@ public void activateEntitlementTest() throws Exception {
.setTrialSettings(TrialSettings.newBuilder().build())
.setAssociationInfo(AssociationInfo.newBuilder().build())
.addAllParameters(new ArrayList<Parameter>())
.setBillingAccount("billingAccount708726578")
.build();
Operation resultOperation =
Operation.newBuilder()
Expand Down
16 changes: 8 additions & 8 deletions ...e-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3152,7 +3152,7 @@ default void getCustomerRepricingConfig(
* [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig]
* resources. The data for each resource is displayed in the ascending order
* of:
* * customer ID
* * Customer ID
* * [RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* * [CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
Expand Down Expand Up @@ -3333,7 +3333,7 @@ default void getChannelPartnerRepricingConfig(
* [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig]
* resources. The data for each resource is displayed in the ascending order
* of:
* * channel partner ID
* * Channel Partner ID
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* * [ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
* If unsuccessful, returns an error.
Expand Down Expand Up @@ -4616,7 +4616,7 @@ public void getCustomerRepricingConfig(
* [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig]
* resources. The data for each resource is displayed in the ascending order
* of:
* * customer ID
* * Customer ID
* * [RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* * [CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
Expand Down Expand Up @@ -4807,7 +4807,7 @@ public void getChannelPartnerRepricingConfig(
* [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig]
* resources. The data for each resource is displayed in the ascending order
* of:
* * channel partner ID
* * Channel Partner ID
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* * [ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
* If unsuccessful, returns an error.
Expand Down Expand Up @@ -5995,7 +5995,7 @@ public com.google.cloud.channel.v1.CustomerRepricingConfig getCustomerRepricingC
* [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig]
* resources. The data for each resource is displayed in the ascending order
* of:
* * customer ID
* * Customer ID
* * [RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* * [CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
Expand Down Expand Up @@ -6168,7 +6168,7 @@ public com.google.protobuf.Empty deleteCustomerRepricingConfig(
* [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig]
* resources. The data for each resource is displayed in the ascending order
* of:
* * channel partner ID
* * Channel Partner ID
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* * [ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
* If unsuccessful, returns an error.
Expand Down Expand Up @@ -7325,7 +7325,7 @@ protected CloudChannelServiceFutureStub build(
* [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig]
* resources. The data for each resource is displayed in the ascending order
* of:
* * customer ID
* * Customer ID
* * [RepricingConfig.EntitlementGranularity.entitlement][google.cloud.channel.v1.RepricingConfig.EntitlementGranularity.entitlement]
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* * [CustomerRepricingConfig.update_time][google.cloud.channel.v1.CustomerRepricingConfig.update_time]
Expand Down Expand Up @@ -7509,7 +7509,7 @@ protected CloudChannelServiceFutureStub build(
* [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig]
* resources. The data for each resource is displayed in the ascending order
* of:
* * channel partner ID
* * Channel Partner ID
* * [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month]
* * [ChannelPartnerRepricingConfig.update_time][google.cloud.channel.v1.ChannelPartnerRepricingConfig.update_time]
* If unsuccessful, returns an error.
Expand Down