From a8c01377bce777bf1940850e390e587c290e98e0 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 28 Sep 2018 12:40:17 -0700 Subject: Updating server dependancies. (#9498) --- vendor/gopkg.in/olivere/elastic.v5/.travis.yml | 9 ++--- vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS | 8 +++++ vendor/gopkg.in/olivere/elastic.v5/client.go | 2 +- vendor/gopkg.in/olivere/elastic.v5/run-es.sh | 2 +- vendor/gopkg.in/olivere/elastic.v5/search.go | 8 +++++ vendor/gopkg.in/olivere/elastic.v5/search_aggs.go | 42 ++++++++++++++++++++++ .../search_aggs_bucket_date_histogram.go | 11 ++++++ .../gopkg.in/olivere/elastic.v5/search_shards.go | 2 +- 8 files changed, 77 insertions(+), 7 deletions(-) (limited to 'vendor/gopkg.in') diff --git a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml index 24e24ecc8..59ac0527d 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml +++ b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml @@ -2,10 +2,11 @@ sudo: required language: go go: - "1.10.x" -- "1.11rc1" +- "1.11.x" #- tip env: - GO111MODULE=on +- GO111MODULE=off matrix: allow_failures: - go: tip @@ -15,11 +16,11 @@ before_install: # Install netcat - if [[ "$TRAVIS_OS_NAME" == "linux" && ! $(which nc) ]] ; then sudo apt-get install -y netcat ; fi - sudo sysctl -w vm.max_map_count=262144 -- docker run --rm --privileged=true -p 9200:9200 -p 9300:9300 -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:5.6.10 elasticsearch -Expack.security.enabled=false -Escript.inline=true -Escript.stored=true -Escript.file=true -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_ >& /dev/null & +- docker run --rm --privileged=true -p 9200:9200 -p 9300:9300 -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:5.6.12 elasticsearch -Expack.security.enabled=false -Escript.inline=true -Escript.stored=true -Escript.file=true -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_ >& /dev/null & - go get -u github.com/fortytw2/leaktest -- go get . ./config/... ./aws/... +- go get . ./aws/... ./config/... ./uritemplates/... # Wait for Elasticsearch - while ! nc -z localhost 9200; do sleep 1; done install: true script: -- go test -race -v . ./aws/... ./config/... +- go test -race -v . ./aws/... ./config/... ./uritemplates/... diff --git a/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS b/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS index 1beea081f..db6c1e443 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS +++ b/vendor/gopkg.in/olivere/elastic.v5/CONTRIBUTORS @@ -29,6 +29,7 @@ Braden Bassingthwaite [@bbassingthwaite-va](https://github.com/bbassingthwaite-v Brady Love [@bradylove](https://github.com/bradylove) Bryan Conklin [@bmconklin](https://github.com/bmconklin) Bruce Zhou [@brucez-isell](https://github.com/brucez-isell) +Carl Dunham [@carldunham](https://github.com/carldunham) César Jiménez [@cesarjimenez](https://github.com/cesarjimenez) cforbes [@cforbes](https://github.com/cforbes) Chris M [@tebriel](https://github.com/tebriel) @@ -36,6 +37,7 @@ Chris Rice [@donutmonger](https://github.com/donutmonger) Claudiu Olteanu [@claudiuolteanu](https://github.com/claudiuolteanu) Chris Duncan [@veqryn](https://github.com/veqryn) Christophe Courtaut [@kri5](https://github.com/kri5) +cmitchell [@cmitchell](https://github.com/cmitchell) Connor Peet [@connor4312](https://github.com/connor4312) Conrad Pankoff [@deoxxa](https://github.com/deoxxa) Corey Scott [@corsc](https://github.com/corsc) @@ -51,6 +53,7 @@ Evan Shaw [@edsrzf](https://github.com/edsrzf) Fanfan [@wenpos](https://github.com/wenpos) Faolan C-P [@fcheslack](https://github.com/fcheslack) Filip Tepper [@filiptepper](https://github.com/filiptepper) +Garrett Kelley [@GarrettKelley](https://github.com/GarrettKelley) Gaspard Douady [@plopik](https://github.com/plopik) Gaylord Aulke [@blafasel42](https://github.com/blafasel42) Gerhard Häring [@ghaering](https://github.com/ghaering) @@ -78,6 +81,7 @@ John Goodall [@jgoodall](https://github.com/jgoodall) John Stanford [@jxstanford](https://github.com/jxstanford) Jonas Groenaas Drange [@semafor](https://github.com/semafor) Josef Fröhle [@Dexus](https://github.com/Dexus) +José Martínez [@xose](https://github.com/xose) Josh Chorlton [@jchorl](https://github.com/jchorl) jun [@coseyo](https://github.com/coseyo) Junpei Tsuji [@jun06t](https://github.com/jun06t) @@ -100,6 +104,7 @@ Mike Beshai [@mbesh](https://github.com/mbesh) mmfrb [@mmfrb](https://github.com/mmfrb) mnpritula [@mnpritula](https://github.com/mnpritula) mosa [@mosasiru](https://github.com/mosasiru) +Muhammet Çakır [@cakirmuha](https://github.com/cakirmuha) naimulhaider [@naimulhaider](https://github.com/naimulhaider) Naoya Yoshizawa [@azihsoyn](https://github.com/azihsoyn) navins [@ishare](https://github.com/ishare) @@ -111,6 +116,7 @@ Nick Whyte [@nickw444](https://github.com/nickw444) Nicolae Vartolomei [@nvartolomei](https://github.com/nvartolomei) Orne Brocaar [@brocaar](https://github.com/brocaar) Paul [@eyeamera](https://github.com/eyeamera) +Paul Oldenburg [@lr-paul](https://github.com/lr-paul) Pete C [@peteclark-ft](https://github.com/peteclark-ft) Paolo [@ppiccolo](https://github.com/ppiccolo) Radoslaw Wesolowski [r--w](https://github.com/r--w) @@ -120,9 +126,11 @@ Ryan Schmukler [@rschmukler](https://github.com/rschmukler) Ryan Wynn [@rwynn](https://github.com/rwynn) Sacheendra talluri [@sacheendra](https://github.com/sacheendra) Sean DuBois [@Sean-Der](https://github.com/Sean-Der) +Sagan Yaroslav [@sgnrslv](https://github.com/sgnrslv) Shalin LK [@shalinlk](https://github.com/shalinlk) singham [@zhaochenxiao90](https://github.com/zhaochenxiao90) Slawomir CALUCH [@slawo](https://github.com/slawo) +Stephan Krynauw [@skrynauw](https://github.com/skrynauw) Stephen Kubovic [@stephenkubovic](https://github.com/stephenkubovic) Stuart Warren [@Woz](https://github.com/stuart-warren) Sulaiman [@salajlan](https://github.com/salajlan) diff --git a/vendor/gopkg.in/olivere/elastic.v5/client.go b/vendor/gopkg.in/olivere/elastic.v5/client.go index b5f5c75ad..7617e1443 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/client.go +++ b/vendor/gopkg.in/olivere/elastic.v5/client.go @@ -26,7 +26,7 @@ import ( const ( // Version is the current version of Elastic. - Version = "5.0.74" + Version = "5.0.76" // DefaultURL is the default endpoint of Elasticsearch on the local machine. // It is used e.g. when initializing a new Client without a specific URL. diff --git a/vendor/gopkg.in/olivere/elastic.v5/run-es.sh b/vendor/gopkg.in/olivere/elastic.v5/run-es.sh index 68967a5c3..f8f3d8daf 100755 --- a/vendor/gopkg.in/olivere/elastic.v5/run-es.sh +++ b/vendor/gopkg.in/olivere/elastic.v5/run-es.sh @@ -1,3 +1,3 @@ #!/bin/sh -VERSION=${VERSION:=5.6.10} +VERSION=${VERSION:=5.6.12} docker run --rm --privileged=true -p 9200:9200 -p 9300:9300 -v "$PWD/etc:/usr/share/elasticsearch/config" -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:$VERSION elasticsearch -Expack.security.enabled=false -Expack.ml.enabled=false -Escript.inline=true -Escript.stored=true -Escript.file=true diff --git a/vendor/gopkg.in/olivere/elastic.v5/search.go b/vendor/gopkg.in/olivere/elastic.v5/search.go index a9eb212f4..80beafdf3 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/search.go +++ b/vendor/gopkg.in/olivere/elastic.v5/search.go @@ -461,6 +461,13 @@ type SearchHits struct { Hits []*SearchHit `json:"hits"` // the actual hits returned } +// NestedHit is a nested innerhit +type NestedHit struct { + Field string `json:"field"` + Offset int `json:"offset,omitempty"` + Child *NestedHit `json:"_nested,omitempty"` +} + // SearchHit is a single hit. type SearchHit struct { Score *float64 `json:"_score"` // computed score @@ -478,6 +485,7 @@ type SearchHit struct { Explanation *SearchExplanation `json:"_explanation"` // explains how the score was computed MatchedQueries []string `json:"matched_queries"` // matched queries InnerHits map[string]*SearchHitInnerHits `json:"inner_hits"` // inner hits with ES >= 1.5.0 + Nested *NestedHit `json:"_nested"` // for nested inner hits // Shard // HighlightFields diff --git a/vendor/gopkg.in/olivere/elastic.v5/search_aggs.go b/vendor/gopkg.in/olivere/elastic.v5/search_aggs.go index 999a57d60..cc4921aeb 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/search_aggs.go +++ b/vendor/gopkg.in/olivere/elastic.v5/search_aggs.go @@ -459,6 +459,7 @@ func (a Aggregations) Histogram(name string) (*AggregationBucketHistogramItems, } // DateHistogram returns date histogram aggregation results. +// // See: https://www.elastic.co/guide/en/elasticsearch/reference/5.2/search-aggregations-bucket-datehistogram-aggregation.html func (a Aggregations) DateHistogram(name string) (*AggregationBucketHistogramItems, bool) { if raw, found := a[name]; found { @@ -473,6 +474,22 @@ func (a Aggregations) DateHistogram(name string) (*AggregationBucketHistogramIte return nil, false } +// KeyedDateHistogram returns date histogram aggregation results for keyed responses. +// +// See: https://www.elastic.co/guide/en/elasticsearch/reference/5.6/search-aggregations-bucket-datehistogram-aggregation.html#_keyed_response_3 +func (a Aggregations) KeyedDateHistogram(name string) (*AggregationBucketKeyedHistogramItems, bool) { + if raw, found := a[name]; found { + agg := new(AggregationBucketKeyedHistogramItems) + if raw == nil { + return agg, true + } + if err := json.Unmarshal(*raw, agg); err == nil { + return agg, true + } + } + return nil, false +} + // GeoBounds returns geo-bounds aggregation results. // See: https://www.elastic.co/guide/en/elasticsearch/reference/5.2/search-aggregations-metrics-geobounds-aggregation.html func (a Aggregations) GeoBounds(name string) (*AggregationGeoBoundsMetric, bool) { @@ -1332,6 +1349,31 @@ func (a *AggregationBucketHistogramItems) UnmarshalJSON(data []byte) error { return nil } +// AggregationBucketKeyedHistogramItems is a bucket aggregation that is returned +// with a (keyed) date histogram aggregation. +type AggregationBucketKeyedHistogramItems struct { + Aggregations + + Buckets map[string]*AggregationBucketHistogramItem //`json:"buckets"` + Meta map[string]interface{} // `json:"meta,omitempty"` +} + +// UnmarshalJSON decodes JSON data and initializes an AggregationBucketKeyedHistogramItems structure. +func (a *AggregationBucketKeyedHistogramItems) UnmarshalJSON(data []byte) error { + var aggs map[string]*json.RawMessage + if err := json.Unmarshal(data, &aggs); err != nil { + return err + } + if v, ok := aggs["buckets"]; ok && v != nil { + json.Unmarshal(*v, &a.Buckets) + } + if v, ok := aggs["meta"]; ok && v != nil { + json.Unmarshal(*v, &a.Meta) + } + a.Aggregations = aggs + return nil +} + // AggregationBucketHistogramItem is a single bucket of an AggregationBucketHistogramItems structure. type AggregationBucketHistogramItem struct { Aggregations diff --git a/vendor/gopkg.in/olivere/elastic.v5/search_aggs_bucket_date_histogram.go b/vendor/gopkg.in/olivere/elastic.v5/search_aggs_bucket_date_histogram.go index 17916b490..aaebe0a92 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/search_aggs_bucket_date_histogram.go +++ b/vendor/gopkg.in/olivere/elastic.v5/search_aggs_bucket_date_histogram.go @@ -23,6 +23,7 @@ type DateHistogramAggregation struct { timeZone string format string offset string + keyed *bool } // NewDateHistogramAggregation creates a new DateHistogramAggregation. @@ -196,6 +197,13 @@ func (a *DateHistogramAggregation) ExtendedBoundsMax(max interface{}) *DateHisto return a } +// Keyed specifies whether to return the results with a keyed response (or not). +// See https://www.elastic.co/guide/en/elasticsearch/reference/5.6/search-aggregations-bucket-datehistogram-aggregation.html#_keyed_response_3. +func (a *DateHistogramAggregation) Keyed(keyed bool) *DateHistogramAggregation { + a.keyed = &keyed + return a +} + func (a *DateHistogramAggregation) Source() (interface{}, error) { // Example: // { @@ -262,6 +270,9 @@ func (a *DateHistogramAggregation) Source() (interface{}, error) { } opts["extended_bounds"] = bounds } + if a.keyed != nil { + opts["keyed"] = *a.keyed + } // AggregationBuilder (SubAggregations) if len(a.subAggregations) > 0 { diff --git a/vendor/gopkg.in/olivere/elastic.v5/search_shards.go b/vendor/gopkg.in/olivere/elastic.v5/search_shards.go index edd9b0547..ad7fa17d5 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/search_shards.go +++ b/vendor/gopkg.in/olivere/elastic.v5/search_shards.go @@ -176,5 +176,5 @@ type ShardsInfo struct { Shard uint `json:"shard"` State string `json:"state"` AllocationId interface{} `json:"allocation_id"` - RelocatingNode bool `json:"relocating_node"` + RelocatingNode string `json:"relocating_node"` } -- cgit v1.2.3-1-g7c22