TrueCloudLab/restic
16
0
Fork 3
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update vendored dependencies

Browse source 
This includes github.com/kurin/blazer 0.2.0, which resolves #1291
This commit is contained in:
Alexander Neumann 2017-10-01 10:13:39 +02:00
parent ba23d24dd1
commit 61cb1cc6f8
1044 changed files with 203022 additions and 97709 deletions
Download patch file Download diff file Expand all files Collapse all files

180
vendor/google.golang.org/api/content/v2/content-api.json generated vendored
View file

@ -1,12 +1,12 @@
{
"kind": "discovery#restDescription",
"etag": "\"YWOzh2SDasdU84ArJnpYek-OMdg/Ogd-A7sPcNqrkouPfVxTAQBSYIA\"",
"etag": "\"YWOzh2SDasdU84ArJnpYek-OMdg/dPMCZ2Ey4YVlnyiRa2uPlyOUPp4\"",
"discoveryVersion": "v1",
"id": "content:v2",
"name": "content",
"canonicalName": "Shopping Content",
"version": "v2",
"revision": "20170914",
"revision": "20170928",
"title": "Content API for Shopping",
"description": "Manages product items, inventory, and Merchant Center accounts for Google Shopping.",
"ownerDomain": "google.com",
@ -136,6 +136,13 @@
"websiteUrl": {
"type": "string",
"description": "The merchant's website."
},
"youtubeChannelLinks": {
"type": "array",
"description": "List of linked YouTube channels that are active or pending approval. To create a new link request, add a new link with status active to the list. It will remain in a pending state until approved or rejected in the YT Creator Studio interface. To delete an active link, or to cancel a link request, remove it from the list.",
"items": {
"$ref": "AccountYouTubeChannelLink"
}
}
}
},
@ -383,6 +390,32 @@
}
}
},
"AccountYouTubeChannelLink": {
"id": "AccountYouTubeChannelLink",
"type": "object",
"properties": {
"channelId": {
"type": "string",
"description": "Channel ID.",
"annotations": {
"required": [
"content.accounts.insert",
"content.accounts.update"
]
}
},
"status": {
"type": "string",
"description": "Status of the link between this Merchant Center account and the YouTube channel. Upon retrieval, it represents the actual status of the link and can be either active if it was approved in YT Creator Studio or pending if it's pending approval. Upon insertion, it represents the intended status of the link. Re-uploading a link with status active when it's still pending or with status pending when it's already active will have no effect: the status will remain unchanged. Re-uploading a link with deprecated status inactive is equivalent to not submitting the link at all and will delete the link if it was active or cancel the link request if it was pending.",
"annotations": {
"required": [
"content.accounts.insert",
"content.accounts.update"
]
}
}
}
},
"AccountsAuthInfoResponse": {
"id": "AccountsAuthInfoResponse",
"type": "object",
@ -792,12 +825,7 @@
},
"contentLanguage": {
"type": "string",
"description": "The two-letter ISO 639-1 language of the items in the feed. Must be a valid language for targetCountry.",
"annotations": {
"required": [
"content.datafeeds.insert"
]
}
"description": "[DEPRECATED] Please use target.language instead. The two-letter ISO 639-1 language of the items in the feed. Must be a valid language for targetCountry."
},
"contentType": {
"type": "string",
@ -839,7 +867,7 @@
},
"intendedDestinations": {
"type": "array",
"description": "The list of intended destinations (corresponds to checked check boxes in Merchant Center).",
"description": "[DEPRECATED] Please use target.includedDestination instead. The list of intended destinations (corresponds to checked check boxes in Merchant Center).",
"items": {
"type": "string"
}
@ -860,12 +888,13 @@
},
"targetCountry": {
"type": "string",
"description": "The country where the items in the feed will be included in the search index, represented as a CLDR territory code.",
"annotations": {
"required": [
"content.datafeeds.insert",
"content.datafeeds.update"
]
"description": "[DEPRECATED] Please use target.country instead. The country where the items in the feed will be included in the search index, represented as a CLDR territory code."
},
"targets": {
"type": "array",
"description": "The targets this feed should apply to (country, language, destinations).",
"items": {
"$ref": "DatafeedTarget"
}
}
}
@ -939,6 +968,10 @@
"type": "object",
"description": "The status of a datafeed, i.e., the result of the last retrieval of the datafeed computed asynchronously when the feed processing is finished.",
"properties": {
"country": {
"type": "string",
"description": "The country for which the status is reported, represented as a CLDR territory code."
},
"datafeedId": {
"type": "string",
"description": "The ID of the feed for which the status is reported.",
@ -966,6 +999,10 @@
"description": "Identifies what kind of resource this is. Value: the fixed string \"content#datafeedStatus\".",
"default": "content#datafeedStatus"
},
"language": {
"type": "string",
"description": "The two-letter ISO 639-1 language for which the status is reported."
},
"lastUploadDate": {
"type": "string",
"description": "The last date at which the feed was uploaded."
@ -1030,6 +1067,34 @@
}
}
},
"DatafeedTarget": {
"id": "DatafeedTarget",
"type": "object",
"properties": {
"country": {
"type": "string",
"description": "The country where the items in the feed will be included in the search index, represented as a CLDR territory code."
},
"excludedDestinations": {
"type": "array",
"description": "The list of destinations to exclude for this target (corresponds to unchecked check boxes in Merchant Center).",
"items": {
"type": "string"
}
},
"includedDestinations": {
"type": "array",
"description": "The list of destinations to include for this target (corresponds to checked check boxes in Merchant Center). Default destinations are always included unless provided in the excluded_destination field.",
"items": {
"type": "string"
}
},
"language": {
"type": "string",
"description": "The two-letter ISO 639-1 language of the items in the feed. Must be a valid language for targets[].country."
}
}
},
"DatafeedsCustomBatchRequest": {
"id": "DatafeedsCustomBatchRequest",
"type": "object",
@ -1154,11 +1219,19 @@
"description": "An entry ID, unique within the batch request.",
"format": "uint32"
},
"country": {
"type": "string",
"description": "The country for which to get the datafeed status. If this parameter is provided then language must also be provided. Note that for multi-target datafeeds this parameter is required."
},
"datafeedId": {
"type": "string",
"description": "The ID of the data feed to get or delete.",
"description": "The ID of the data feed to get.",
"format": "uint64"
},
"language": {
"type": "string",
"description": "The language for which to get the datafeed status. If this parameter is provided then country must also be provided. Note that for multi-target datafeeds this parameter is required."
},
"merchantId": {
"type": "string",
"description": "The ID of the managing account.",
@ -1788,6 +1861,10 @@
"$ref": "OrderCancellation"
}
},
"channelType": {
"type": "string",
"description": "The channel type of the order: \"purchaseOnGoogle\" or \"googleExpress\"."
},
"id": {
"type": "string",
"description": "The id of the line item."
@ -2007,7 +2084,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier for the shipping. Optional."
"description": "The carrier for the shipping. Optional. See shipments[].carrier for a list of acceptable values."
},
"maxDaysInTransit": {
"type": "integer",
@ -2068,7 +2145,7 @@
},
"type": {
"type": "string",
"description": "The type of instrument (VISA, Mastercard, etc)."
"description": "The type of instrument.\n\nAcceptable values are: \n- \"AMEX\" \n- \"DISCOVER\" \n- \"JCB\" \n- \"MASTERCARD\" \n- \"UNIONPAY\" \n- \"VISA\" \n- \"\""
}
}
},
@ -2196,7 +2273,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment."
"description": "The carrier handling the shipment.\n\nAcceptable values are: \n- \"gsx\" \n- \"ups\" \n- \"united parcel service\" \n- \"usps\" \n- \"united states postal service\" \n- \"fedex\" \n- \"dhl\" \n- \"ecourier\" \n- \"cxt\" \n- \"google\" \n- \"on trac\" \n- \"ontrac\" \n- \"on-trac\" \n- \"on_trac\" \n- \"delvic\" \n- \"dynamex\" \n- \"lasership\" \n- \"smartpost\" \n- \"fedex smartpost\" \n- \"mpx\" \n- \"uds\" \n- \"united delivery service\""
},
"creationDate": {
"type": "string",
@ -2543,7 +2620,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The carrier handling the shipment. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"lineItems": {
"type": "array",
@ -2554,7 +2631,37 @@
},
"shipmentId": {
"type": "string",
"description": "The ID of the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The ID of the shipment."
},
"shipmentInfos": {
"type": "array",
"description": "Shipment information. This field is repeated because a single line item can be shipped in several packages (and have several tracking IDs).",
"items": {
"$ref": "OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo"
}
},
"trackingId": {
"type": "string",
"description": "Deprecated. Please use shipmentInfo instead. The tracking id for the shipment."
}
}
},
"OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo": {
"id": "OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo",
"type": "object",
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"shipmentId": {
"type": "string",
"description": "The ID of the shipment.",
"annotations": {
"required": [
"content.orders.shiplineitems"
]
}
},
"trackingId": {
"type": "string",
@ -2568,7 +2675,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment. Not updated if missing."
"description": "The carrier handling the shipment. Not updated if missing. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"shipmentId": {
"type": "string",
@ -2766,7 +2873,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The carrier handling the shipment. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"lineItems": {
"type": "array",
@ -2781,11 +2888,18 @@
},
"shipmentId": {
"type": "string",
"description": "The ID of the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The ID of the shipment."
},
"shipmentInfos": {
"type": "array",
"description": "Shipment information. This field is repeated because a single line item can be shipped in several packages (and have several tracking IDs).",
"items": {
"$ref": "OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo"
}
},
"trackingId": {
"type": "string",
"description": "The tracking id for the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The tracking id for the shipment."
}
}
},
@ -2839,7 +2953,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment. Not updated if missing."
"description": "The carrier handling the shipment. Not updated if missing. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"operationId": {
"type": "string",
@ -4490,8 +4604,8 @@
},
"force": {
"type": "boolean",
"description": "Flag to delete sub-accounts with products. The default value of false will become active on September 28, 2017.",
"default": "true",
"description": "Flag to delete sub-accounts with products. The default value is false.",
"default": "false",
"location": "query"
},
"merchantId": {
@ -5200,12 +5314,22 @@
"httpMethod": "GET",
"description": "Retrieves the status of a datafeed from your Merchant Center account. This method can only be called for non-multi-client accounts.",
"parameters": {
"country": {
"type": "string",
"description": "The country for which to get the datafeed status. If this parameter is provided then language must also be provided. Note that this parameter is required for feeds targeting multiple countries and languages, since a feed may have a different status for each target.",
"location": "query"
},
"datafeedId": {
"type": "string",
"required": true,
"format": "uint64",
"location": "path"
},
"language": {
"type": "string",
"description": "The language for which to get the datafeed status. If this parameter is provided then country must also be provided. Note that this parameter is required for feeds targeting multiple countries and languages, since a feed may have a different status for each target.",
"location": "query"
},
"merchantId": {
"type": "string",
"required": true,

280
vendor/google.golang.org/api/content/v2/content-gen.go generated vendored
View file

@ -230,6 +230,14 @@ type Account struct {
// WebsiteUrl: The merchant's website.
WebsiteUrl string `json:"websiteUrl,omitempty"`
// YoutubeChannelLinks: List of linked YouTube channels that are active
// or pending approval. To create a new link request, add a new link
// with status active to the list. It will remain in a pending state
// until approved or rejected in the YT Creator Studio interface. To
// delete an active link, or to cancel a link request, remove it from
// the list.
YoutubeChannelLinks []*AccountYouTubeChannelLink `json:"youtubeChannelLinks,omitempty"`
// ServerResponse contains the HTTP response code and headers from the
// server.
googleapi.ServerResponse `json:"-"`
@ -627,6 +635,45 @@ func (s *AccountUser) MarshalJSON() ([]byte, error) {
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
type AccountYouTubeChannelLink struct {
// ChannelId: Channel ID.
ChannelId string `json:"channelId,omitempty"`
// Status: Status of the link between this Merchant Center account and
// the YouTube channel. Upon retrieval, it represents the actual status
// of the link and can be either active if it was approved in YT Creator
// Studio or pending if it's pending approval. Upon insertion, it
// represents the intended status of the link. Re-uploading a link with
// status active when it's still pending or with status pending when
// it's already active will have no effect: the status will remain
// unchanged. Re-uploading a link with deprecated status inactive is
// equivalent to not submitting the link at all and will delete the link
// if it was active or cancel the link request if it was pending.
Status string `json:"status,omitempty"`
// ForceSendFields is a list of field names (e.g. "ChannelId") to
// unconditionally include in API requests. By default, fields with
// empty values are omitted from API requests. However, any non-pointer,
// non-interface field appearing in ForceSendFields will be sent to the
// server regardless of whether the field is empty or not. This may be
// used to include empty fields in Patch requests.
ForceSendFields []string `json:"-"`
// NullFields is a list of field names (e.g. "ChannelId") to include in
// API requests with the JSON null value. By default, fields with empty
// values are omitted from API requests. However, any field with an
// empty value appearing in NullFields will be sent to the server as
// null. It is an error if a field in this list has a non-empty value.
// This may be used to include null fields in Patch requests.
NullFields []string `json:"-"`
}
func (s *AccountYouTubeChannelLink) MarshalJSON() ([]byte, error) {
type noMethod AccountYouTubeChannelLink
raw := noMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
type AccountsAuthInfoResponse struct {
// AccountIdentifiers: The account identifiers corresponding to the
// authenticated user.
@ -1339,8 +1386,9 @@ type Datafeed struct {
// attributes are defined in the data feed.
AttributeLanguage string `json:"attributeLanguage,omitempty"`
// ContentLanguage: The two-letter ISO 639-1 language of the items in
// the feed. Must be a valid language for targetCountry.
// ContentLanguage: [DEPRECATED] Please use target.language instead. The
// two-letter ISO 639-1 language of the items in the feed. Must be a
// valid language for targetCountry.
ContentLanguage string `json:"contentLanguage,omitempty"`
// ContentType: The type of data feed. For product inventory feeds, only
@ -1360,8 +1408,9 @@ type Datafeed struct {
// Id: The ID of the data feed.
Id int64 `json:"id,omitempty,string"`
// IntendedDestinations: The list of intended destinations (corresponds
// to checked check boxes in Merchant Center).
// IntendedDestinations: [DEPRECATED] Please use
// target.includedDestination instead. The list of intended destinations
// (corresponds to checked check boxes in Merchant Center).
IntendedDestinations []string `json:"intendedDestinations,omitempty"`
// Kind: Identifies what kind of resource this is. Value: the fixed
@ -1371,10 +1420,15 @@ type Datafeed struct {
// Name: A descriptive name of the data feed.
Name string `json:"name,omitempty"`
// TargetCountry: The country where the items in the feed will be
// included in the search index, represented as a CLDR territory code.
// TargetCountry: [DEPRECATED] Please use target.country instead. The
// country where the items in the feed will be included in the search
// index, represented as a CLDR territory code.
TargetCountry string `json:"targetCountry,omitempty"`
// Targets: The targets this feed should apply to (country, language,
// destinations).
Targets []*DatafeedTarget `json:"targets,omitempty"`
// ServerResponse contains the HTTP response code and headers from the
// server.
googleapi.ServerResponse `json:"-"`
@ -1507,6 +1561,10 @@ func (s *DatafeedFormat) MarshalJSON() ([]byte, error) {
// last retrieval of the datafeed computed asynchronously when the feed
// processing is finished.
type DatafeedStatus struct {
// Country: The country for which the status is reported, represented as
// a CLDR territory code.
Country string `json:"country,omitempty"`
// DatafeedId: The ID of the feed for which the status is reported.
DatafeedId uint64 `json:"datafeedId,omitempty,string"`
@ -1523,6 +1581,10 @@ type DatafeedStatus struct {
// string "content#datafeedStatus".
Kind string `json:"kind,omitempty"`
// Language: The two-letter ISO 639-1 language for which the status is
// reported.
Language string `json:"language,omitempty"`
// LastUploadDate: The last date at which the feed was uploaded.
LastUploadDate string `json:"lastUploadDate,omitempty"`
@ -1536,7 +1598,7 @@ type DatafeedStatus struct {
// server.
googleapi.ServerResponse `json:"-"`
// ForceSendFields is a list of field names (e.g. "DatafeedId") to
// ForceSendFields is a list of field names (e.g. "Country") to
// unconditionally include in API requests. By default, fields with
// empty values are omitted from API requests. However, any non-pointer,
// non-interface field appearing in ForceSendFields will be sent to the
@ -1544,7 +1606,7 @@ type DatafeedStatus struct {
// used to include empty fields in Patch requests.
ForceSendFields []string `json:"-"`
// NullFields is a list of field names (e.g. "DatafeedId") to include in
// NullFields is a list of field names (e.g. "Country") to include in
// API requests with the JSON null value. By default, fields with empty
// values are omitted from API requests. However, any field with an
// empty value appearing in NullFields will be sent to the server as
@ -1632,6 +1694,48 @@ func (s *DatafeedStatusExample) MarshalJSON() ([]byte, error) {
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
type DatafeedTarget struct {
// Country: The country where the items in the feed will be included in
// the search index, represented as a CLDR territory code.
Country string `json:"country,omitempty"`
// ExcludedDestinations: The list of destinations to exclude for this
// target (corresponds to unchecked check boxes in Merchant Center).
ExcludedDestinations []string `json:"excludedDestinations,omitempty"`
// IncludedDestinations: The list of destinations to include for this
// target (corresponds to checked check boxes in Merchant Center).
// Default destinations are always included unless provided in the
// excluded_destination field.
IncludedDestinations []string `json:"includedDestinations,omitempty"`
// Language: The two-letter ISO 639-1 language of the items in the feed.
// Must be a valid language for targets[].country.
Language string `json:"language,omitempty"`
// ForceSendFields is a list of field names (e.g. "Country") to
// unconditionally include in API requests. By default, fields with
// empty values are omitted from API requests. However, any non-pointer,
// non-interface field appearing in ForceSendFields will be sent to the
// server regardless of whether the field is empty or not. This may be
// used to include empty fields in Patch requests.
ForceSendFields []string `json:"-"`
// NullFields is a list of field names (e.g. "Country") to include in
// API requests with the JSON null value. By default, fields with empty
// values are omitted from API requests. However, any field with an
// empty value appearing in NullFields will be sent to the server as
// null. It is an error if a field in this list has a non-empty value.
// This may be used to include null fields in Patch requests.
NullFields []string `json:"-"`
}
func (s *DatafeedTarget) MarshalJSON() ([]byte, error) {
type noMethod DatafeedTarget
raw := noMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
type DatafeedsCustomBatchRequest struct {
// Entries: The request entries to be processed in the batch.
Entries []*DatafeedsCustomBatchRequestEntry `json:"entries,omitempty"`
@ -1841,9 +1945,19 @@ type DatafeedstatusesCustomBatchRequestEntry struct {
// BatchId: An entry ID, unique within the batch request.
BatchId int64 `json:"batchId,omitempty"`
// DatafeedId: The ID of the data feed to get or delete.
// Country: The country for which to get the datafeed status. If this
// parameter is provided then language must also be provided. Note that
// for multi-target datafeeds this parameter is required.
Country string `json:"country,omitempty"`
// DatafeedId: The ID of the data feed to get.
DatafeedId uint64 `json:"datafeedId,omitempty,string"`
// Language: The language for which to get the datafeed status. If this
// parameter is provided then country must also be provided. Note that
// for multi-target datafeeds this parameter is required.
Language string `json:"language,omitempty"`
// MerchantId: The ID of the managing account.
MerchantId uint64 `json:"merchantId,omitempty,string"`
@ -2849,6 +2963,10 @@ type OrderLineItem struct {
// Cancellations: Cancellations of the line item.
Cancellations []*OrderCancellation `json:"cancellations,omitempty"`
// ChannelType: The channel type of the order: "purchaseOnGoogle" or
// "googleExpress".
ChannelType string `json:"channelType,omitempty"`
// Id: The id of the line item.
Id string `json:"id,omitempty"`
@ -3085,7 +3203,8 @@ func (s *OrderLineItemShippingDetails) MarshalJSON() ([]byte, error) {
}
type OrderLineItemShippingDetailsMethod struct {
// Carrier: The carrier for the shipping. Optional.
// Carrier: The carrier for the shipping. Optional. See
// shipments[].carrier for a list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// MaxDaysInTransit: Maximum transit time.
@ -3137,7 +3256,16 @@ type OrderPaymentMethod struct {
// PhoneNumber: The billing phone number.
PhoneNumber string `json:"phoneNumber,omitempty"`
// Type: The type of instrument (VISA, Mastercard, etc).
// Type: The type of instrument.
//
// Acceptable values are:
// - "AMEX"
// - "DISCOVER"
// - "JCB"
// - "MASTERCARD"
// - "UNIONPAY"
// - "VISA"
// - ""
Type string `json:"type,omitempty"`
// ForceSendFields is a list of field names (e.g. "BillingAddress") to
@ -3343,6 +3471,30 @@ func (s *OrderReturn) MarshalJSON() ([]byte, error) {
type OrderShipment struct {
// Carrier: The carrier handling the shipment.
//
// Acceptable values are:
// - "gsx"
// - "ups"
// - "united parcel service"
// - "usps"
// - "united states postal service"
// - "fedex"
// - "dhl"
// - "ecourier"
// - "cxt"
// - "google"
// - "on trac"
// - "ontrac"
// - "on-trac"
// - "on_trac"
// - "delvic"
// - "dynamex"
// - "lasership"
// - "smartpost"
// - "fedex smartpost"
// - "mpx"
// - "uds"
// - "united delivery service"
Carrier string `json:"carrier,omitempty"`
// CreationDate: Date on which the shipment has been created, in ISO
@ -3966,16 +4118,25 @@ func (s *OrdersCustomBatchRequestEntryReturnLineItem) MarshalJSON() ([]byte, err
}
type OrdersCustomBatchRequestEntryShipLineItems struct {
// Carrier: The carrier handling the shipment.
// Carrier: Deprecated. Please use shipmentInfo instead. The carrier
// handling the shipment. See shipments[].carrier in the Orders
// resource representation for a list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// LineItems: Line items to ship.
LineItems []*OrderShipmentLineItemShipment `json:"lineItems,omitempty"`
// ShipmentId: The ID of the shipment.
// ShipmentId: Deprecated. Please use shipmentInfo instead. The ID of
// the shipment.
ShipmentId string `json:"shipmentId,omitempty"`
// TrackingId: The tracking id for the shipment.
// ShipmentInfos: Shipment information. This field is repeated because a
// single line item can be shipped in several packages (and have several
// tracking IDs).
ShipmentInfos []*OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo `json:"shipmentInfos,omitempty"`
// TrackingId: Deprecated. Please use shipmentInfo instead. The tracking
// id for the shipment.
TrackingId string `json:"trackingId,omitempty"`
// ForceSendFields is a list of field names (e.g. "Carrier") to
@ -4001,8 +4162,45 @@ func (s *OrdersCustomBatchRequestEntryShipLineItems) MarshalJSON() ([]byte, erro
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
type OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo struct {
// Carrier: The carrier handling the shipment. See shipments[].carrier
// in the Orders resource representation for a list of acceptable
// values.
Carrier string `json:"carrier,omitempty"`
// ShipmentId: The ID of the shipment.
ShipmentId string `json:"shipmentId,omitempty"`
// TrackingId: The tracking id for the shipment.
TrackingId string `json:"trackingId,omitempty"`
// ForceSendFields is a list of field names (e.g. "Carrier") to
// unconditionally include in API requests. By default, fields with
// empty values are omitted from API requests. However, any non-pointer,
// non-interface field appearing in ForceSendFields will be sent to the
// server regardless of whether the field is empty or not. This may be
// used to include empty fields in Patch requests.
ForceSendFields []string `json:"-"`
// NullFields is a list of field names (e.g. "Carrier") to include in
// API requests with the JSON null value. By default, fields with empty
// values are omitted from API requests. However, any field with an
// empty value appearing in NullFields will be sent to the server as
// null. It is an error if a field in this list has a non-empty value.
// This may be used to include null fields in Patch requests.
NullFields []string `json:"-"`
}
func (s *OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo) MarshalJSON() ([]byte, error) {
type noMethod OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
raw := noMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
type OrdersCustomBatchRequestEntryUpdateShipment struct {
// Carrier: The carrier handling the shipment. Not updated if missing.
// See shipments[].carrier in the Orders resource representation for a
// list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// ShipmentId: The ID of the shipment.
@ -4373,7 +4571,9 @@ func (s *OrdersReturnLineItemResponse) MarshalJSON() ([]byte, error) {
}
type OrdersShipLineItemsRequest struct {
// Carrier: The carrier handling the shipment.
// Carrier: Deprecated. Please use shipmentInfo instead. The carrier
// handling the shipment. See shipments[].carrier in the Orders
// resource representation for a list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// LineItems: Line items to ship.
@ -4383,10 +4583,17 @@ type OrdersShipLineItemsRequest struct {
// for a given order.
OperationId string `json:"operationId,omitempty"`
// ShipmentId: The ID of the shipment.
// ShipmentId: Deprecated. Please use shipmentInfo instead. The ID of
// the shipment.
ShipmentId string `json:"shipmentId,omitempty"`
// TrackingId: The tracking id for the shipment.
// ShipmentInfos: Shipment information. This field is repeated because a
// single line item can be shipped in several packages (and have several
// tracking IDs).
ShipmentInfos []*OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo `json:"shipmentInfos,omitempty"`
// TrackingId: Deprecated. Please use shipmentInfo instead. The tracking
// id for the shipment.
TrackingId string `json:"trackingId,omitempty"`
// ForceSendFields is a list of field names (e.g. "Carrier") to
@ -4519,6 +4726,8 @@ func (s *OrdersUpdateMerchantOrderIdResponse) MarshalJSON() ([]byte, error) {
type OrdersUpdateShipmentRequest struct {
// Carrier: The carrier handling the shipment. Not updated if missing.
// See shipments[].carrier in the Orders resource representation for a
// list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// OperationId: The ID of the operation. Unique across all operations
@ -7114,8 +7323,7 @@ func (c *AccountsDeleteCall) DryRun(dryRun bool) *AccountsDeleteCall {
}
// Force sets the optional parameter "force": Flag to delete
// sub-accounts with products. The default value of false will become
// active on September 28, 2017.
// sub-accounts with products. The default value is false.
func (c *AccountsDeleteCall) Force(force bool) *AccountsDeleteCall {
c.urlParams_.Set("force", fmt.Sprint(force))
return c
@ -7199,8 +7407,8 @@ func (c *AccountsDeleteCall) Do(opts ...googleapi.CallOption) error {
// "type": "boolean"
// },
// "force": {
// "default": "true",
// "description": "Flag to delete sub-accounts with products. The default value of false will become active on September 28, 2017.",
// "default": "false",
// "description": "Flag to delete sub-accounts with products. The default value is false.",
// "location": "query",
// "type": "boolean"
// },
@ -10457,6 +10665,26 @@ func (r *DatafeedstatusesService) Get(merchantId uint64, datafeedId uint64) *Dat
return c
}
// Country sets the optional parameter "country": The country for which
// to get the datafeed status. If this parameter is provided then
// language must also be provided. Note that this parameter is required
// for feeds targeting multiple countries and languages, since a feed
// may have a different status for each target.
func (c *DatafeedstatusesGetCall) Country(country string) *DatafeedstatusesGetCall {
c.urlParams_.Set("country", country)
return c
}
// Language sets the optional parameter "language": The language for
// which to get the datafeed status. If this parameter is provided then
// country must also be provided. Note that this parameter is required
// for feeds targeting multiple countries and languages, since a feed
// may have a different status for each target.
func (c *DatafeedstatusesGetCall) Language(language string) *DatafeedstatusesGetCall {
c.urlParams_.Set("language", language)
return c
}
// Fields allows partial responses to be retrieved. See
// https://developers.google.com/gdata/docs/2.0/basics#PartialResponse
// for more information.
@ -10560,12 +10788,22 @@ func (c *DatafeedstatusesGetCall) Do(opts ...googleapi.CallOption) (*DatafeedSta
// "datafeedId"
// ],
// "parameters": {
// "country": {
// "description": "The country for which to get the datafeed status. If this parameter is provided then language must also be provided. Note that this parameter is required for feeds targeting multiple countries and languages, since a feed may have a different status for each target.",
// "location": "query",
// "type": "string"
// },
// "datafeedId": {
// "format": "uint64",
// "location": "path",
// "required": true,
// "type": "string"
// },
// "language": {
// "description": "The language for which to get the datafeed status. If this parameter is provided then country must also be provided. Note that this parameter is required for feeds targeting multiple countries and languages, since a feed may have a different status for each target.",
// "location": "query",
// "type": "string"
// },
// "merchantId": {
// "format": "uint64",
// "location": "path",

65
vendor/google.golang.org/api/content/v2sandbox/content-api.json generated vendored
View file

@ -1,12 +1,12 @@
{
"kind": "discovery#restDescription",
"etag": "\"YWOzh2SDasdU84ArJnpYek-OMdg/w6LYVfU7tamoBXESYq-QJFacBzs\"",
"etag": "\"YWOzh2SDasdU84ArJnpYek-OMdg/QmLvLWNsI9BfMK5wWeN2hMPf260\"",
"discoveryVersion": "v1",
"id": "content:v2sandbox",
"name": "content",
"canonicalName": "Shopping Content",
"version": "v2sandbox",
"revision": "20170912",
"revision": "20170928",
"title": "Content API for Shopping",
"description": "Manages product items, inventory, and Merchant Center accounts for Google Shopping.",
"ownerDomain": "google.com",
@ -332,6 +332,10 @@
"$ref": "OrderCancellation"
}
},
"channelType": {
"type": "string",
"description": "The channel type of the order: \"purchaseOnGoogle\" or \"googleExpress\"."
},
"id": {
"type": "string",
"description": "The id of the line item."
@ -551,7 +555,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier for the shipping. Optional."
"description": "The carrier for the shipping. Optional. See shipments[].carrier for a list of acceptable values."
},
"maxDaysInTransit": {
"type": "integer",
@ -612,7 +616,7 @@
},
"type": {
"type": "string",
"description": "The type of instrument (VISA, Mastercard, etc)."
"description": "The type of instrument.\n\nAcceptable values are: \n- \"AMEX\" \n- \"DISCOVER\" \n- \"JCB\" \n- \"MASTERCARD\" \n- \"UNIONPAY\" \n- \"VISA\" \n- \"\""
}
}
},
@ -740,7 +744,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment."
"description": "The carrier handling the shipment.\n\nAcceptable values are: \n- \"gsx\" \n- \"ups\" \n- \"united parcel service\" \n- \"usps\" \n- \"united states postal service\" \n- \"fedex\" \n- \"dhl\" \n- \"ecourier\" \n- \"cxt\" \n- \"google\" \n- \"on trac\" \n- \"ontrac\" \n- \"on-trac\" \n- \"on_trac\" \n- \"delvic\" \n- \"dynamex\" \n- \"lasership\" \n- \"smartpost\" \n- \"fedex smartpost\" \n- \"mpx\" \n- \"uds\" \n- \"united delivery service\""
},
"creationDate": {
"type": "string",
@ -1087,7 +1091,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The carrier handling the shipment. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"lineItems": {
"type": "array",
@ -1098,7 +1102,37 @@
},
"shipmentId": {
"type": "string",
"description": "The ID of the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The ID of the shipment."
},
"shipmentInfos": {
"type": "array",
"description": "Shipment information. This field is repeated because a single line item can be shipped in several packages (and have several tracking IDs).",
"items": {
"$ref": "OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo"
}
},
"trackingId": {
"type": "string",
"description": "Deprecated. Please use shipmentInfo instead. The tracking id for the shipment."
}
}
},
"OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo": {
"id": "OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo",
"type": "object",
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"shipmentId": {
"type": "string",
"description": "The ID of the shipment.",
"annotations": {
"required": [
"content.orders.shiplineitems"
]
}
},
"trackingId": {
"type": "string",
@ -1112,7 +1146,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment. Not updated if missing."
"description": "The carrier handling the shipment. Not updated if missing. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"shipmentId": {
"type": "string",
@ -1310,7 +1344,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The carrier handling the shipment. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"lineItems": {
"type": "array",
@ -1325,11 +1359,18 @@
},
"shipmentId": {
"type": "string",
"description": "The ID of the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The ID of the shipment."
},
"shipmentInfos": {
"type": "array",
"description": "Shipment information. This field is repeated because a single line item can be shipped in several packages (and have several tracking IDs).",
"items": {
"$ref": "OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo"
}
},
"trackingId": {
"type": "string",
"description": "The tracking id for the shipment."
"description": "Deprecated. Please use shipmentInfo instead. The tracking id for the shipment."
}
}
},
@ -1383,7 +1424,7 @@
"properties": {
"carrier": {
"type": "string",
"description": "The carrier handling the shipment. Not updated if missing."
"description": "The carrier handling the shipment. Not updated if missing. See shipments[].carrier in the Orders resource representation for a list of acceptable values."
},
"operationId": {
"type": "string",

111
vendor/google.golang.org/api/content/v2sandbox/content-gen.go generated vendored
View file

@ -413,6 +413,10 @@ type OrderLineItem struct {
// Cancellations: Cancellations of the line item.
Cancellations []*OrderCancellation `json:"cancellations,omitempty"`
// ChannelType: The channel type of the order: "purchaseOnGoogle" or
// "googleExpress".
ChannelType string `json:"channelType,omitempty"`
// Id: The id of the line item.
Id string `json:"id,omitempty"`
@ -649,7 +653,8 @@ func (s *OrderLineItemShippingDetails) MarshalJSON() ([]byte, error) {
}
type OrderLineItemShippingDetailsMethod struct {
// Carrier: The carrier for the shipping. Optional.
// Carrier: The carrier for the shipping. Optional. See
// shipments[].carrier for a list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// MaxDaysInTransit: Maximum transit time.
@ -701,7 +706,16 @@ type OrderPaymentMethod struct {
// PhoneNumber: The billing phone number.
PhoneNumber string `json:"phoneNumber,omitempty"`
// Type: The type of instrument (VISA, Mastercard, etc).
// Type: The type of instrument.
//
// Acceptable values are:
// - "AMEX"
// - "DISCOVER"
// - "JCB"
// - "MASTERCARD"
// - "UNIONPAY"
// - "VISA"
// - ""
Type string `json:"type,omitempty"`
// ForceSendFields is a list of field names (e.g. "BillingAddress") to
@ -907,6 +921,30 @@ func (s *OrderReturn) MarshalJSON() ([]byte, error) {
type OrderShipment struct {
// Carrier: The carrier handling the shipment.
//
// Acceptable values are:
// - "gsx"
// - "ups"
// - "united parcel service"
// - "usps"
// - "united states postal service"
// - "fedex"
// - "dhl"
// - "ecourier"
// - "cxt"
// - "google"
// - "on trac"
// - "ontrac"
// - "on-trac"
// - "on_trac"
// - "delvic"
// - "dynamex"
// - "lasership"
// - "smartpost"
// - "fedex smartpost"
// - "mpx"
// - "uds"
// - "united delivery service"
Carrier string `json:"carrier,omitempty"`
// CreationDate: Date on which the shipment has been created, in ISO
@ -1530,16 +1568,25 @@ func (s *OrdersCustomBatchRequestEntryReturnLineItem) MarshalJSON() ([]byte, err
}
type OrdersCustomBatchRequestEntryShipLineItems struct {
// Carrier: The carrier handling the shipment.
// Carrier: Deprecated. Please use shipmentInfo instead. The carrier
// handling the shipment. See shipments[].carrier in the Orders
// resource representation for a list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// LineItems: Line items to ship.
LineItems []*OrderShipmentLineItemShipment `json:"lineItems,omitempty"`
// ShipmentId: The ID of the shipment.
// ShipmentId: Deprecated. Please use shipmentInfo instead. The ID of
// the shipment.
ShipmentId string `json:"shipmentId,omitempty"`
// TrackingId: The tracking id for the shipment.
// ShipmentInfos: Shipment information. This field is repeated because a
// single line item can be shipped in several packages (and have several
// tracking IDs).
ShipmentInfos []*OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo `json:"shipmentInfos,omitempty"`
// TrackingId: Deprecated. Please use shipmentInfo instead. The tracking
// id for the shipment.
TrackingId string `json:"trackingId,omitempty"`
// ForceSendFields is a list of field names (e.g. "Carrier") to
@ -1565,8 +1612,45 @@ func (s *OrdersCustomBatchRequestEntryShipLineItems) MarshalJSON() ([]byte, erro
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
type OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo struct {
// Carrier: The carrier handling the shipment. See shipments[].carrier
// in the Orders resource representation for a list of acceptable
// values.
Carrier string `json:"carrier,omitempty"`
// ShipmentId: The ID of the shipment.
ShipmentId string `json:"shipmentId,omitempty"`
// TrackingId: The tracking id for the shipment.
TrackingId string `json:"trackingId,omitempty"`
// ForceSendFields is a list of field names (e.g. "Carrier") to
// unconditionally include in API requests. By default, fields with
// empty values are omitted from API requests. However, any non-pointer,
// non-interface field appearing in ForceSendFields will be sent to the
// server regardless of whether the field is empty or not. This may be
// used to include empty fields in Patch requests.
ForceSendFields []string `json:"-"`
// NullFields is a list of field names (e.g. "Carrier") to include in
// API requests with the JSON null value. By default, fields with empty
// values are omitted from API requests. However, any field with an
// empty value appearing in NullFields will be sent to the server as
// null. It is an error if a field in this list has a non-empty value.
// This may be used to include null fields in Patch requests.
NullFields []string `json:"-"`
}
func (s *OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo) MarshalJSON() ([]byte, error) {
type noMethod OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
raw := noMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
type OrdersCustomBatchRequestEntryUpdateShipment struct {
// Carrier: The carrier handling the shipment. Not updated if missing.
// See shipments[].carrier in the Orders resource representation for a
// list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// ShipmentId: The ID of the shipment.
@ -1937,7 +2021,9 @@ func (s *OrdersReturnLineItemResponse) MarshalJSON() ([]byte, error) {
}
type OrdersShipLineItemsRequest struct {
// Carrier: The carrier handling the shipment.
// Carrier: Deprecated. Please use shipmentInfo instead. The carrier
// handling the shipment. See shipments[].carrier in the Orders
// resource representation for a list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// LineItems: Line items to ship.
@ -1947,10 +2033,17 @@ type OrdersShipLineItemsRequest struct {
// for a given order.
OperationId string `json:"operationId,omitempty"`
// ShipmentId: The ID of the shipment.
// ShipmentId: Deprecated. Please use shipmentInfo instead. The ID of
// the shipment.
ShipmentId string `json:"shipmentId,omitempty"`
// TrackingId: The tracking id for the shipment.
// ShipmentInfos: Shipment information. This field is repeated because a
// single line item can be shipped in several packages (and have several
// tracking IDs).
ShipmentInfos []*OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo `json:"shipmentInfos,omitempty"`
// TrackingId: Deprecated. Please use shipmentInfo instead. The tracking
// id for the shipment.
TrackingId string `json:"trackingId,omitempty"`
// ForceSendFields is a list of field names (e.g. "Carrier") to
@ -2083,6 +2176,8 @@ func (s *OrdersUpdateMerchantOrderIdResponse) MarshalJSON() ([]byte, error) {
type OrdersUpdateShipmentRequest struct {
// Carrier: The carrier handling the shipment. Not updated if missing.
// See shipments[].carrier in the Orders resource representation for a
// list of acceptable values.
Carrier string `json:"carrier,omitempty"`
// OperationId: The ID of the operation. Unique across all operations