google-api-client 0.36.0 → 0.37.0

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

@@ -50,7 +50,8 @@ module Google
         
         # Creates new notes in batch.
         # @param [String] parent
-        #   The name of the project in the form of `projects/[PROJECT_ID]`, under which
+        #   Required. The name of the project in the form of `projects/[PROJECT_ID]`,
+        #   under which
         #   the notes are to be created.
         # @param [Google::Apis::ContaineranalysisV1beta1::BatchCreateNotesRequest] batch_create_notes_request_object
         # @param [String] fields
@@ -84,11 +85,12 @@ module Google
         
         # Creates a new note.
         # @param [String] parent
-        #   The name of the project in the form of `projects/[PROJECT_ID]`, under which
+        #   Required. The name of the project in the form of `projects/[PROJECT_ID]`,
+        #   under which
         #   the note is to be created.
         # @param [Google::Apis::ContaineranalysisV1beta1::Note] note_object
         # @param [String] note_id
-        #   The ID to use for this note.
+        #   Required. The ID to use for this note.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
         # @param [String] quota_user
@@ -121,7 +123,7 @@ module Google
         
         # Deletes the specified note.
         # @param [String] name
-        #   The name of the note in the form of
+        #   Required. The name of the note in the form of
         #   `projects/[PROVIDER_ID]/notes/[NOTE_ID]`.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -152,7 +154,7 @@ module Google
         
         # Gets the specified note.
         # @param [String] name
-        #   The name of the note in the form of
+        #   Required. The name of the note in the form of
         #   `projects/[PROVIDER_ID]/notes/[NOTE_ID]`.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -223,7 +225,7 @@ module Google
         
         # Lists notes for the specified project.
         # @param [String] parent
-        #   The name of the project to list notes for in the form of
+        #   Required. The name of the project to list notes for in the form of
         #   `projects/[PROJECT_ID]`.
         # @param [String] filter
         #   The filter expression.
@@ -264,7 +266,7 @@ module Google
         
         # Updates the specified note.
         # @param [String] name
-        #   The name of the note in the form of
+        #   Required. The name of the note in the form of
         #   `projects/[PROVIDER_ID]/notes/[NOTE_ID]`.
         # @param [Google::Apis::ContaineranalysisV1beta1::Note] note_object
         # @param [String] update_mask
@@ -382,7 +384,7 @@ module Google
         # this method to get all occurrences across consumer projects referencing the
         # specified note.
         # @param [String] name
-        #   The name of the note to list occurrences for in the form of
+        #   Required. The name of the note to list occurrences for in the form of
         #   `projects/[PROVIDER_ID]/notes/[NOTE_ID]`.
         # @param [String] filter
         #   The filter expression.
@@ -422,7 +424,8 @@ module Google
         
         # Creates new occurrences in batch.
         # @param [String] parent
-        #   The name of the project in the form of `projects/[PROJECT_ID]`, under which
+        #   Required. The name of the project in the form of `projects/[PROJECT_ID]`,
+        #   under which
         #   the occurrences are to be created.
         # @param [Google::Apis::ContaineranalysisV1beta1::BatchCreateOccurrencesRequest] batch_create_occurrences_request_object
         # @param [String] fields
@@ -456,7 +459,8 @@ module Google
         
         # Creates a new occurrence.
         # @param [String] parent
-        #   The name of the project in the form of `projects/[PROJECT_ID]`, under which
+        #   Required. The name of the project in the form of `projects/[PROJECT_ID]`,
+        #   under which
         #   the occurrence is to be created.
         # @param [Google::Apis::ContaineranalysisV1beta1::Occurrence] occurrence_object
         # @param [String] fields
@@ -492,7 +496,7 @@ module Google
         # occurrence when the occurrence is no longer applicable for the given
         # resource.
         # @param [String] name
-        #   The name of the occurrence in the form of
+        #   Required. The name of the occurrence in the form of
         #   `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]`.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -523,7 +527,7 @@ module Google
         
         # Gets the specified occurrence.
         # @param [String] name
-        #   The name of the occurrence in the form of
+        #   Required. The name of the occurrence in the form of
         #   `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]`.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -595,7 +599,7 @@ module Google
         # Gets the note attached to the specified occurrence. Consumer projects can
         # use this method to get a note that belongs to a provider project.
         # @param [String] name
-        #   The name of the occurrence in the form of
+        #   Required. The name of the occurrence in the form of
         #   `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]`.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -626,7 +630,8 @@ module Google
         
         # Gets a summary of the number and severity of occurrences.
         # @param [String] parent
-        #   The name of the project to get a vulnerability summary for in the form of
+        #   Required. The name of the project to get a vulnerability summary for in the
+        #   form of
         #   `projects/[PROJECT_ID]`.
         # @param [String] filter
         #   The filter expression.
@@ -660,7 +665,7 @@ module Google
         
         # Lists occurrences for the specified project.
         # @param [String] parent
-        #   The name of the project to list occurrences for in the form of
+        #   Required. The name of the project to list occurrences for in the form of
         #   `projects/[PROJECT_ID]`.
         # @param [String] filter
         #   The filter expression.
@@ -701,7 +706,7 @@ module Google
         
         # Updates the specified occurrence.
         # @param [String] name
-        #   The name of the occurrence in the form of
+        #   Required. The name of the occurrence in the form of
         #   `projects/[PROJECT_ID]/occurrences/[OCCURRENCE_ID]`.
         # @param [Google::Apis::ContaineranalysisV1beta1::Occurrence] occurrence_object
         # @param [String] update_mask
@@ -817,7 +822,7 @@ module Google
         
         # Gets the specified scan configuration.
         # @param [String] name
-        #   The name of the scan configuration in the form of
+        #   Required. The name of the scan configuration in the form of
         #   `projects/[PROJECT_ID]/scanConfigs/[SCAN_CONFIG_ID]`.
         # @param [String] fields
         #   Selector specifying which fields to include in a partial response.
@@ -848,10 +853,11 @@ module Google
         
         # Lists scan configurations for the specified project.
         # @param [String] parent
-        #   The name of the project to list scan configurations for in the form of
+        #   Required. The name of the project to list scan configurations for in the form
+        #   of
         #   `projects/[PROJECT_ID]`.
         # @param [String] filter
-        #   The filter expression.
+        #   Required. The filter expression.
         # @param [Fixnum] page_size
         #   The number of scan configs to return in the list.
         # @param [String] page_token
@@ -888,7 +894,7 @@ module Google
         
         # Updates the specified scan configuration.
         # @param [String] name
-        #   The name of the scan configuration in the form of
+        #   Required. The name of the scan configuration in the form of
         #   `projects/[PROJECT_ID]/scanConfigs/[SCAN_CONFIG_ID]`.
         # @param [Google::Apis::ContaineranalysisV1beta1::ScanConfig] scan_config_object
         # @param [String] fields

data/generated/google/apis/containeranalysis_v1beta1.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://cloud.google.com/container-analysis/api/reference/rest/
     module ContaineranalysisV1beta1
       VERSION = 'V1beta1'
-      REVISION = '20191118'
+      REVISION = '20200120'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

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

@@ -4323,8 +4323,9 @@ module Google
         # @return [String]
         attr_accessor :full_name
       
-        # Email address for receiving merchant issued value-added tax or invoice
-        # documentation of this order.
+        # Email address for the merchant to send value-added tax or invoice
+        # documentation of the order. This documentation is made available to the
+        # customer.
         # Corresponds to the JSON property `invoiceReceivingEmail`
         # @return [String]
         attr_accessor :invoice_receiving_email
@@ -5253,45 +5254,48 @@ module Google
         include Google::Apis::Core::Hashable
       
         # The carrier handling the shipment.
-        # Acceptable values for US are:
-        # - "gsx"
-        # - "ups"
-        # - "usps"
-        # - "fedex"
-        # - "dhl"
-        # - "ecourier"
-        # - "cxt"
-        # - "google"
-        # - "ontrac"
-        # - "emsy"
-        # - "ont"
-        # - "deliv"
-        # - "dynamex"
-        # - "lasership"
-        # - "mpx"
-        # - "uds"
-        # - "efw"
-        # - "yunexpress"
-        # - "china post"
-        # - "china ems"
-        # - "singapore post"
-        # - "pos malaysia"
-        # - "postnl"
-        # - "ptt"
-        # - "eub"
-        # - "chukou1"
-        # Acceptable values for FR are:
-        # - "colissimo"
-        # - "chronopost"
-        # - "gls"
-        # - "dpd"
-        # - "bpost"
-        # - "colis prive"
-        # - "boxtal"
-        # - "geodis"
-        # - "tnt"
-        # - "la poste"
-        # - "ups"
+        # For supported carriers, Google includes the carrier name and tracking URL in
+        # emails to customers. For select supported carriers, Google also automatically
+        # updates the shipment status based on the provided shipment ID. Note: You can
+        # also use unsupported carriers, but emails to customers will not include the
+        # carrier name or tracking URL, and there will be no automatic order status
+        # updates.
+        # Supported carriers for US are:
+        # - "ups" (United Parcel Service) automatic status updates
+        # - "usps" (United States Postal Service) automatic status updates
+        # - "fedex" (FedEx) automatic status updates
+        # - "dhl" (DHL eCommerce) automatic status updates (US only)
+        # - "ontrac" (OnTrac) automatic status updates
+        # - "dhl express" (DHL Express)
+        # - "deliv" (Deliv)
+        # - "dynamex" (TForce)
+        # - "lasership" (LaserShip)
+        # - "mpx" (Military Parcel Xpress)
+        # - "uds" (United Delivery Service)
+        # - "efw" (Estes Forwarding Worldwide)
+        # - "jd logistics" (JD Logistics)
+        # - "yunexpress" (YunExpress)
+        # - "china post" (China Post)
+        # - "china ems" (China Post Express Mail Service)
+        # - "singapore post" (Singapore Post)
+        # - "pos malaysia" (Pos Malaysia)
+        # - "postnl" (PostNL)
+        # - "ptt" (PTT Turkish Post)
+        # - "eub" (ePacket)
+        # - "chukou1" (Chukou1 Logistics)
+        # Supported carriers for FR are:
+        # - "la poste" (La Poste) automatic status updates
+        # - "colissimo" (Colissimo by La Poste) automatic status updates
+        # - "ups" (United Parcel Service) automatic status updates
+        # - "chronopost" (Chronopost by La Poste)
+        # - "gls" (General Logistics Systems France)
+        # - "dpd" (DPD Group by GeoPost)
+        # - "bpost" (Belgian Post Group)
+        # - "colis prive" (Colis Privé)
+        # - "boxtal" (Boxtal)
+        # - "geodis" (GEODIS)
+        # - "tnt" (TNT)
+        # - "db schenker" (DB Schenker)
         # Corresponds to the JSON property `carrier`
         # @return [String]
         attr_accessor :carrier
@@ -7662,6 +7666,62 @@ module Google
         end
       end
       
+      # 
+      class PickupCarrierService
+        include Google::Apis::Core::Hashable
+      
+        # The name of the pickup carrier (e.g., "UPS"). Required.
+        # Corresponds to the JSON property `carrierName`
+        # @return [String]
+        attr_accessor :carrier_name
+      
+        # The name of the pickup service (e.g., "Access point"). Required.
+        # Corresponds to the JSON property `serviceName`
+        # @return [String]
+        attr_accessor :service_name
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @carrier_name = args[:carrier_name] if args.key?(:carrier_name)
+          @service_name = args[:service_name] if args.key?(:service_name)
+        end
+      end
+      
+      # 
+      class PickupServicesPickupService
+        include Google::Apis::Core::Hashable
+      
+        # The name of the carrier (e.g., "UPS"). Always present.
+        # Corresponds to the JSON property `carrierName`
+        # @return [String]
+        attr_accessor :carrier_name
+      
+        # The CLDR country code of the carrier (e.g., "US"). Always present.
+        # Corresponds to the JSON property `country`
+        # @return [String]
+        attr_accessor :country
+      
+        # The name of the pickup service (e.g., "Access point"). Always present.
+        # Corresponds to the JSON property `serviceName`
+        # @return [String]
+        attr_accessor :service_name
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @carrier_name = args[:carrier_name] if args.key?(:carrier_name)
+          @country = args[:country] if args.key?(:country)
+          @service_name = args[:service_name] if args.key?(:service_name)
+        end
+      end
+      
       # 
       class PosCustomBatchRequest
         include Google::Apis::Core::Hashable
@@ -8532,7 +8592,8 @@ module Google
         # 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", "value": "regular" `). This is useful for submitting
-        # attributes not explicitly exposed by the API.
+        # attributes not explicitly exposed by the API, such as additional attributes
+        # used for Shopping Actions.
         # Corresponds to the JSON property `customAttributes`
         # @return [Array<Google::Apis::ContentV2::CustomAttribute>]
         attr_accessor :custom_attributes
@@ -10055,6 +10116,13 @@ module Google
         # @return [String]
         attr_accessor :name
       
+        # The carrier-service pair delivering items to collection points. The list of
+        # supported pickup services can be retrieved via the getSupportedPickupServices
+        # method. Required if and only if the service delivery type is pickup.
+        # Corresponds to the JSON property `pickupService`
+        # @return [Google::Apis::ContentV2::PickupCarrierService]
+        attr_accessor :pickup_service
+      
         # Shipping rate group definitions. Only the last one is allowed to have an empty
         # applicableShippingLabels, which means "everything else". The other
         # applicableShippingLabels must not overlap.
@@ -10062,6 +10130,11 @@ module Google
         # @return [Array<Google::Apis::ContentV2::RateGroup>]
         attr_accessor :rate_groups
       
+        # Type of locations this service ships orders to.
+        # Corresponds to the JSON property `shipmentType`
+        # @return [String]
+        attr_accessor :shipment_type
+      
         def initialize(**args)
            update!(**args)
         end
@@ -10075,7 +10148,9 @@ module Google
           @eligibility = args[:eligibility] if args.key?(:eligibility)
           @minimum_order_value = args[:minimum_order_value] if args.key?(:minimum_order_value)
           @name = args[:name] if args.key?(:name)
+          @pickup_service = args[:pickup_service] if args.key?(:pickup_service)
           @rate_groups = args[:rate_groups] if args.key?(:rate_groups)
+          @shipment_type = args[:shipment_type] if args.key?(:shipment_type)
         end
       end
       
@@ -10391,6 +10466,32 @@ module Google
         end
       end
       
+      # 
+      class ShippingsettingsGetSupportedPickupServicesResponse
+        include Google::Apis::Core::Hashable
+      
+        # Identifies what kind of resource this is. Value: the fixed string "content#
+        # shippingsettingsGetSupportedPickupServicesResponse".
+        # Corresponds to the JSON property `kind`
+        # @return [String]
+        attr_accessor :kind
+      
+        # A list of supported pickup services. May be empty.
+        # Corresponds to the JSON property `pickupServices`
+        # @return [Array<Google::Apis::ContentV2::PickupServicesPickupService>]
+        attr_accessor :pickup_services
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @kind = args[:kind] if args.key?(:kind)
+          @pickup_services = args[:pickup_services] if args.key?(:pickup_services)
+        end
+      end
+      
       # 
       class ShippingsettingsListResponse
         include Google::Apis::Core::Hashable

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

@@ -1168,6 +1168,18 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class PickupCarrierService
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
+      class PickupServicesPickupService
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class PosCustomBatchRequest
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -1510,6 +1522,12 @@ module Google
         include Google::Apis::Core::JsonObjectSupport
       end
       
+      class ShippingsettingsGetSupportedPickupServicesResponse
+        class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
+      end
+      
       class ShippingsettingsListResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
       
@@ -3737,6 +3755,23 @@ module Google
         end
       end
       
+      class PickupCarrierService
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :carrier_name, as: 'carrierName'
+          property :service_name, as: 'serviceName'
+        end
+      end
+      
+      class PickupServicesPickupService
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :carrier_name, as: 'carrierName'
+          property :country, as: 'country'
+          property :service_name, as: 'serviceName'
+        end
+      end
+      
       class PosCustomBatchRequest
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation
@@ -4364,8 +4399,11 @@ module Google
           property :minimum_order_value, as: 'minimumOrderValue', class: Google::Apis::ContentV2::Price, decorator: Google::Apis::ContentV2::Price::Representation
       
           property :name, as: 'name'
+          property :pickup_service, as: 'pickupService', class: Google::Apis::ContentV2::PickupCarrierService, decorator: Google::Apis::ContentV2::PickupCarrierService::Representation
+      
           collection :rate_groups, as: 'rateGroups', class: Google::Apis::ContentV2::RateGroup, decorator: Google::Apis::ContentV2::RateGroup::Representation
       
+          property :shipment_type, as: 'shipmentType'
         end
       end
       
@@ -4469,6 +4507,15 @@ module Google
         end
       end
       
+      class ShippingsettingsGetSupportedPickupServicesResponse
+        # @private
+        class Representation < Google::Apis::Core::JsonRepresentation
+          property :kind, as: 'kind'
+          collection :pickup_services, as: 'pickupServices', class: Google::Apis::ContentV2::PickupServicesPickupService, decorator: Google::Apis::ContentV2::PickupServicesPickupService::Representation
+      
+        end
+      end
+      
       class ShippingsettingsListResponse
         # @private
         class Representation < Google::Apis::Core::JsonRepresentation

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

@@ -3522,6 +3522,39 @@ module Google
           execute_or_queue_command(command, &block)
         end
         
+        # Retrieves supported pickup services for an account.
+        # @param [Fixnum] merchant_id
+        #   The ID of the account for which to retrieve the supported pickup services.
+        # @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::ShippingsettingsGetSupportedPickupServicesResponse] parsed result object
+        # @yieldparam err [StandardError] error object if request failed
+        #
+        # @return [Google::Apis::ContentV2::ShippingsettingsGetSupportedPickupServicesResponse]
+        #
+        # @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 getsupportedpickupservices_shippingsetting(merchant_id, fields: nil, quota_user: nil, user_ip: nil, options: nil, &block)
+          command = make_simple_command(:get, '{merchantId}/supportedPickupServices', options)
+          command.response_representation = Google::Apis::ContentV2::ShippingsettingsGetSupportedPickupServicesResponse::Representation
+          command.response_class = Google::Apis::ContentV2::ShippingsettingsGetSupportedPickupServicesResponse
+          command.params['merchantId'] = merchant_id unless merchant_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 shipping settings of the sub-accounts in your Merchant Center
         # account.
         # @param [Fixnum] merchant_id

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 = '20191107'
+      REVISION = '20200110'
 
       # Manage your product listings and accounts for Google Shopping
       AUTH_CONTENT = 'https://www.googleapis.com/auth/content'