From 45758e0f4605883d26043a5b90883d2b08927872 Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Tue, 8 Dec 2020 02:08:45 -0800
Subject: [PATCH] feat: Automated regeneration of content v2.1 client

---
 api_names_out.yaml                            |  1 +
 generated/google/apis/content_v2_1.rb         |  2 +-
 generated/google/apis/content_v2_1/classes.rb | 23 +++++++++++++------
 .../apis/content_v2_1/representations.rb      |  1 +
 .../google/apis/content_v2_1/synth.metadata   |  2 +-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/api_names_out.yaml b/api_names_out.yaml
index a23da71cf6e..a729a78cc87 100644
--- a/api_names_out.yaml
+++ b/api_names_out.yaml
@@ -57822,6 +57822,7 @@
 "/content:v2.1/RepricingRuleEligibleOfferMatcher/itemGroupIdMatcher": item_group_id_matcher
 "/content:v2.1/RepricingRuleEligibleOfferMatcher/matcherOption": matcher_option
 "/content:v2.1/RepricingRuleEligibleOfferMatcher/offerIdMatcher": offer_id_matcher
+"/content:v2.1/RepricingRuleEligibleOfferMatcher/skipWhenOnPromotion": skip_when_on_promotion
 "/content:v2.1/RepricingRuleEligibleOfferMatcherStringMatcher": repricing_rule_eligible_offer_matcher_string_matcher
 "/content:v2.1/RepricingRuleEligibleOfferMatcherStringMatcher/strAttributes": str_attributes
 "/content:v2.1/RepricingRuleEligibleOfferMatcherStringMatcher/strAttributes/str_attribute": str_attribute
diff --git a/generated/google/apis/content_v2_1.rb b/generated/google/apis/content_v2_1.rb
index dd73364bc92..83f1f0b2fc8 100644
--- a/generated/google/apis/content_v2_1.rb
+++ b/generated/google/apis/content_v2_1.rb
@@ -25,7 +25,7 @@ module Apis
     # @see https://developers.google.com/shopping-content/v2/
     module ContentV2_1
       VERSION = 'V2_1'
-      REVISION = '20201113'
+      REVISION = '20201204'
 
       # Manage your product listings and accounts for Google Shopping
       AUTH_CONTENT = 'https://www.googleapis.com/auth/content'
diff --git a/generated/google/apis/content_v2_1/classes.rb b/generated/google/apis/content_v2_1/classes.rb
index 38bf62327ce..345f8cc11d3 100644
--- a/generated/google/apis/content_v2_1/classes.rb
+++ b/generated/google/apis/content_v2_1/classes.rb
@@ -334,17 +334,17 @@ def update!(**args)
       class AccountLabel
         include Google::Apis::Core::Hashable
       
-        # Output only. Immutable. The ID of account this label belongs to.
+        # Immutable. The ID of account this label belongs to.
         # Corresponds to the JSON property `accountId`
         # @return [Fixnum]
         attr_accessor :account_id
       
-        # Description for this label.
+        # The description of this label.
         # Corresponds to the JSON property `description`
         # @return [String]
         attr_accessor :description
       
-        # Output only. Immutable. The ID of the label.
+        # Output only. The ID of the label.
         # Corresponds to the JSON property `labelId`
         # @return [Fixnum]
         attr_accessor :label_id
@@ -943,7 +943,9 @@ class AccountsCustomBatchRequestEntryLinkRequest
         # @return [String]
         attr_accessor :linked_account_id
       
-        # List of provided services.
+        # Provided services. Acceptable values are: - "`shoppingAdsProductManagement`" -
+        # "`shoppingAdsOther`" - "`shoppingActionsProductManagement`" - "`
+        # shoppingActionsOrderManagement`" - "`shoppingActionsOther`"
         # Corresponds to the JSON property `services`
         # @return [Array<String>]
         attr_accessor :services
@@ -3397,7 +3399,7 @@ class LiasettingsCustomBatchResponseEntry
         # @return [Google::Apis::ContentV2_1::Errors]
         attr_accessor :errors
       
-        # The the list of accessible GMB accounts.
+        # The list of accessible GMB accounts.
         # Corresponds to the JSON property `gmbAccounts`
         # @return [Google::Apis::ContentV2_1::GmbAccounts]
         attr_accessor :gmb_accounts
@@ -10924,6 +10926,12 @@ class RepricingRuleEligibleOfferMatcher
         # @return [Google::Apis::ContentV2_1::RepricingRuleEligibleOfferMatcherStringMatcher]
         attr_accessor :offer_id_matcher
       
+        # When true, the rule won't be applied to offers with active promotions.
+        # Corresponds to the JSON property `skipWhenOnPromotion`
+        # @return [Boolean]
+        attr_accessor :skip_when_on_promotion
+        alias_method :skip_when_on_promotion?, :skip_when_on_promotion
+      
         def initialize(**args)
            update!(**args)
         end
@@ -10934,6 +10942,7 @@ def update!(**args)
           @item_group_id_matcher = args[:item_group_id_matcher] if args.key?(:item_group_id_matcher)
           @matcher_option = args[:matcher_option] if args.key?(:matcher_option)
           @offer_id_matcher = args[:offer_id_matcher] if args.key?(:offer_id_matcher)
+          @skip_when_on_promotion = args[:skip_when_on_promotion] if args.key?(:skip_when_on_promotion)
         end
       end
       
@@ -11340,7 +11349,7 @@ class ReturnShipment
         attr_accessor :delivery_date
       
         # Type of the return method. Acceptable values are: - "`byMail`" - "`
-        # contactCustomerSupport`" - "`returnless`"
+        # contactCustomerSupport`" - "`returnless`" - "`inStore`"
         # Corresponds to the JSON property `returnMethodType`
         # @return [String]
         attr_accessor :return_method_type
@@ -11938,7 +11947,7 @@ class SettlementTransactionAmount
         # qualityNotExpected`" - "`receivedTooLate`" - "`storePackageMissing`" - "`
         # transitPackageMissing`" - "`unsuccessfulDeliveryUndeliverable`" - "`
         # wrongChargeInStore`" - "`wrongItem`" - "`returns`" - "`undeliverable`" - "`
-        # refundFromMerchant`" - "`returnLabelShippingFee`"
+        # refundFromMerchant`" - "`returnLabelShippingFee`" - "`pspFee`"
         # Corresponds to the JSON property `description`
         # @return [String]
         attr_accessor :description
diff --git a/generated/google/apis/content_v2_1/representations.rb b/generated/google/apis/content_v2_1/representations.rb
index 1b59c53a989..ae23266b7a7 100644
--- a/generated/google/apis/content_v2_1/representations.rb
+++ b/generated/google/apis/content_v2_1/representations.rb
@@ -4932,6 +4932,7 @@ class Representation < Google::Apis::Core::JsonRepresentation
           property :matcher_option, as: 'matcherOption'
           property :offer_id_matcher, as: 'offerIdMatcher', class: Google::Apis::ContentV2_1::RepricingRuleEligibleOfferMatcherStringMatcher, decorator: Google::Apis::ContentV2_1::RepricingRuleEligibleOfferMatcherStringMatcher::Representation
       
+          property :skip_when_on_promotion, as: 'skipWhenOnPromotion'
         end
       end
       
diff --git a/generated/google/apis/content_v2_1/synth.metadata b/generated/google/apis/content_v2_1/synth.metadata
index 35ea7f72107..fc3cff03759 100644
--- a/generated/google/apis/content_v2_1/synth.metadata
+++ b/generated/google/apis/content_v2_1/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/google-api-ruby-client.git",
-        "sha": "fda99a7f81f55342ce6317eeb1430efb3a3049d0"
+        "sha": "8629207422003a3377099b7f10716c4cdb61c5d4"
       }
     }
   ]