google-api-client 0.23.1 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f758d60ddb4507ad768a4b28ac5c05757ee56c
-  data.tar.gz: 5716aac888a895a2451a02a6a0dbfb65bde05b61
+  metadata.gz: 76de5092b7924e1b9da78b2a32ad6cc3e6643244
+  data.tar.gz: de7e521948ec1e2e60a77a63ff1335dddd2bde4d
 SHA512:
-  metadata.gz: b93d83d063c482c66b22158c584b7fdb2f1e3ecf297b0876425af2fb31c6f85590874272883d4ae2fae527bb8e9734a92527e5e7670a0827c37ef7c9be21724b
-  data.tar.gz: 4f8ff2adfbb0194e8009c73f8f566b807beb57a94f7139d7118e23a6367f4d2c7d9699d42ce0cae8b76de61042e61d45c907c74044b904821139b1411ade7b0e
+  metadata.gz: 023951c11802f213f33302e42025c0a3dd9d01422c9e2a488fa97b497b391993dad6a37297840517fbe07d30b6e30f65193baf7f297a00bf9e3f78979026c820
+  data.tar.gz: cb1e5c69847a91fef13c793a7e6d05b753a84f8733b376ffed95278c97594a2d2639af68246106306cb40a0a4515aaa74d6c7e5a5794d78638e88016dd34ed43

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.23.2
+* Backwards compatible changes:
+  * Updated `cloudfunctions_v1beta2`
+  * Updated `content_v2`
+  * Updated `dataproc_v1`
+  * Updated `dataproc_v1beta2`
+
 # 0.23.1
 * Backwards compatible changes:
   * Added `indexing_v3`

data/generated/google/apis/cloudfunctions_v1beta2.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://cloud.google.com/functions
     module CloudfunctionsV1beta2
       VERSION = 'V1beta2'
-      REVISION = '20180622'
+      REVISION = '20180702'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/cloudfunctions_v1beta2/classes.rb

@@ -137,14 +137,14 @@ module Google
         # @return [String]
         attr_accessor :name
       
-        # The Google Compute Engine network that this function can connect to.
-        # Either the fully-qualified URI of the network resource, or
-        # the short name of the network must be specified. If the network belongs to
-        # another project, the URI of the resource must be specified
-        # e.g.,
-        # `https://www.googleapis.com/compute/v1/projects/`project`/global/networks/`
-        # network``
-        # or `my-network`.
+        # The VPC Network that this cloud function can connect to. It can be
+        # either the fully-qualified URI, or the short name of the network resource.
+        # If the short network name is used, the network must belong to the same
+        # project. Otherwise, it must belong to a project within the same
+        # organization. The format of this field is either
+        # `projects/`project`/global/networks/`network`` or ``network``, where
+        # `project` is a project id where the network is defined, and `network` is
+        # the short name of the network.
         # See [the VPC documentation](https://cloud.google.com/compute/docs/vpc) for
         # more information on connecting Cloud projects.
         # This feature is currently in alpha, available only for whitelisted users.

data/generated/google/apis/content_v2.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://developers.google.com/shopping-content
     module ContentV2
       VERSION = 'V2'
-      REVISION = '20180608'
+      REVISION = ''
 
       # Manage your product listings and accounts for Google Shopping
       AUTH_CONTENT = 'https://www.googleapis.com/auth/content'

data/generated/google/apis/content_v2/classes.rb

@@ -634,8 +634,7 @@ module Google
         # @return [Google::Apis::ContentV2::Account]
         attr_accessor :account
       
-        # The ID of the targeted account. Only defined if the method is get, delete or
-        # claimwebsite.
+        # The ID of the targeted account. Only defined if the method is not insert.
         # Corresponds to the JSON property `accountId`
         # @return [Fixnum]
         attr_accessor :account_id
@@ -652,12 +651,17 @@ module Google
         attr_accessor :force
         alias_method :force?, :force
       
+        # Details about the link request.
+        # Corresponds to the JSON property `linkRequest`
+        # @return [Google::Apis::ContentV2::AccountsCustomBatchRequestEntryLinkRequest]
+        attr_accessor :link_request
+      
         # The ID of the managing account.
         # Corresponds to the JSON property `merchantId`
         # @return [Fixnum]
         attr_accessor :merchant_id
       
-        # 
+        # The method of the batch entry.
         # Corresponds to the JSON property `method`
         # @return [String]
         attr_accessor :request_method
@@ -679,12 +683,44 @@ module Google
           @account_id = args[:account_id] if args.key?(:account_id)
           @batch_id = args[:batch_id] if args.key?(:batch_id)
           @force = args[:force] if args.key?(:force)
+          @link_request = args[:link_request] if args.key?(:link_request)
           @merchant_id = args[:merchant_id] if args.key?(:merchant_id)
           @request_method = args[:request_method] if args.key?(:request_method)
           @overwrite = args[:overwrite] if args.key?(:overwrite)
         end
       end
       
+      # 
+      class AccountsCustomBatchRequestEntryLinkRequest
+        include Google::Apis::Core::Hashable
+      
+        # Action to perform for this link.
+        # Corresponds to the JSON property `action`
+        # @return [String]
+        attr_accessor :action
+      
+        # Type of the link between the two accounts.
+        # Corresponds to the JSON property `linkType`
+        # @return [String]
+        attr_accessor :link_type
+      
+        # The ID of the linked account.
+        # Corresponds to the JSON property `linkedAccountId`
+        # @return [String]
+        attr_accessor :linked_account_id
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @action = args[:action] if args.key?(:action)
+          @link_type = args[:link_type] if args.key?(:link_type)
+          @linked_account_id = args[:linked_account_id] if args.key?(:linked_account_id)
+        end
+      end
+      
       # 
       class BatchAccountsResponse
         include Google::Apis::Core::Hashable
@@ -736,6 +772,11 @@ module Google
         # @return [String]
         attr_accessor :kind
       
+        # The status of the updated link. Only defined if the method is link.
+        # Corresponds to the JSON property `linkStatus`
+        # @return [String]
+        attr_accessor :link_status
+      
         def initialize(**args)
            update!(**args)
         end
@@ -746,6 +787,58 @@ module Google
           @batch_id = args[:batch_id] if args.key?(:batch_id)
           @errors = args[:errors] if args.key?(:errors)
           @kind = args[:kind] if args.key?(:kind)
+          @link_status = args[:link_status] if args.key?(:link_status)
+        end
+      end
+      
+      # 
+      class AccountsLinkRequest
+        include Google::Apis::Core::Hashable
+      
+        # Action to perform for this link.
+        # Corresponds to the JSON property `action`
+        # @return [String]
+        attr_accessor :action
+      
+        # Type of the link between the two accounts.
+        # Corresponds to the JSON property `linkType`
+        # @return [String]
+        attr_accessor :link_type
+      
+        # The ID of the linked account.
+        # Corresponds to the JSON property `linkedAccountId`
+        # @return [String]
+        attr_accessor :linked_account_id
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @action = args[:action] if args.key?(:action)
+          @link_type = args[:link_type] if args.key?(:link_type)
+          @linked_account_id = args[:linked_account_id] if args.key?(:linked_account_id)
+        end
+      end
+      
+      # 
+      class AccountsLinkResponse
+        include Google::Apis::Core::Hashable
+      
+        # Identifies what kind of resource this is. Value: the fixed string "content#
+        # accountsLinkResponse".
+        # Corresponds to the JSON property `kind`
+        # @return [String]
+        attr_accessor :kind
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @kind = args[:kind] if args.key?(:kind)
         end
       end
       
@@ -1096,12 +1189,12 @@ module Google
       class Amount
         include Google::Apis::Core::Hashable
       
-        # Value before taxes.
+        # [required] Value before taxes.
         # Corresponds to the JSON property `pretax`
         # @return [Google::Apis::ContentV2::Price]
         attr_accessor :pretax
       
-        # Tax value.
+        # [required] Tax value.
         # Corresponds to the JSON property `tax`
         # @return [Google::Apis::ContentV2::Price]
         attr_accessor :tax
@@ -2665,30 +2758,30 @@ module Google
         # @return [Array<Google::Apis::ContentV2::InvoiceSummaryAdditionalChargeSummary>]
         attr_accessor :additional_charge_summaries
       
-        # Customer balance on this invoice. A positive amount means the customer is
-        # paying, a negative one means the customer is receiving money. Note that it
-        # must always be true that merchant_balance + customer_balance + google_balance =
-        # 0.
+        # [required] Customer balance on this invoice. A positive amount means the
+        # customer is paying, a negative one means the customer is receiving money. Note
+        # that it must always be true that merchant_balance + customer_balance +
+        # google_balance = 0.
         # Corresponds to the JSON property `customerBalance`
         # @return [Google::Apis::ContentV2::Amount]
         attr_accessor :customer_balance
       
-        # Google balance on this invoice. A positive amount means Google is paying, a
-        # negative one means Google is receiving money. Note that it must always be true
-        # that merchant_balance + customer_balance + google_balance = 0.
+        # [required] Google balance on this invoice. A positive amount means Google is
+        # paying, a negative one means Google is receiving money. Note that it must
+        # always be true that merchant_balance + customer_balance + google_balance = 0.
         # Corresponds to the JSON property `googleBalance`
         # @return [Google::Apis::ContentV2::Amount]
         attr_accessor :google_balance
       
-        # Merchant balance on this invoice. A positive amount means the merchant is
-        # paying, a negative one means the merchant is receiving money. Note that it
-        # must always be true that merchant_balance + customer_balance + google_balance =
-        # 0.
+        # [required] Merchant balance on this invoice. A positive amount means the
+        # merchant is paying, a negative one means the merchant is receiving money. Note
+        # that it must always be true that merchant_balance + customer_balance +
+        # google_balance = 0.
         # Corresponds to the JSON property `merchantBalance`
         # @return [Google::Apis::ContentV2::Amount]
         attr_accessor :merchant_balance
       
-        # Total price for the product.
+        # [required] Total price for the product.
         # Corresponds to the JSON property `productTotal`
         # @return [Google::Apis::ContentV2::Amount]
         attr_accessor :product_total
@@ -2717,12 +2810,12 @@ module Google
       class InvoiceSummaryAdditionalChargeSummary
         include Google::Apis::Core::Hashable
       
-        # Total additional charge for this type.
+        # [required] Total additional charge for this type.
         # Corresponds to the JSON property `totalAmount`
         # @return [Google::Apis::ContentV2::Amount]
         attr_accessor :total_amount
       
-        # Type of the additional charge.
+        # [required] Type of the additional charge.
         # Corresponds to the JSON property `type`
         # @return [String]
         attr_accessor :type
@@ -4334,7 +4427,7 @@ module Google
         attr_accessor :creation_date
       
         # Date on which the shipment has been delivered, in ISO 8601 format. Present
-        # only if status is delievered
+        # only if status is delivered
         # Corresponds to the JSON property `deliveryDate`
         # @return [String]
         attr_accessor :delivery_date
@@ -4412,27 +4505,28 @@ module Google
       class OrderinvoicesCreateChargeInvoiceRequest
         include Google::Apis::Core::Hashable
       
-        # The ID of the invoice.
+        # [required] The ID of the invoice.
         # Corresponds to the JSON property `invoiceId`
         # @return [String]
         attr_accessor :invoice_id
       
-        # Invoice summary.
+        # [required] Invoice summary.
         # Corresponds to the JSON property `invoiceSummary`
         # @return [Google::Apis::ContentV2::InvoiceSummary]
         attr_accessor :invoice_summary
       
-        # Invoice details per line item.
+        # [required] Invoice details per line item.
         # Corresponds to the JSON property `lineItemInvoices`
         # @return [Array<Google::Apis::ContentV2::ShipmentInvoiceLineItemInvoice>]
         attr_accessor :line_item_invoices
       
-        # The ID of the operation, unique across all operations for a given order.
+        # [required] The ID of the operation, unique across all operations for a given
+        # order.
         # Corresponds to the JSON property `operationId`
         # @return [String]
         attr_accessor :operation_id
       
-        # ID of the shipment group.
+        # [required] ID of the shipment group.
         # Corresponds to the JSON property `shipmentGroupId`
         # @return [String]
         attr_accessor :shipment_group_id
@@ -4481,24 +4575,25 @@ module Google
       class OrderinvoicesCreateRefundInvoiceRequest
         include Google::Apis::Core::Hashable
       
-        # The ID of the invoice.
+        # [required] The ID of the invoice.
         # Corresponds to the JSON property `invoiceId`
         # @return [String]
         attr_accessor :invoice_id
       
-        # The ID of the operation, unique across all operations for a given order.
+        # [required] The ID of the operation, unique across all operations for a given
+        # order.
         # Corresponds to the JSON property `operationId`
         # @return [String]
         attr_accessor :operation_id
       
-        # Option to create a refund-only invoice. Exactly one of refund_option and
-        # return_option must be provided.
+        # Option to create a refund-only invoice. Exactly one of refundOnlyOption or
+        # returnOption must be provided.
         # Corresponds to the JSON property `refundOnlyOption`
         # @return [Google::Apis::ContentV2::OrderinvoicesCustomBatchRequestEntryCreateRefundInvoiceRefundOption]
         attr_accessor :refund_only_option
       
         # Option to create an invoice for a refund and mark all items within the invoice
-        # as returned. Exactly one of refund_option and return_option must be provided.
+        # as returned. Exactly one of refundOnlyOption or returnOption must be provided.
         # Corresponds to the JSON property `returnOption`
         # @return [Google::Apis::ContentV2::OrderinvoicesCustomBatchRequestEntryCreateRefundInvoiceReturnOption]
         attr_accessor :return_option
@@ -4557,7 +4652,7 @@ module Google
         # @return [String]
         attr_accessor :description
       
-        # Reason for the refund.
+        # [required] Reason for the refund.
         # Corresponds to the JSON property `reason`
         # @return [String]
         attr_accessor :reason
@@ -4582,7 +4677,7 @@ module Google
         # @return [String]
         attr_accessor :description
       
-        # Reason for the return.
+        # [required] Reason for the return.
         # Corresponds to the JSON property `reason`
         # @return [String]
         attr_accessor :reason
@@ -5710,6 +5805,12 @@ module Google
         # @return [String]
         attr_accessor :carrier
       
+        # Date on which the shipment has been delivered, in ISO 8601 format. Optional
+        # and can be provided only if
+        # Corresponds to the JSON property `deliveryDate`
+        # @return [String]
+        attr_accessor :delivery_date
+      
         # The ID of the shipment.
         # Corresponds to the JSON property `shipmentId`
         # @return [String]
@@ -5732,6 +5833,7 @@ module Google
         # Update properties of this object
         def update!(**args)
           @carrier = args[:carrier] if args.key?(:carrier)
+          @delivery_date = args[:delivery_date] if args.key?(:delivery_date)
           @shipment_id = args[:shipment_id] if args.key?(:shipment_id)
           @status = args[:status] if args.key?(:status)
           @tracking_id = args[:tracking_id] if args.key?(:tracking_id)
@@ -6583,6 +6685,12 @@ module Google
         # @return [String]
         attr_accessor :carrier
       
+        # Date on which the shipment has been delivered, in ISO 8601 format. Optional
+        # and can be provided only if
+        # Corresponds to the JSON property `deliveryDate`
+        # @return [String]
+        attr_accessor :delivery_date
+      
         # The ID of the operation. Unique across all operations for a given order.
         # Corresponds to the JSON property `operationId`
         # @return [String]
@@ -6610,6 +6718,7 @@ module Google
         # Update properties of this object
         def update!(**args)
           @carrier = args[:carrier] if args.key?(:carrier)
+          @delivery_date = args[:delivery_date] if args.key?(:delivery_date)
           @operation_id = args[:operation_id] if args.key?(:operation_id)
           @shipment_id = args[:shipment_id] if args.key?(:shipment_id)
           @status = args[:status] if args.key?(:status)
@@ -7504,6 +7613,11 @@ module Google
         # @return [String]
         attr_accessor :content_language
       
+        # Cost of goods sold. Used for gross profit reporting.
+        # Corresponds to the JSON property `costOfGoodsSold`
+        # @return [Google::Apis::ContentV2::Price]
+        attr_accessor :cost_of_goods_sold
+      
         # A list of custom (merchant-provided) attributes. It can also be used for
         # submitting any attribute of the feed specification in its generic form (e.g., `
         # "name": "size type", "type": "text", "value": "regular" `). This is useful
@@ -7664,11 +7778,21 @@ module Google
         # @return [String]
         attr_accessor :material
       
+        # The energy efficiency class as defined in EU directive 2010/30/EU.
+        # Corresponds to the JSON property `maxEnergyEfficiencyClass`
+        # @return [String]
+        attr_accessor :max_energy_efficiency_class
+      
         # Maximal product handling time (in business days).
         # Corresponds to the JSON property `maxHandlingTime`
         # @return [Fixnum]
         attr_accessor :max_handling_time
       
+        # The energy efficiency class as defined in EU directive 2010/30/EU.
+        # Corresponds to the JSON property `minEnergyEfficiencyClass`
+        # @return [String]
+        attr_accessor :min_energy_efficiency_class
+      
         # Minimal product handling time (in business days).
         # Corresponds to the JSON property `minHandlingTime`
         # @return [Fixnum]
@@ -7842,6 +7966,7 @@ module Google
           @color = args[:color] if args.key?(:color)
           @condition = args[:condition] if args.key?(:condition)
           @content_language = args[:content_language] if args.key?(:content_language)
+          @cost_of_goods_sold = args[:cost_of_goods_sold] if args.key?(:cost_of_goods_sold)
           @custom_attributes = args[:custom_attributes] if args.key?(:custom_attributes)
           @custom_groups = args[:custom_groups] if args.key?(:custom_groups)
           @custom_label0 = args[:custom_label0] if args.key?(:custom_label0)
@@ -7871,7 +7996,9 @@ module Google
           @link = args[:link] if args.key?(:link)
           @loyalty_points = args[:loyalty_points] if args.key?(:loyalty_points)
           @material = args[:material] if args.key?(:material)
+          @max_energy_efficiency_class = args[:max_energy_efficiency_class] if args.key?(:max_energy_efficiency_class)
           @max_handling_time = args[:max_handling_time] if args.key?(:max_handling_time)
+          @min_energy_efficiency_class = args[:min_energy_efficiency_class] if args.key?(:min_energy_efficiency_class)
           @min_handling_time = args[:min_handling_time] if args.key?(:min_handling_time)
           @mobile_link = args[:mobile_link] if args.key?(:mobile_link)
           @mpn = args[:mpn] if args.key?(:mpn)
@@ -8816,13 +8943,13 @@ module Google
       class Promotion
         include Google::Apis::Core::Hashable
       
-        # Amount of the promotion. The values here are the promotion applied to the unit
-        # price pretax and to the total of the tax amounts.
+        # [required] Amount of the promotion. The values here are the promotion applied
+        # to the unit price pretax and to the total of the tax amounts.
         # Corresponds to the JSON property `promotionAmount`
         # @return [Google::Apis::ContentV2::Amount]
         attr_accessor :promotion_amount
       
-        # ID of the promotion.
+        # [required] ID of the promotion.
         # Corresponds to the JSON property `promotionId`
         # @return [String]
         attr_accessor :promotion_id
@@ -8988,17 +9115,17 @@ module Google
       class ShipmentInvoice
         include Google::Apis::Core::Hashable
       
-        # Invoice summary.
+        # [required] Invoice summary.
         # Corresponds to the JSON property `invoiceSummary`
         # @return [Google::Apis::ContentV2::InvoiceSummary]
         attr_accessor :invoice_summary
       
-        # Invoice details per line item.
+        # [required] Invoice details per line item.
         # Corresponds to the JSON property `lineItemInvoices`
         # @return [Array<Google::Apis::ContentV2::ShipmentInvoiceLineItemInvoice>]
         attr_accessor :line_item_invoices
       
-        # ID of the shipment group.
+        # [required] ID of the shipment group.
         # Corresponds to the JSON property `shipmentGroupId`
         # @return [String]
         attr_accessor :shipment_group_id
@@ -9030,12 +9157,12 @@ module Google
         # @return [String]
         attr_accessor :product_id
       
-        # Unit IDs to define specific units within the line item.
+        # [required] Unit IDs to define specific units within the line item.
         # Corresponds to the JSON property `shipmentUnitIds`
         # @return [Array<String>]
         attr_accessor :shipment_unit_ids
       
-        # Invoice details for a single unit.
+        # [required] Invoice details for a single unit.
         # Corresponds to the JSON property `unitInvoice`
         # @return [Google::Apis::ContentV2::UnitInvoice]
         attr_accessor :unit_invoice
@@ -9675,7 +9802,7 @@ module Google
         # @return [Array<Google::Apis::ContentV2::Promotion>]
         attr_accessor :promotions
       
-        # Price of the unit, before applying taxes.
+        # [required] Price of the unit, before applying taxes.
         # Corresponds to the JSON property `unitPricePretax`
         # @return [Google::Apis::ContentV2::Price]
         attr_accessor :unit_price_pretax
@@ -9702,7 +9829,7 @@ module Google
       class UnitInvoiceAdditionalCharge
         include Google::Apis::Core::Hashable
       
-        # Amount of the additional charge.
+        # [required] Amount of the additional charge.
         # Corresponds to the JSON property `additionalChargeAmount`
         # @return [Google::Apis::ContentV2::Amount]
         attr_accessor :additional_charge_amount
@@ -9712,7 +9839,7 @@ module Google
         # @return [Array<Google::Apis::ContentV2::Promotion>]
         attr_accessor :additional_charge_promotions
       
-        # Type of the additional charge.
+        # [required] Type of the additional charge.
         # Corresponds to the JSON property `type`
         # @return [String]
         attr_accessor :type
@@ -9733,17 +9860,18 @@ module Google
       class UnitInvoiceTaxLine
         include Google::Apis::Core::Hashable
       
-        # Tax amount for the tax type.
+        # [required] Tax amount for the tax type.
         # Corresponds to the JSON property `taxAmount`
         # @return [Google::Apis::ContentV2::Price]
         attr_accessor :tax_amount
       
-        # Optional name of the tax type.
+        # Optional name of the tax type. This should only be provided if taxType is
+        # otherFeeTax.
         # Corresponds to the JSON property `taxName`
         # @return [String]
         attr_accessor :tax_name
       
-        # Type of the tax.
+        # [required] Type of the tax.
         # Corresponds to the JSON property `taxType`
         # @return [String]
         attr_accessor :tax_type

data/generated/google/apis/content_v2/representations.rb

@@ -118,6 +118,12 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class AccountsCustomBatchRequestEntryLinkRequest
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class BatchAccountsResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -130,6 +136,18 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class AccountsLinkRequest
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class AccountsLinkResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class ListAccountsResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -1624,12 +1642,23 @@ module Google
           property :account_id, :numeric_string => true, as: 'accountId'
           property :batch_id, as: 'batchId'
           property :force, as: 'force'
+          property :link_request, as: 'linkRequest', class: Google::Apis::ContentV2::AccountsCustomBatchRequestEntryLinkRequest, decorator: Google::Apis::ContentV2::AccountsCustomBatchRequestEntryLinkRequest::Representation
+      
           property :merchant_id, :numeric_string => true, as: 'merchantId'
           property :request_method, as: 'method'
           property :overwrite, as: 'overwrite'
         end
       end
       
+      class AccountsCustomBatchRequestEntryLinkRequest
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :action, as: 'action'
+          property :link_type, as: 'linkType'
+          property :linked_account_id, as: 'linkedAccountId'
+        end
+      end
+      
       class BatchAccountsResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -1648,6 +1677,23 @@ module Google
           property :errors, as: 'errors', class: Google::Apis::ContentV2::Errors, decorator: Google::Apis::ContentV2::Errors::Representation
       
           property :kind, as: 'kind'
+          property :link_status, as: 'linkStatus'
+        end
+      end
+      
+      class AccountsLinkRequest
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :action, as: 'action'
+          property :link_type, as: 'linkType'
+          property :linked_account_id, as: 'linkedAccountId'
+        end
+      end
+      
+      class AccountsLinkResponse
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :kind, as: 'kind'
         end
       end
       
@@ -3066,6 +3112,7 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :carrier, as: 'carrier'
+          property :delivery_date, as: 'deliveryDate'
           property :shipment_id, as: 'shipmentId'
           property :status, as: 'status'
           property :tracking_id, as: 'trackingId'
@@ -3314,6 +3361,7 @@ module Google
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
           property :carrier, as: 'carrier'
+          property :delivery_date, as: 'deliveryDate'
           property :operation_id, as: 'operationId'
           property :shipment_id, as: 'shipmentId'
           property :status, as: 'status'
@@ -3557,6 +3605,8 @@ module Google
           property :color, as: 'color'
           property :condition, as: 'condition'
           property :content_language, as: 'contentLanguage'
+          property :cost_of_goods_sold, as: 'costOfGoodsSold', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
+      
           collection :custom_attributes, as: 'customAttributes', class: Google::Apis::ContentV2::ProductCustomAttribute, decorator: Google::Apis::ContentV2::ProductCustomAttribute::Representation
       
           collection :custom_groups, as: 'customGroups', class: Google::Apis::ContentV2::ProductCustomGroup, decorator: Google::Apis::ContentV2::ProductCustomGroup::Representation
@@ -3591,7 +3641,9 @@ module Google
           property :loyalty_points, as: 'loyaltyPoints', class: Google::Apis::ContentV2::LoyaltyPoints, decorator: Google::Apis::ContentV2::LoyaltyPoints::Representation
       
           property :material, as: 'material'
+          property :max_energy_efficiency_class, as: 'maxEnergyEfficiencyClass'
           property :max_handling_time, :numeric_string => true, as: 'maxHandlingTime'
+          property :min_energy_efficiency_class, as: 'minEnergyEfficiencyClass'
           property :min_handling_time, :numeric_string => true, as: 'minHandlingTime'
           property :mobile_link, as: 'mobileLink'
           property :mpn, as: 'mpn'

data/generated/google/apis/content_v2/service.rb

@@ -280,6 +280,48 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
+        # Performs an action on a link between a Merchant Center account and another
+        # account.
+        # @param [Fixnum] merchant_id
+        #   The ID of the managing account. If this parameter is not the same as accountId,
+        #   then this account must be a multi-client account and accountId must be the ID
+        #   of a sub-account of this account.
+        # @param [Fixnum] account_id
+        #   The ID of the account that should be linked.
+        # @param [Google::Apis::ContentV2::AccountsLinkRequest] accounts_link_request_object
+        # @param [String] fields
+        #   Selector specifying which fields to include in a partial response.
+        # @param [String] quota_user
+        #   An opaque string that represents a user for quota purposes. Must not exceed 40
+        #   characters.
+        # @param [String] user_ip
+        #   Deprecated. Please use quotaUser instead.
+        # @param [Google::Apis::RequestOptions] options
+        #   Request-specific options
+        #
+        # @yield [result, err] Result & error if block supplied
+        # @yieldparam result [Google::Apis::ContentV2::AccountsLinkResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::ContentV2::AccountsLinkResponse]
+        #
+        # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried
+        # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
+        # @raise [Google::Apis::AuthorizationError] Authorization is required
+        def link_account(merchant_id, account_id, accounts_link_request_object = nil, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command =  make_simple_command(:post, '{merchantId}/accounts/{accountId}/link', options)
+          command.request_representation = Google::Apis::ContentV2::AccountsLinkRequest::Representation
+          command.request_object = accounts_link_request_object
+          command.response_representation = Google::Apis::ContentV2::AccountsLinkResponse::Representation
+          command.response_class = Google::Apis::ContentV2::AccountsLinkResponse
+          command.params['merchantId'] = merchant_id unless merchant_id.nil?
+          command.params['accountId'] = account_id unless account_id.nil?
+          command.query['fields'] = fields unless fields.nil?
+          command.query['quotaUser'] = quota_user unless quota_user.nil?
+          command.query['userIp'] = user_ip unless user_ip.nil?
+          execute_or_queue_command(command, &block)
+        end
+        
         # Lists the sub-accounts in your Merchant Center account.
         # @param [Fixnum] merchant_id
         #   The ID of the managing account. This must be a multi-client account.

data/generated/google/apis/dataproc_v1.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://cloud.google.com/dataproc/
     module DataprocV1
       VERSION = 'V1'
-      REVISION = '20180619'
+      REVISION = '20180702'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/dataproc_v1/classes.rb

@@ -755,8 +755,8 @@ module Google
         # @return [Google::Apis::DataprocV1::DiskConfig]
         attr_accessor :disk_config
       
-        # Optional. The Compute Engine image resource used for cluster instances.
-        # Inferred from SoftwareConfig.image_version.
+        # Optional. The Compute Engine image resource used for cluster instances. It can
+        # be specified or may be inferred from SoftwareConfig.image_version.
         # Corresponds to the JSON property `imageUri`
         # @return [String]
         attr_accessor :image_uri

data/generated/google/apis/dataproc_v1beta2.rb

@@ -25,7 +25,7 @@ module Google
     # @see https://cloud.google.com/dataproc/
     module DataprocV1beta2
       VERSION = 'V1beta2'
-      REVISION = '20180622'
+      REVISION = '20180702'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/dataproc_v1beta2/classes.rb

@@ -78,7 +78,7 @@ module Google
         attr_accessor :members
       
         # Role that is assigned to members. For example, roles/viewer, roles/editor, or
-        # roles/owner. Required
+        # roles/owner.
         # Corresponds to the JSON property `role`
         # @return [String]
         attr_accessor :role

data/lib/google/apis/version.rb

@@ -15,7 +15,7 @@
 module Google
   module Apis
     # Client library version
-    VERSION = '0.23.1'
+    VERSION = '0.23.2'
 
     # Current operating system
     # @private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api-client
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.23.2
 platform: ruby
 authors:
 - Steven Bazyl
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable