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

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