From fdc2ad62d253f36dcd55c0f3bb69138f4dea29cd Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 3 Mar 2021 12:48:05 -0800 Subject: [PATCH] feat: addition of billing_account field on Plan (#56) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/ff6f02d7-2420-4d34-b3d1-aeac4153f43d/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 359869792 Source-Link: https://github.com/googleapis/googleapis/commit/c7b5032f6ee39de6c0359b912012f99dfccb49b5 docs: clarification that valid address lines are required for all customers --- .../channel/v1/CloudChannelServiceClient.java | 14 +- .../channel/v1/CloudChannelServiceGrpc.java | 8 +- .../clirr-ignored-differences.xml | 5 + .../com/google/cloud/channel/v1/Customer.java | 12 ++ .../cloud/channel/v1/CustomerOrBuilder.java | 3 + .../google/cloud/channel/v1/OffersProto.java | 75 +++---- .../com/google/cloud/channel/v1/Plan.java | 186 ++++++++++++++++++ .../cloud/channel/v1/PlanOrBuilder.java | 27 +++ .../google/cloud/channel/v1/customers.proto | 1 + .../google/cloud/channel/v1/offers.proto | 4 + .../google/cloud/channel/v1/service.proto | 3 +- synth.metadata | 4 +- 12 files changed, 292 insertions(+), 50 deletions(-) diff --git a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java index 328315aa..8404723a 100644 --- a/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java +++ b/google-cloud-channel/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceClient.java @@ -459,9 +459,10 @@ public final UnaryCallable getCustomerCallable() { * *

Return Value: List of * [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources - * for the domain. List may be empty. Note: in the v1alpha1 version of the API, a NOT_FOUND error - * is returned if no - * [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resource + * for the domain. List may be empty. + * + *

Note: in the v1alpha1 version of the API, a NOT_FOUND error is returned if no + * [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources * match the domain. * *

Sample code: @@ -502,9 +503,10 @@ public final CheckCloudIdentityAccountsExistResponse checkCloudIdentityAccountsE * *

Return Value: List of * [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources - * for the domain. List may be empty. Note: in the v1alpha1 version of the API, a NOT_FOUND error - * is returned if no - * [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resource + * for the domain. List may be empty. + * + *

Note: in the v1alpha1 version of the API, a NOT_FOUND error is returned if no + * [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources * match the domain. * *

Sample code: diff --git a/grpc-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceGrpc.java b/grpc-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceGrpc.java index c6c5963d..2a41aad4 100644 --- a/grpc-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceGrpc.java +++ b/grpc-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CloudChannelServiceGrpc.java @@ -1744,7 +1744,7 @@ public void getCustomer( * List of [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources for the domain. * List may be empty. * Note: in the v1alpha1 version of the API, a NOT_FOUND error is returned if - * no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resource match the domain. + * no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources match the domain. * */ public void checkCloudIdentityAccountsExist( @@ -2915,7 +2915,7 @@ public void getCustomer( * List of [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources for the domain. * List may be empty. * Note: in the v1alpha1 version of the API, a NOT_FOUND error is returned if - * no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resource match the domain. + * no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources match the domain. * */ public void checkCloudIdentityAccountsExist( @@ -3947,7 +3947,7 @@ public com.google.cloud.channel.v1.Customer getCustomer( * List of [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources for the domain. * List may be empty. * Note: in the v1alpha1 version of the API, a NOT_FOUND error is returned if - * no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resource match the domain. + * no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources match the domain. * */ public com.google.cloud.channel.v1.CheckCloudIdentityAccountsExistResponse @@ -4868,7 +4868,7 @@ protected CloudChannelServiceFutureStub build( * List of [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources for the domain. * List may be empty. * Note: in the v1alpha1 version of the API, a NOT_FOUND error is returned if - * no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resource match the domain. + * no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources match the domain. * */ public com.google.common.util.concurrent.ListenableFuture< diff --git a/proto-google-cloud-channel-v1/clirr-ignored-differences.xml b/proto-google-cloud-channel-v1/clirr-ignored-differences.xml index cc053941..9b50721f 100644 --- a/proto-google-cloud-channel-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-channel-v1/clirr-ignored-differences.xml @@ -56,4 +56,9 @@ com/google/cloud/channel/v1/*OrBuilder * has*(*) + + 7012 + com/google/cloud/channel/v1/*OrBuilder + * get*(*) + \ No newline at end of file diff --git a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/Customer.java b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/Customer.java index dbc0145a..163a04e2 100644 --- a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/Customer.java +++ b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/Customer.java @@ -344,6 +344,7 @@ public com.google.protobuf.ByteString getOrgDisplayNameBytes() { * 

    * Required. Address of the organization of the customer entity.
    * Region and zip codes are required to enforce US laws and embargoes.
+   * Valid address lines are required for all customers.
    * Language code is discarded. Use the Customer-level language code to set the
    * customer's language.
    *
@@ -364,6 +365,7 @@ public boolean hasOrgPostalAddress() { * 
    * Required. Address of the organization of the customer entity.
    * Region and zip codes are required to enforce US laws and embargoes.
+   * Valid address lines are required for all customers.
    * Language code is discarded. Use the Customer-level language code to set the
    * customer's language.
    *
@@ -386,6 +388,7 @@ public com.google.type.PostalAddress getOrgPostalAddress() { * 
    * Required. Address of the organization of the customer entity.
    * Region and zip codes are required to enforce US laws and embargoes.
+   * Valid address lines are required for all customers.
    * Language code is discarded. Use the Customer-level language code to set the
    * customer's language.
    *
@@ -1645,6 +1648,7 @@ public Builder setOrgDisplayNameBytes(com.google.protobuf.ByteString value) { * 
      * Required. Address of the organization of the customer entity.
      * Region and zip codes are required to enforce US laws and embargoes.
+     * Valid address lines are required for all customers.
      * Language code is discarded. Use the Customer-level language code to set the
      * customer's language.
      *
@@ -1664,6 +1668,7 @@ public boolean hasOrgPostalAddress() { * 
      * Required. Address of the organization of the customer entity.
      * Region and zip codes are required to enforce US laws and embargoes.
+     * Valid address lines are required for all customers.
      * Language code is discarded. Use the Customer-level language code to set the
      * customer's language.
      *
@@ -1689,6 +1694,7 @@ public com.google.type.PostalAddress getOrgPostalAddress() { * 
      * Required. Address of the organization of the customer entity.
      * Region and zip codes are required to enforce US laws and embargoes.
+     * Valid address lines are required for all customers.
      * Language code is discarded. Use the Customer-level language code to set the
      * customer's language.
      *
@@ -1716,6 +1722,7 @@ public Builder setOrgPostalAddress(com.google.type.PostalAddress value) { * 
      * Required. Address of the organization of the customer entity.
      * Region and zip codes are required to enforce US laws and embargoes.
+     * Valid address lines are required for all customers.
      * Language code is discarded. Use the Customer-level language code to set the
      * customer's language.
      *
@@ -1740,6 +1747,7 @@ public Builder setOrgPostalAddress(com.google.type.PostalAddress.Builder builder * 
      * Required. Address of the organization of the customer entity.
      * Region and zip codes are required to enforce US laws and embargoes.
+     * Valid address lines are required for all customers.
      * Language code is discarded. Use the Customer-level language code to set the
      * customer's language.
      *
@@ -1771,6 +1779,7 @@ public Builder mergeOrgPostalAddress(com.google.type.PostalAddress value) { * 
      * Required. Address of the organization of the customer entity.
      * Region and zip codes are required to enforce US laws and embargoes.
+     * Valid address lines are required for all customers.
      * Language code is discarded. Use the Customer-level language code to set the
      * customer's language.
      *
@@ -1796,6 +1805,7 @@ public Builder clearOrgPostalAddress() { * 
      * Required. Address of the organization of the customer entity.
      * Region and zip codes are required to enforce US laws and embargoes.
+     * Valid address lines are required for all customers.
      * Language code is discarded. Use the Customer-level language code to set the
      * customer's language.
      *
@@ -1815,6 +1825,7 @@ public com.google.type.PostalAddress.Builder getOrgPostalAddressBuilder() { * 
      * Required. Address of the organization of the customer entity.
      * Region and zip codes are required to enforce US laws and embargoes.
+     * Valid address lines are required for all customers.
      * Language code is discarded. Use the Customer-level language code to set the
      * customer's language.
      *
@@ -1838,6 +1849,7 @@ public com.google.type.PostalAddressOrBuilder getOrgPostalAddressOrBuilder() { * 
      * Required. Address of the organization of the customer entity.
      * Region and zip codes are required to enforce US laws and embargoes.
+     * Valid address lines are required for all customers.
      * Language code is discarded. Use the Customer-level language code to set the
      * customer's language.
      *
diff --git a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CustomerOrBuilder.java b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CustomerOrBuilder.java index 0366df25..d2da2550 100644 --- a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CustomerOrBuilder.java +++ b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/CustomerOrBuilder.java @@ -81,6 +81,7 @@ public interface CustomerOrBuilder * 
    * Required. Address of the organization of the customer entity.
    * Region and zip codes are required to enforce US laws and embargoes.
+   * Valid address lines are required for all customers.
    * Language code is discarded. Use the Customer-level language code to set the
    * customer's language.
    *
@@ -98,6 +99,7 @@ public interface CustomerOrBuilder * 
    * Required. Address of the organization of the customer entity.
    * Region and zip codes are required to enforce US laws and embargoes.
+   * Valid address lines are required for all customers.
    * Language code is discarded. Use the Customer-level language code to set the
    * customer's language.
    *
@@ -115,6 +117,7 @@ public interface CustomerOrBuilder * 
    * Required. Address of the organization of the customer entity.
    * Region and zip codes are required to enforce US laws and embargoes.
+   * Valid address lines are required for all customers.
    * Language code is discarded. Use the Customer-level language code to set the
    * customer's language.
    *
diff --git a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/OffersProto.java b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/OffersProto.java index 8bcdfcd5..26eca259 100644 --- a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/OffersProto.java +++ b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/OffersProto.java @@ -114,47 +114,48 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "7.google.cloud.channel.v1.CloudIdentityI" + "nfo.CustomerType\022N\n\027promotional_order_ty" + "pes\030\003 \003(\0162-.google.cloud.channel.v1.Prom" - + "otionalOrderType\"\355\001\n\004Plan\022:\n\014payment_pla" + + "otionalOrderType\"\206\002\n\004Plan\022:\n\014payment_pla" + "n\030\001 \001(\0162$.google.cloud.channel.v1.Paymen" + "tPlan\022:\n\014payment_type\030\002 \001(\0162$.google.clo" + "ud.channel.v1.PaymentType\0226\n\rpayment_cyc" + "le\030\003 \001(\0132\037.google.cloud.channel.v1.Perio" + "d\0225\n\014trial_period\030\004 \001(\0132\037.google.cloud.c" - + "hannel.v1.Period\"\271\001\n\017PriceByResource\022<\n\r" - + "resource_type\030\001 \001(\0162%.google.cloud.chann" - + "el.v1.ResourceType\022-\n\005price\030\002 \001(\0132\036.goog" - + "le.cloud.channel.v1.Price\0229\n\014price_phase" - + "s\030\003 \003(\0132#.google.cloud.channel.v1.PriceP" - + "hase\"\212\001\n\005Price\022&\n\nbase_price\030\001 \001(\0132\022.goo" - + "gle.type.Money\022\020\n\010discount\030\002 \001(\001\022+\n\017effe" - + "ctive_price\030\003 \001(\0132\022.google.type.Money\022\032\n" - + "\022external_price_uri\030\004 \001(\t\"\331\001\n\nPricePhase" - + "\0228\n\013period_type\030\001 \001(\0162#.google.cloud.cha" - + "nnel.v1.PeriodType\022\024\n\014first_period\030\002 \001(\005" - + "\022\023\n\013last_period\030\003 \001(\005\022-\n\005price\030\004 \001(\0132\036.g" - + "oogle.cloud.channel.v1.Price\0227\n\013price_ti" - + "ers\030\005 \003(\0132\".google.cloud.channel.v1.Pric" - + "eTier\"i\n\tPriceTier\022\026\n\016first_resource\030\001 \001" - + "(\005\022\025\n\rlast_resource\030\002 \001(\005\022-\n\005price\030\003 \001(\013" - + "2\036.google.cloud.channel.v1.Price\"T\n\006Peri" - + "od\022\020\n\010duration\030\001 \001(\005\0228\n\013period_type\030\002 \001(" - + "\0162#.google.cloud.channel.v1.PeriodType*m" - + "\n\024PromotionalOrderType\022 \n\034PROMOTIONAL_TY" - + "PE_UNSPECIFIED\020\000\022\017\n\013NEW_UPGRADE\020\001\022\014\n\010TRA" - + "NSFER\020\002\022\024\n\020PROMOTION_SWITCH\020\003*k\n\013Payment" - + "Plan\022\034\n\030PAYMENT_PLAN_UNSPECIFIED\020\000\022\016\n\nCO" - + "MMITMENT\020\001\022\014\n\010FLEXIBLE\020\002\022\010\n\004FREE\020\003\022\t\n\005TR" - + "IAL\020\004\022\013\n\007OFFLINE\020\005*D\n\013PaymentType\022\034\n\030PAY" - + "MENT_TYPE_UNSPECIFIED\020\000\022\n\n\006PREPAY\020\001\022\013\n\007P" - + "OSTPAY\020\002*\212\001\n\014ResourceType\022\035\n\031RESOURCE_TY" - + "PE_UNSPECIFIED\020\000\022\010\n\004SEAT\020\001\022\007\n\003MAU\020\002\022\006\n\002G" - + "B\020\003\022\021\n\rLICENSED_USER\020\004\022\013\n\007MINUTES\020\005\022\016\n\nI" - + "AAS_USAGE\020\006\022\020\n\014SUBSCRIPTION\020\007*G\n\nPeriodT" - + "ype\022\033\n\027PERIOD_TYPE_UNSPECIFIED\020\000\022\007\n\003DAY\020" - + "\001\022\t\n\005MONTH\020\002\022\010\n\004YEAR\020\003Bl\n\033com.google.clo" - + "ud.channel.v1B\013OffersProtoP\001Z>google.gol" - + "ang.org/genproto/googleapis/cloud/channe" - + "l/v1;channelb\006proto3" + + "hannel.v1.Period\022\027\n\017billing_account\030\005 \001(" + + "\t\"\271\001\n\017PriceByResource\022<\n\rresource_type\030\001" + + " \001(\0162%.google.cloud.channel.v1.ResourceT" + + "ype\022-\n\005price\030\002 \001(\0132\036.google.cloud.channe" + + "l.v1.Price\0229\n\014price_phases\030\003 \003(\0132#.googl" + + "e.cloud.channel.v1.PricePhase\"\212\001\n\005Price\022" + + "&\n\nbase_price\030\001 \001(\0132\022.google.type.Money\022" + + "\020\n\010discount\030\002 \001(\001\022+\n\017effective_price\030\003 \001" + + "(\0132\022.google.type.Money\022\032\n\022external_price" + + "_uri\030\004 \001(\t\"\331\001\n\nPricePhase\0228\n\013period_type" + + "\030\001 \001(\0162#.google.cloud.channel.v1.PeriodT" + + "ype\022\024\n\014first_period\030\002 \001(\005\022\023\n\013last_period" + + "\030\003 \001(\005\022-\n\005price\030\004 \001(\0132\036.google.cloud.cha" + + "nnel.v1.Price\0227\n\013price_tiers\030\005 \003(\0132\".goo" + + "gle.cloud.channel.v1.PriceTier\"i\n\tPriceT" + + "ier\022\026\n\016first_resource\030\001 \001(\005\022\025\n\rlast_reso" + + "urce\030\002 \001(\005\022-\n\005price\030\003 \001(\0132\036.google.cloud" + + ".channel.v1.Price\"T\n\006Period\022\020\n\010duration\030" + + "\001 \001(\005\0228\n\013period_type\030\002 \001(\0162#.google.clou" + + "d.channel.v1.PeriodType*m\n\024PromotionalOr" + + "derType\022 \n\034PROMOTIONAL_TYPE_UNSPECIFIED\020" + + "\000\022\017\n\013NEW_UPGRADE\020\001\022\014\n\010TRANSFER\020\002\022\024\n\020PROM" + + "OTION_SWITCH\020\003*k\n\013PaymentPlan\022\034\n\030PAYMENT" + + "_PLAN_UNSPECIFIED\020\000\022\016\n\nCOMMITMENT\020\001\022\014\n\010F" + + "LEXIBLE\020\002\022\010\n\004FREE\020\003\022\t\n\005TRIAL\020\004\022\013\n\007OFFLIN" + + "E\020\005*D\n\013PaymentType\022\034\n\030PAYMENT_TYPE_UNSPE" + + "CIFIED\020\000\022\n\n\006PREPAY\020\001\022\013\n\007POSTPAY\020\002*\212\001\n\014Re" + + "sourceType\022\035\n\031RESOURCE_TYPE_UNSPECIFIED\020" + + "\000\022\010\n\004SEAT\020\001\022\007\n\003MAU\020\002\022\006\n\002GB\020\003\022\021\n\rLICENSED" + + "_USER\020\004\022\013\n\007MINUTES\020\005\022\016\n\nIAAS_USAGE\020\006\022\020\n\014" + + "SUBSCRIPTION\020\007*G\n\nPeriodType\022\033\n\027PERIOD_T" + + "YPE_UNSPECIFIED\020\000\022\007\n\003DAY\020\001\022\t\n\005MONTH\020\002\022\010\n" + + "\004YEAR\020\003Bl\n\033com.google.cloud.channel.v1B\013" + + "OffersProtoP\001Z>google.golang.org/genprot" + + "o/googleapis/cloud/channel/v1;channelb\006p" + + "roto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -214,7 +215,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_channel_v1_Plan_descriptor, new java.lang.String[] { - "PaymentPlan", "PaymentType", "PaymentCycle", "TrialPeriod", + "PaymentPlan", "PaymentType", "PaymentCycle", "TrialPeriod", "BillingAccount", }); internal_static_google_cloud_channel_v1_PriceByResource_descriptor = getDescriptor().getMessageTypes().get(5); diff --git a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/Plan.java b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/Plan.java index 6c402c6a..2dc18883 100644 --- a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/Plan.java +++ b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/Plan.java @@ -40,6 +40,7 @@ private Plan(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Plan() { paymentPlan_ = 0; paymentType_ = 0; + billingAccount_ = ""; } @java.lang.Override @@ -113,6 +114,13 @@ private Plan( trialPeriod_ = subBuilder.buildPartial(); } + break; + } + case 42: + { + java.lang.String s = input.readStringRequireUtf8(); + + billingAccount_ = s; break; } default: @@ -334,6 +342,57 @@ public com.google.cloud.channel.v1.PeriodOrBuilder getTrialPeriodOrBuilder() { return getTrialPeriod(); } + public static final int BILLING_ACCOUNT_FIELD_NUMBER = 5; + private volatile java.lang.Object billingAccount_; + /** + * + * + * 
+   * Reseller Billing account to charge after an offer transaction.
+   * Only present for Google Cloud Platform offers.
+   *
+ * + * string billing_account = 5; + * + * @return The billingAccount. + */ + @java.lang.Override + public java.lang.String getBillingAccount() { + java.lang.Object ref = billingAccount_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + billingAccount_ = s; + return s; + } + } + /** + * + * + * 
+   * Reseller Billing account to charge after an offer transaction.
+   * Only present for Google Cloud Platform offers.
+   *
+ * + * string billing_account = 5; + * + * @return The bytes for billingAccount. + */ + @java.lang.Override + public com.google.protobuf.ByteString getBillingAccountBytes() { + java.lang.Object ref = billingAccount_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + billingAccount_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -362,6 +421,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (trialPeriod_ != null) { output.writeMessage(4, getTrialPeriod()); } + if (!getBillingAccountBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, billingAccount_); + } unknownFields.writeTo(output); } @@ -385,6 +447,9 @@ public int getSerializedSize() { if (trialPeriod_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getTrialPeriod()); } + if (!getBillingAccountBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, billingAccount_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -410,6 +475,7 @@ public boolean equals(final java.lang.Object obj) { if (hasTrialPeriod()) { if (!getTrialPeriod().equals(other.getTrialPeriod())) return false; } + if (!getBillingAccount().equals(other.getBillingAccount())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -433,6 +499,8 @@ public int hashCode() { hash = (37 * hash) + TRIAL_PERIOD_FIELD_NUMBER; hash = (53 * hash) + getTrialPeriod().hashCode(); } + hash = (37 * hash) + BILLING_ACCOUNT_FIELD_NUMBER; + hash = (53 * hash) + getBillingAccount().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -593,6 +661,8 @@ public Builder clear() { trialPeriod_ = null; trialPeriodBuilder_ = null; } + billingAccount_ = ""; + return this; } @@ -631,6 +701,7 @@ public com.google.cloud.channel.v1.Plan buildPartial() { } else { result.trialPeriod_ = trialPeriodBuilder_.build(); } + result.billingAccount_ = billingAccount_; onBuilt(); return result; } @@ -692,6 +763,10 @@ public Builder mergeFrom(com.google.cloud.channel.v1.Plan other) { if (other.hasTrialPeriod()) { mergeTrialPeriod(other.getTrialPeriod()); } + if (!other.getBillingAccount().isEmpty()) { + billingAccount_ = other.billingAccount_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -1327,6 +1402,117 @@ public com.google.cloud.channel.v1.PeriodOrBuilder getTrialPeriodOrBuilder() { return trialPeriodBuilder_; } + private java.lang.Object billingAccount_ = ""; + /** + * + * + * 
+     * Reseller Billing account to charge after an offer transaction.
+     * Only present for Google Cloud Platform offers.
+     *
+ * + * string billing_account = 5; + * + * @return The billingAccount. + */ + public java.lang.String getBillingAccount() { + java.lang.Object ref = billingAccount_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + billingAccount_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * Reseller Billing account to charge after an offer transaction.
+     * Only present for Google Cloud Platform offers.
+     *
+ * + * string billing_account = 5; + * + * @return The bytes for billingAccount. + */ + public com.google.protobuf.ByteString getBillingAccountBytes() { + java.lang.Object ref = billingAccount_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + billingAccount_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * Reseller Billing account to charge after an offer transaction.
+     * Only present for Google Cloud Platform offers.
+     *
+ * + * string billing_account = 5; + * + * @param value The billingAccount to set. + * @return This builder for chaining. + */ + public Builder setBillingAccount(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + billingAccount_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+     * Reseller Billing account to charge after an offer transaction.
+     * Only present for Google Cloud Platform offers.
+     *
+ * + * string billing_account = 5; + * + * @return This builder for chaining. + */ + public Builder clearBillingAccount() { + + billingAccount_ = getDefaultInstance().getBillingAccount(); + onChanged(); + return this; + } + /** + * + * + * 
+     * Reseller Billing account to charge after an offer transaction.
+     * Only present for Google Cloud Platform offers.
+     *
+ * + * string billing_account = 5; + * + * @param value The bytes for billingAccount to set. + * @return This builder for chaining. + */ + public Builder setBillingAccountBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + billingAccount_ = value; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/PlanOrBuilder.java b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/PlanOrBuilder.java index 046cdc79..c353af68 100644 --- a/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/PlanOrBuilder.java +++ b/proto-google-cloud-channel-v1/src/main/java/com/google/cloud/channel/v1/PlanOrBuilder.java @@ -160,4 +160,31 @@ public interface PlanOrBuilder * .google.cloud.channel.v1.Period trial_period = 4; */ com.google.cloud.channel.v1.PeriodOrBuilder getTrialPeriodOrBuilder(); + + /** + * + * + * 
+   * Reseller Billing account to charge after an offer transaction.
+   * Only present for Google Cloud Platform offers.
+   *
+ * + * string billing_account = 5; + * + * @return The billingAccount. + */ + java.lang.String getBillingAccount(); + /** + * + * + * 
+   * Reseller Billing account to charge after an offer transaction.
+   * Only present for Google Cloud Platform offers.
+   *
+ * + * string billing_account = 5; + * + * @return The bytes for billingAccount. + */ + com.google.protobuf.ByteString getBillingAccountBytes(); } diff --git a/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/customers.proto b/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/customers.proto index da54d26e..f41d7e0b 100644 --- a/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/customers.proto +++ b/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/customers.proto @@ -44,6 +44,7 @@ message Customer { // Required. Address of the organization of the customer entity. // Region and zip codes are required to enforce US laws and embargoes. + // Valid address lines are required for all customers. // Language code is discarded. Use the Customer-level language code to set the // customer's language. google.type.PostalAddress org_postal_address = 3 [(google.api.field_behavior) = REQUIRED]; diff --git a/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/offers.proto b/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/offers.proto index 5b2e6bf9..b566e8c6 100644 --- a/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/offers.proto +++ b/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/offers.proto @@ -244,6 +244,10 @@ message Plan { // effect when trial period ends, or if paid service is started before the end // of the trial period. Period trial_period = 4; + + // Reseller Billing account to charge after an offer transaction. + // Only present for Google Cloud Platform offers. + string billing_account = 5; } // Represents price by resource type. diff --git a/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/service.proto b/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/service.proto index 1ee40cb6..46333f8b 100644 --- a/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/service.proto +++ b/proto-google-cloud-channel-v1/src/main/proto/google/cloud/channel/v1/service.proto @@ -112,8 +112,9 @@ service CloudChannelService { // Return Value: // List of [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources for the domain. // List may be empty. + // // Note: in the v1alpha1 version of the API, a NOT_FOUND error is returned if - // no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resource match the domain. + // no [CloudIdentityCustomerAccount][google.cloud.channel.v1.CloudIdentityCustomerAccount] resources match the domain. rpc CheckCloudIdentityAccountsExist(CheckCloudIdentityAccountsExistRequest) returns (CheckCloudIdentityAccountsExistResponse) { option (google.api.http) = { post: "/v1/{parent=accounts/*}:checkCloudIdentityAccountsExist" diff --git a/synth.metadata b/synth.metadata index 05f07d78..3465415d 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "f6dd7e47620566925a4b3f1ce029e74e1b2f2516", - "internalRef": "359781040" + "sha": "c7b5032f6ee39de6c0359b912012f99dfccb49b5", + "internalRef": "359869792" } }, {