diff --git a/.ci/run-elasticsearch.sh b/.ci/run-elasticsearch.sh index ff7cb14fe0..792254a597 100755 --- a/.ci/run-elasticsearch.sh +++ b/.ci/run-elasticsearch.sh @@ -7,7 +7,7 @@ # Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'. # Export the NUMBER_OF_NODES variable to start more than 1 node -# Version 1.2.0 +# Version 1.3.0 # - Initial version of the run-elasticsearch.sh script # - Deleting the volume should not dependent on the container still running # - Fixed `ES_JAVA_OPTS` config @@ -15,6 +15,8 @@ # - Refactored into functions and imports # - Support NUMBER_OF_NODES # - Added 5 retries on docker pull for fixing transient network errors +# - Added flags to make local CCR configurations work +# - Added action.destructive_requires_name=false as the default will be true in v8 script_path=$(dirname $(realpath -s $0)) source $script_path/functions/imports.sh @@ -37,6 +39,7 @@ environment=($(cat <<-END --env node.attr.testattr=test --env path.repo=/tmp --env repositories.url.allowed_urls=http://snapshot.test* + --env action.destructive_requires_name=false END )) if [[ "$TEST_SUITE" == "platinum" ]]; then @@ -45,11 +48,11 @@ if [[ "$TEST_SUITE" == "platinum" ]]; then --env xpack.license.self_generated.type=trial --env xpack.security.enabled=true --env xpack.security.http.ssl.enabled=true - --env xpack.security.http.ssl.verification_mode=certificate --env xpack.security.http.ssl.key=certs/testnode.key --env xpack.security.http.ssl.certificate=certs/testnode.crt --env xpack.security.http.ssl.certificate_authorities=certs/ca.crt --env xpack.security.transport.ssl.enabled=true + --env xpack.security.transport.ssl.verification_mode=certificate --env xpack.security.transport.ssl.key=certs/testnode.key --env xpack.security.transport.ssl.certificate=certs/testnode.crt --env xpack.security.transport.ssl.certificate_authorities=certs/ca.crt @@ -104,7 +107,7 @@ END docker run \ --name "$node_name" \ --network "$network_name" \ - --env "ES_JAVA_OPTS=-Xms1g -Xmx1g" \ + --env "ES_JAVA_OPTS=-Xms1g -Xmx1g -da:org.elasticsearch.xpack.ccr.index.engine.FollowingEngineAssertions" \ "${environment[@]}" \ "${volumes[@]}" \ --publish "$http_port":9200 \ @@ -124,4 +127,3 @@ END fi done - diff --git a/.ci/run-repository.sh b/.ci/run-repository.sh index 983c55de7d..fa1b716111 100644 --- a/.ci/run-repository.sh +++ b/.ci/run-repository.sh @@ -40,16 +40,10 @@ echo -e "\033[34;1mINFO:\033[0m Retrieving Elasticsearch Version & Hash from con ELASTICSEARCH_BUILD_VERSION=$(curl -sSk $external_elasticsearch_url | jq -r '.version.number') ELASTICSEARCH_BUILD_HASH=$(curl -sSk $external_elasticsearch_url | jq -r '.version.build_hash') -echo -e "\033[34;1mINFO:\033[0m Downloading Elasticsearch repository @ $ELASTICSEARCH_BUILD_HASH... \033[0m" -mkdir -p $WORKSPACE/tmp -curl --retry 10 -sSL "https://github.com/elastic/elasticsearch/archive/$ELASTICSEARCH_BUILD_HASH.zip" > "$WORKSPACE/tmp/elasticsearch-$ELASTICSEARCH_BUILD_HASH.zip" - -echo -e "\033[34;1mINFO:\033[0m Extracting the Elasticsearch source... \033[0m" -docker run --volume=$WORKSPACE/tmp:/tmp --workdir=/tmp --rm elastic/go-elasticsearch unzip -q -o "elasticsearch-$ELASTICSEARCH_BUILD_HASH.zip" '*.properties' '*.json' '*.y*ml' -docker run --volume=$WORKSPACE/tmp:/tmp --workdir=/tmp --rm elastic/go-elasticsearch /bin/sh -c " - rm -rf /tmp/elasticsearch-$ELASTICSEARCH_BUILD_HASH.zip - rm -rf /tmp/elasticsearch/ - mv /tmp/elasticsearch-$ELASTICSEARCH_BUILD_HASH* /tmp/elasticsearch/ +echo -e "\033[34;1mINFO:\033[0m Download Elasticsearch specs... \033[0m" +docker run --volume=$WORKSPACE/tmp:/tmp --workdir=/go-elasticsearch/internal/build --rm elastic/go-elasticsearch /bin/sh -c " + go mod download + go run main.go download-spec -o /tmp -d " echo -e "\033[34;1mINFO:\033[0m Execute [$TEST_SUITE] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m" diff --git a/.ci/scripts/tests-free.sh b/.ci/scripts/tests-free.sh index cd100431b6..381bd4e19e 100755 --- a/.ci/scripts/tests-free.sh +++ b/.ci/scripts/tests-free.sh @@ -11,13 +11,13 @@ rm -rf esapi/test/xpack echo -e "\033[34;1mINFO:\033[0m Generating the API registry\033[0m" -cd /go-elasticsearch/internal/cmd/generate || exit +cd /go-elasticsearch/internal/build || exit go get -u golang.org/x/tools/cmd/goimports PACKAGE_PATH=/go-elasticsearch/esapi go generate ./... echo -e "\033[34;1mINFO:\033[0m Generating the test files\033[0m" -go run main.go apitests --output '/go-elasticsearch/esapi/test' --input '/tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/test/**/*.y*ml' +go run main.go apitests --output '/go-elasticsearch/esapi/test' --input "/tmp/rest-api-spec/test/free/**/*.y*ml" echo -e "\033[34;1mINFO:\033[0m Download tests deps >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m" diff --git a/.ci/scripts/tests-platinum.sh b/.ci/scripts/tests-platinum.sh index 57e0e04645..e2b26e349b 100755 --- a/.ci/scripts/tests-platinum.sh +++ b/.ci/scripts/tests-platinum.sh @@ -11,14 +11,13 @@ rm -rf rm -rf esapi/test/ml* echo -e "\033[34;1mINFO:\033[0m Generating the API registry\033[0m" -cd /go-elasticsearch/internal/cmd/generate || exit +cd /go-elasticsearch/internal/build || exit go get -u golang.org/x/tools/cmd/goimports PACKAGE_PATH=/go-elasticsearch/esapi go generate ./... echo -e "\033[34;1mINFO:\033[0m Generating the test files\033[0m" -go run main.go apitests --output '/go-elasticsearch/esapi/test/xpack' --input '/tmp/elasticsearch/x-pack/plugin/src/test/resources/rest-api-spec/test/**/*.yml' -go run main.go apitests --output '/go-elasticsearch/esapi/test/xpack' --input '/tmp/elasticsearch/x-pack/plugin/src/test/resources/rest-api-spec/test/**/**/*.yml' +go run main.go apitests --output '/go-elasticsearch/esapi/test/xpack' --input '/tmp/rest-api-spec/test/platinum/**/*.yml' cd /go-elasticsearch || exit diff --git a/Makefile b/Makefile index dcf6a5b694..80ed65d225 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ SHELL := /bin/bash +ELASTICSEARCH_DEFAULT_BUILD_VERSION = "8.0.0-SNAPSHOT" + ##@ Test test-unit: ## Run unit tests @printf "\033[2m→ Running unit tests...\033[0m\n" @@ -149,8 +151,8 @@ lint: ## Run lint on the package @{ \ set -e ; \ trap "test -d ../../../.git && git checkout --quiet go.mod" INT TERM EXIT; \ - echo "cd internal/cmd/generate/ && go vet ./..."; \ - cd "internal/cmd/generate/" && go mod download && go vet ./...; \ + echo "cd internal/build/ && go vet ./..."; \ + cd "internal/build/" && go mod download && go vet ./...; \ } @@ -266,9 +268,14 @@ godoc: ## Display documentation for the package cluster: ## Launch an Elasticsearch cluster with Docker $(eval flavor ?= "core") - $(eval version ?= "elasticsearch:8.0.0-SNAPSHOT") $(eval elasticsearch_url = "http://es1:9200") +ifdef ELASTICSEARCH_BUILD_VERSION + $(eval version ?= "elasticsearch:"${ELASTICSEARCH_BUILD_VERSION}) +else + $(eval version ?= "elasticsearch:"${ELASTICSEARCH_DEFAULT_BUILD_VERSION}) +endif + ifeq ($(origin nodes), undefined) $(eval nodes = 1) endif @@ -285,16 +292,14 @@ ifeq ($(flavor), platinum) $(eval xpack_env += --env "xpack.license.self_generated.type=trial") $(eval xpack_env += --env "xpack.security.enabled=true") $(eval xpack_env += --env "xpack.security.http.ssl.enabled=true") - $(eval xpack_env += --env "xpack.security.http.ssl.verification_mode=certificate") $(eval xpack_env += --env "xpack.security.http.ssl.key=certs/testnode.key") $(eval xpack_env += --env "xpack.security.http.ssl.certificate=certs/testnode.crt") $(eval xpack_env += --env "xpack.security.http.ssl.certificate_authorities=certs/ca.crt") - $(eval xpack_env += --env "xpack.security.http.ssl.verification_mode=none") $(eval xpack_env += --env "xpack.security.transport.ssl.enabled=true") + $(eval xpack_env += --env "xpack.security.transport.ssl.verification_mode=certificate") $(eval xpack_env += --env "xpack.security.transport.ssl.key=certs/testnode.key") $(eval xpack_env += --env "xpack.security.transport.ssl.certificate=certs/testnode.crt") $(eval xpack_env += --env "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt") - $(eval xpack_env += --env "xpack.security.transport.ssl.verification_mode=none") $(eval xpack_volumes += --volume "$(PWD)/.ci/certs/testnode.crt:/usr/share/elasticsearch/config/certs/testnode.crt") $(eval xpack_volumes += --volume "$(PWD)/.ci/certs/testnode.key:/usr/share/elasticsearch/config/certs/testnode.key") $(eval xpack_volumes += --volume "$(PWD)/.ci/certs/ca.crt:/usr/share/elasticsearch/config/certs/ca.crt") @@ -345,7 +350,11 @@ ifdef detach endif cluster-update: ## Update the Docker image - $(eval version ?= "elasticsearch:8.0.0-SNAPSHOT") +ifdef ELASTICSEARCH_BUILD_VERSION + $(eval version ?= "elasticsearch:"${ELASTICSEARCH_BUILD_VERSION}) +else + $(eval version ?= "elasticsearch:"${ELASTICSEARCH_DEFAULT_BUILD_VERSION}) +endif @printf "\033[2m→ Updating the Docker image...\033[0m\n" @docker pull docker.elastic.co/elasticsearch/$(version); @@ -360,7 +369,7 @@ docker: ## Build the Docker image and run it ##@ Generator gen-api: ## Generate the API package from the JSON specification - $(eval input ?= tmp/elasticsearch) + $(eval input ?= tmp/rest-api-spec) $(eval output ?= esapi) ifdef debug $(eval args += --debug) @@ -368,27 +377,26 @@ endif ifdef ELASTICSEARCH_BUILD_VERSION $(eval version = $(ELASTICSEARCH_BUILD_VERSION)) else - $(eval version = $(shell cat "$(input)/buildSrc/version.properties" | grep 'elasticsearch' | cut -d '=' -f 2 | tr -d ' ')) + $(eval version = $(ELASTICSEARCH_DEFAULT_BUILD_VERSION)) endif ifdef ELASTICSEARCH_BUILD_HASH $(eval build_hash = $(ELASTICSEARCH_BUILD_HASH)) else - $(eval build_hash = $(shell git --git-dir='$(input)/.git' rev-parse --short HEAD)) + $(eval build_hash = $(shell cat tmp/elasticsearch.json | jq ".projects.elasticsearch.commit_hash")) endif @printf "\033[2m→ Generating API package from specification ($(version):$(build_hash))...\033[0m\n" @{ \ set -e; \ - trap "test -d .git && git checkout --quiet $(PWD)/internal/cmd/generate/go.mod" INT TERM EXIT; \ + trap "test -d .git && git checkout --quiet $(PWD)/internal/build/go.mod" INT TERM EXIT; \ export ELASTICSEARCH_BUILD_VERSION=$(version) && \ export ELASTICSEARCH_BUILD_HASH=$(build_hash) && \ - cd internal/cmd/generate && \ - go run main.go apisource --input '$(PWD)/$(input)/rest-api-spec/src/main/resources/rest-api-spec/api/*.json' --output '$(PWD)/$(output)' $(args) && \ - go run main.go apisource --input '$(PWD)/$(input)/x-pack/plugin/src/test/resources/rest-api-spec/api/*.json' --output '$(PWD)/$(output)' $(args) && \ + cd internal/build && \ + go run main.go apisource --input '$(PWD)/$(input)/api/*.json' --output '$(PWD)/$(output)' $(args) && \ go run main.go apistruct --output '$(PWD)/$(output)'; \ } gen-tests: ## Generate the API tests from the YAML specification - $(eval input ?= tmp/elasticsearch) + $(eval input ?= tmp/rest-api-spec) $(eval output ?= esapi/test) ifdef debug $(eval args += --debug) @@ -396,12 +404,12 @@ endif ifdef ELASTICSEARCH_BUILD_VERSION $(eval version = $(ELASTICSEARCH_BUILD_VERSION)) else - $(eval version = $(shell cat "$(input)/buildSrc/version.properties" | grep 'elasticsearch' | cut -d '=' -f 2 | tr -d ' ')) + $(eval version = $(ELASTICSEARCH_DEFAULT_BUILD_VERSION)) endif ifdef ELASTICSEARCH_BUILD_HASH $(eval build_hash = $(ELASTICSEARCH_BUILD_HASH)) else - $(eval build_hash = $(shell git --git-dir='$(input)/.git' rev-parse --short HEAD)) + $(eval build_hash = $(shell cat tmp/elasticsearch.json | jq ".projects.elasticsearch.commit_hash")) endif @printf "\033[2m→ Generating API tests from specification ($(version):$(build_hash))...\033[0m\n" @{ \ @@ -411,12 +419,11 @@ endif export ELASTICSEARCH_BUILD_HASH=$(build_hash) && \ rm -rf $(output)/*_test.go && \ rm -rf $(output)/xpack && \ - cd internal/cmd/generate && \ + cd internal/build && \ go get golang.org/x/tools/cmd/goimports && \ go generate ./... && \ - go run main.go apitests --input '$(PWD)/$(input)/rest-api-spec/src/main/resources/rest-api-spec/test/**/*.y*ml' --output '$(PWD)/$(output)' $(args) && \ - go run main.go apitests --input '$(PWD)/$(input)/x-pack/plugin/src/test/resources/rest-api-spec/test/**/*.yml' --output '$(PWD)/$(output)/xpack' $(args) && \ - go run main.go apitests --input '$(PWD)/$(input)/x-pack/plugin/src/test/resources/rest-api-spec/test/**/**/*.yml' --output '$(PWD)/$(output)/xpack' $(args) && \ + go run main.go apitests --input '$(PWD)/$(input)/test/free/**/*.y*ml' --output '$(PWD)/$(output)' $(args) && \ + go run main.go apitests --input '$(PWD)/$(input)/test/platinum/**/*.yml' --output '$(PWD)/$(output)/xpack' $(args) && \ mkdir -p '$(PWD)/esapi/test/xpack/ml' && \ mkdir -p '$(PWD)/esapi/test/xpack/ml-crud' && \ mv $(PWD)/esapi/test/xpack/xpack_ml* $(PWD)/esapi/test/xpack/ml/ && \ @@ -445,11 +452,23 @@ gen-docs: ## Generate the skeleton of documentation examples fi; \ ) && \ printf "\n\033[2m→ Generating ASCIIDoc files from Go source\033[0m\n" && \ - ( cd '$(PWD)/internal/cmd/generate' && \ + ( cd '$(PWD)/internal/build' && \ go run main.go examples doc --debug --input='$(PWD)/.doc/examples/src/' --output='$(PWD)/.doc/examples/' \ ) \ } +download-specs: ## Download the latest specs for the specified Elasticsearch version + $(eval output ?= tmp) + @mkdir -p tmp + @{ \ + set -e; \ + printf "\n\033[2m→ Downloading latest Elasticsearch specs for version [$(ELASTICSEARCH_DEFAULT_BUILD_VERSION)]\033[0m\n" && \ + rm -rf $(output)/rest-api-spec && \ + rm -rf $(output)/elasticsearch.json && \ + cd internal/build && \ + go run main.go download-spec --output '$(PWD)/$(output)'; \ + } + ##@ Other #------------------------------------------------------------------------------ help: ## Display help diff --git a/_examples/xkcdsearch/go.sum b/_examples/xkcdsearch/go.sum index a4ba203e12..e64a090a87 100644 --- a/_examples/xkcdsearch/go.sum +++ b/_examples/xkcdsearch/go.sum @@ -1,3 +1,4 @@ +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/rs/zerolog v1.11.0 h1:DRuq/S+4k52uJzBQciUcofXx45GrMC6yrEbb/CoK6+M= github.com/rs/zerolog v1.11.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= diff --git a/go.sum b/go.sum deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/internal/cmd/generate/commands/commands.go b/internal/build/cmd/commands.go similarity index 73% rename from internal/cmd/generate/commands/commands.go rename to internal/build/cmd/commands.go index 49e1b11cb1..f37c802fc6 100644 --- a/internal/cmd/generate/commands/commands.go +++ b/internal/build/cmd/commands.go @@ -2,20 +2,19 @@ // Elasticsearch B.V. licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -package commands +package cmd import ( "os" "github.com/spf13/cobra" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) var rootCmd = &cobra.Command{ - Use: "generate", - Short: "generate Go APIs, tests and examples for documentation", - // Long: "TODO", + Use: "build", + Short: "Build tools for Elasticsearch client, helpers for CI, etc...", } // Execute launches the CLI application. diff --git a/internal/cmd/generate/commands/genexamples/command.go b/internal/build/cmd/generate/commands/genexamples/command.go similarity index 98% rename from internal/cmd/generate/commands/genexamples/command.go rename to internal/build/cmd/generate/commands/genexamples/command.go index 93a3d97f1b..6619ac00c5 100644 --- a/internal/cmd/generate/commands/genexamples/command.go +++ b/internal/build/cmd/generate/commands/genexamples/command.go @@ -9,6 +9,7 @@ import ( "bytes" "encoding/json" "fmt" + "github.com/elastic/go-elasticsearch/v8/internal/build/cmd" "io" "io/ioutil" "os" @@ -20,8 +21,7 @@ import ( "github.com/spf13/cobra" "golang.org/x/tools/imports" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) var ( @@ -58,7 +58,7 @@ func init() { genexamplesCmd.AddCommand(genexamplesSrcCmd) genexamplesCmd.AddCommand(genexamplesDocCmd) - commands.RegisterCmd(genexamplesCmd) + cmd.RegisterCmd(genexamplesCmd) } var genexamplesCmd = &cobra.Command{ diff --git a/internal/cmd/generate/commands/genexamples/generator.go b/internal/build/cmd/generate/commands/genexamples/generator.go similarity index 100% rename from internal/cmd/generate/commands/genexamples/generator.go rename to internal/build/cmd/generate/commands/genexamples/generator.go diff --git a/internal/cmd/generate/commands/genexamples/model.go b/internal/build/cmd/generate/commands/genexamples/model.go similarity index 100% rename from internal/cmd/generate/commands/genexamples/model.go rename to internal/build/cmd/generate/commands/genexamples/model.go diff --git a/internal/cmd/generate/commands/genexamples/skips.go b/internal/build/cmd/generate/commands/genexamples/skips.go similarity index 100% rename from internal/cmd/generate/commands/genexamples/skips.go rename to internal/build/cmd/generate/commands/genexamples/skips.go diff --git a/internal/cmd/generate/commands/genexamples/translator.go b/internal/build/cmd/generate/commands/genexamples/translator.go similarity index 99% rename from internal/cmd/generate/commands/genexamples/translator.go rename to internal/build/cmd/generate/commands/genexamples/translator.go index f121411e78..efab5a3ffe 100644 --- a/internal/cmd/generate/commands/genexamples/translator.go +++ b/internal/build/cmd/generate/commands/genexamples/translator.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) const testCheck = "\t" + `if err != nil { // SKIP diff --git a/internal/cmd/generate/commands/gensource/command.go b/internal/build/cmd/generate/commands/gensource/command.go similarity index 97% rename from internal/cmd/generate/commands/gensource/command.go rename to internal/build/cmd/generate/commands/gensource/command.go index 441c0c19c2..ccc055d6a1 100644 --- a/internal/cmd/generate/commands/gensource/command.go +++ b/internal/build/cmd/generate/commands/gensource/command.go @@ -7,6 +7,7 @@ package gensource import ( "bytes" "fmt" + "github.com/elastic/go-elasticsearch/v8/internal/build/cmd" "io" "os" "path/filepath" @@ -15,8 +16,7 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) var ( @@ -46,7 +46,7 @@ func init() { gensourceCmd.MarkFlagRequired("output") gensourceCmd.Flags().SortFlags = false - commands.RegisterCmd(gensourceCmd) + cmd.RegisterCmd(gensourceCmd) } var gensourceCmd = &cobra.Command{ @@ -142,7 +142,6 @@ func (cmd *Command) Execute() (err error) { if err != nil { return err } - defer f.Close() if err := cmd.processFile(f); err != nil { return fmt.Errorf("Processing file %q: %s", fname, err) @@ -153,6 +152,8 @@ func (cmd *Command) Execute() (err error) { if err != nil { return fmt.Errorf("error creating endpoint for %q: %s", fname, err) } + f.Close() + endpoints = append(endpoints, e) stats.n++ } diff --git a/internal/cmd/generate/commands/gensource/debug.go b/internal/build/cmd/generate/commands/gensource/debug.go similarity index 97% rename from internal/cmd/generate/commands/gensource/debug.go rename to internal/build/cmd/generate/commands/gensource/debug.go index 0c4748a498..ea10060d3e 100644 --- a/internal/cmd/generate/commands/gensource/debug.go +++ b/internal/build/cmd/generate/commands/gensource/debug.go @@ -10,7 +10,7 @@ import ( "strings" "text/tabwriter" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) // DebugInfo returns information about the endpoint as a string. diff --git a/internal/cmd/generate/commands/gensource/descriptions.go b/internal/build/cmd/generate/commands/gensource/descriptions.go similarity index 100% rename from internal/cmd/generate/commands/gensource/descriptions.go rename to internal/build/cmd/generate/commands/gensource/descriptions.go diff --git a/internal/cmd/generate/commands/gensource/generator.go b/internal/build/cmd/generate/commands/gensource/generator.go similarity index 99% rename from internal/cmd/generate/commands/gensource/generator.go rename to internal/build/cmd/generate/commands/gensource/generator.go index 87a3bb8f61..3452bef1bf 100644 --- a/internal/cmd/generate/commands/gensource/generator.go +++ b/internal/build/cmd/generate/commands/gensource/generator.go @@ -13,7 +13,7 @@ import ( "golang.org/x/tools/imports" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) // Generator represents the "gensource" generator. diff --git a/internal/cmd/generate/commands/gensource/generator_test.go b/internal/build/cmd/generate/commands/gensource/generator_test.go similarity index 91% rename from internal/cmd/generate/commands/gensource/generator_test.go rename to internal/build/cmd/generate/commands/gensource/generator_test.go index 886131541c..1436786499 100644 --- a/internal/cmd/generate/commands/gensource/generator_test.go +++ b/internal/build/cmd/generate/commands/gensource/generator_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands/gensource" + "github.com/elastic/go-elasticsearch/v8/internal/build/cmd/generate/commands/gensource" ) func TestGenerator(t *testing.T) { diff --git a/internal/cmd/generate/commands/gensource/model.go b/internal/build/cmd/generate/commands/gensource/model.go similarity index 90% rename from internal/cmd/generate/commands/gensource/model.go rename to internal/build/cmd/generate/commands/gensource/model.go index 91b8f5a8ed..45a746fa9e 100644 --- a/internal/cmd/generate/commands/gensource/model.go +++ b/internal/build/cmd/generate/commands/gensource/model.go @@ -15,7 +15,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) var ( @@ -35,6 +35,49 @@ func NewEndpoint(f io.Reader) (*Endpoint, error) { var endpoint Endpoint var spec map[string]Endpoint + var xpackNamespaces = []string{ + "async_search", + "autoscaling", + "cat.ml_data_frame_analytics", + "cat.ml_datafeeds", + "cat.ml_jobs", + "cat.ml_trained_models", + "cat.transforms", + "ccr", + "close_point_in_time", + "data_frame_transform_deprecated", + "enrich", + "eql", + "graph", + "ilm", + "indices.create_data_stream", + "indices.data_streams_stats", + "indices.delete_data_stream", + "indices.freeze", + "indices.get_data_stream", + "indices.migrate_to_data_stream", + "indices.promote_data_stream", + "indices.reload_search_analyzers", + "indices.unfreeze", + "license", + "logstash", + "migration", + "ml", + "monitoring", + "open_point_in_time", + "rollup", + "searchable_snapshots", + "security", + "slm", + "sql", + "ssl", + "text_structure", + "transform", + "watcher", + "xpack.info", + "xpack.usage", + } + if err := json.NewDecoder(f).Decode(&spec); err != nil { return nil, err } @@ -49,6 +92,11 @@ func NewEndpoint(f io.Reader) (*Endpoint, error) { if strings.Contains(fpath.Name(), "x-pack") { endpoint.Type = "xpack" } + for _, namespace := range xpackNamespaces { + if strings.Contains(fpath.Name(), namespace) { + endpoint.Type = "xpack" + } + } } if endpoint.Type == "" { endpoint.Type = "core" diff --git a/internal/cmd/generate/commands/gensource/overrides.go b/internal/build/cmd/generate/commands/gensource/overrides.go similarity index 100% rename from internal/cmd/generate/commands/gensource/overrides.go rename to internal/build/cmd/generate/commands/gensource/overrides.go diff --git a/internal/cmd/generate/commands/gensource/testdata/info.json b/internal/build/cmd/generate/commands/gensource/testdata/info.json similarity index 100% rename from internal/cmd/generate/commands/gensource/testdata/info.json rename to internal/build/cmd/generate/commands/gensource/testdata/info.json diff --git a/internal/cmd/generate/commands/genstruct/command.go b/internal/build/cmd/generate/commands/genstruct/command.go similarity index 97% rename from internal/cmd/generate/commands/genstruct/command.go rename to internal/build/cmd/generate/commands/genstruct/command.go index e110d754bc..cdd6b6220c 100644 --- a/internal/cmd/generate/commands/genstruct/command.go +++ b/internal/build/cmd/generate/commands/genstruct/command.go @@ -7,6 +7,7 @@ package genstruct import ( "bytes" "fmt" + "github.com/elastic/go-elasticsearch/v8/internal/build/cmd" "go/types" "io" "os" @@ -18,8 +19,7 @@ import ( "github.com/spf13/cobra" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) var ( @@ -54,7 +54,7 @@ func init() { info = genapiCmd.Flags().Bool("info", false, "Print the API details to terminal") genapiCmd.Flags().SortFlags = false - commands.RegisterCmd(genapiCmd) + cmd.RegisterCmd(genapiCmd) } var genapiCmd = &cobra.Command{ diff --git a/internal/cmd/generate/commands/gentests/.gitignore b/internal/build/cmd/generate/commands/gentests/.gitignore similarity index 100% rename from internal/cmd/generate/commands/gentests/.gitignore rename to internal/build/cmd/generate/commands/gentests/.gitignore diff --git a/internal/cmd/generate/commands/gentests/command.go b/internal/build/cmd/generate/commands/gentests/command.go similarity index 97% rename from internal/cmd/generate/commands/gentests/command.go rename to internal/build/cmd/generate/commands/gentests/command.go index 4f34d854ff..83ff9d0d58 100644 --- a/internal/cmd/generate/commands/gentests/command.go +++ b/internal/build/cmd/generate/commands/gentests/command.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/cmd" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) var ( @@ -52,7 +52,7 @@ func init() { gentestsCmd.MarkFlagRequired("input") gentestsCmd.MarkFlagRequired("output") - commands.RegisterCmd(gentestsCmd) + cmd.RegisterCmd(gentestsCmd) } var gentestsCmd = &cobra.Command{ diff --git a/internal/cmd/generate/commands/gentests/debug.go b/internal/build/cmd/generate/commands/gentests/debug.go similarity index 97% rename from internal/cmd/generate/commands/gentests/debug.go rename to internal/build/cmd/generate/commands/gentests/debug.go index af3c88e116..1117d5fc34 100644 --- a/internal/cmd/generate/commands/gentests/debug.go +++ b/internal/build/cmd/generate/commands/gentests/debug.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) // DebugInfo returns information about the endpoint as a string. diff --git a/internal/cmd/generate/commands/gentests/gen_api_registry.go b/internal/build/cmd/generate/commands/gentests/gen_api_registry.go similarity index 100% rename from internal/cmd/generate/commands/gentests/gen_api_registry.go rename to internal/build/cmd/generate/commands/gentests/gen_api_registry.go diff --git a/internal/cmd/generate/commands/gentests/generator.go b/internal/build/cmd/generate/commands/gentests/generator.go similarity index 99% rename from internal/cmd/generate/commands/gentests/generator.go rename to internal/build/cmd/generate/commands/gentests/generator.go index 5920e6dcd6..c49d894c70 100644 --- a/internal/cmd/generate/commands/gentests/generator.go +++ b/internal/build/cmd/generate/commands/gentests/generator.go @@ -43,7 +43,7 @@ type Generator struct { func (g *Generator) Output() (io.Reader, error) { name := g.TestSuite.Name() if g.TestSuite.Type == "xpack" { - name = "XPack_" + name + name = "Xpack_" + name } g.genFileHeader() diff --git a/internal/cmd/generate/commands/gentests/model.go b/internal/build/cmd/generate/commands/gentests/model.go similarity index 99% rename from internal/cmd/generate/commands/gentests/model.go rename to internal/build/cmd/generate/commands/gentests/model.go index 2ed977c2d4..cc6a8059b6 100644 --- a/internal/cmd/generate/commands/gentests/model.go +++ b/internal/build/cmd/generate/commands/gentests/model.go @@ -13,11 +13,12 @@ import ( "strconv" "strings" - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/utils" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" ) var reFilename = regexp.MustCompile(`\d*_?(.+)\.ya?ml`) var reNumber = regexp.MustCompile(`^\d+$`) +var reBaseFilename = regexp.MustCompile(`rest-api-spec/test/\w+/(.*$)`) // TestPayload represents a single raw section (`---`) from the YAML file. // @@ -97,11 +98,11 @@ func NewTestSuite(fpath string, payloads []TestPayload) TestSuite { Filepath: fpath, } - if strings.Contains(fpath, "x-pack") { + if strings.Contains(fpath, "platinum") { ts.Type = "xpack" } if ts.Type == "" { - ts.Type = "core" + ts.Type = "free" } for _, payload := range payloads { @@ -299,7 +300,7 @@ func (ts TestSuite) SkipEsVersion(minmax string) bool { // BaseFilename extracts and returns the test filename in form of `foo/bar/10_qux.yml`. // func (t Test) BaseFilename() string { - parts := strings.Split(t.Filepath, "rest-api-spec/test") + parts := reBaseFilename.FindStringSubmatch(t.Filepath) if len(parts) < 1 { panic(fmt.Sprintf("Unexpected parts for path [%s]: %s", t.Filepath, parts)) } diff --git a/internal/cmd/generate/commands/gentests/patches.go b/internal/build/cmd/generate/commands/gentests/patches.go similarity index 100% rename from internal/cmd/generate/commands/gentests/patches.go rename to internal/build/cmd/generate/commands/gentests/patches.go diff --git a/internal/cmd/generate/commands/gentests/skips.go b/internal/build/cmd/generate/commands/gentests/skips.go similarity index 99% rename from internal/cmd/generate/commands/gentests/skips.go rename to internal/build/cmd/generate/commands/gentests/skips.go index 4ac72c5fec..b19d25baec 100644 --- a/internal/cmd/generate/commands/gentests/skips.go +++ b/internal/build/cmd/generate/commands/gentests/skips.go @@ -5,7 +5,7 @@ package gentests import ( - "fmt" + "fmt" "strings" "gopkg.in/yaml.v2" @@ -314,4 +314,10 @@ unsigned_long/60_collapse.yml: # Cannot compare float64 ending with .0 reliably due to inconsistent serialisation (https://github.com/golang/go/issues/26363) search/330_fetch_fields.yml: - Test nested field inside object structure + +search/350_point_in_time.yml: + - msearch + +nodes.stats/11_indices_metrics.yml: + - Metric - http ` diff --git a/internal/cmd/generate/commands/gentests/testdata/cluster.health/10_basic.yml b/internal/build/cmd/generate/commands/gentests/testdata/cluster.health/10_basic.yml similarity index 100% rename from internal/cmd/generate/commands/gentests/testdata/cluster.health/10_basic.yml rename to internal/build/cmd/generate/commands/gentests/testdata/cluster.health/10_basic.yml diff --git a/internal/cmd/generate/commands/gentests/testdata/info/10_basic.yml b/internal/build/cmd/generate/commands/gentests/testdata/info/10_basic.yml similarity index 100% rename from internal/cmd/generate/commands/gentests/testdata/info/10_basic.yml rename to internal/build/cmd/generate/commands/gentests/testdata/info/10_basic.yml diff --git a/internal/cmd/generate/commands/gentests/testdata/info/20_lucene_version.yml b/internal/build/cmd/generate/commands/gentests/testdata/info/20_lucene_version.yml similarity index 100% rename from internal/cmd/generate/commands/gentests/testdata/info/20_lucene_version.yml rename to internal/build/cmd/generate/commands/gentests/testdata/info/20_lucene_version.yml diff --git a/internal/build/cmd/tools/commands/spec/command.go b/internal/build/cmd/tools/commands/spec/command.go new file mode 100644 index 0000000000..8d0232377f --- /dev/null +++ b/internal/build/cmd/tools/commands/spec/command.go @@ -0,0 +1,288 @@ +// Licensed to Elasticsearch B.V. under one or more agreements. +// Elasticsearch B.V. licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information. + +package cmd + +import ( + "archive/zip" + "bytes" + "encoding/json" + "fmt" + "github.com/elastic/go-elasticsearch/v8/internal/build/cmd" + "github.com/elastic/go-elasticsearch/v8/internal/build/utils" + "github.com/elastic/go-elasticsearch/v8/internal/version" + "github.com/spf13/cobra" + "io/ioutil" + "log" + "net/http" + "net/url" + "os" + "path/filepath" + "strings" + "time" +) + +var ( + output *string + commitHash *string + debug *bool + info *bool +) + +func init() { + output = toolsCmd.Flags().StringP("output", "o", "", "Path to a folder for generated output") + commitHash = toolsCmd.Flags().StringP("commit_hash", "c", "", "Elasticsearch commit hash") + debug = toolsCmd.Flags().BoolP("debug", "d", false, "Print the generated source to terminal") + info = toolsCmd.Flags().Bool("info", false, "Print the API details to terminal") + + cmd.RegisterCmd(toolsCmd) +} + +var toolsCmd = &cobra.Command{ + Use: "download-spec", + Short: "Downdload specification artifact for code & tests generation", + Run: func(cmd *cobra.Command, args []string) { + command := &Command{ + Output: *output, + CommitHash: *commitHash, + Debug: *debug, + Info: *info, + } + err := command.Execute() + if err != nil { + utils.PrintErr(err) + os.Exit(1) + } + }, +} + +type Command struct { + Output string + CommitHash string + Debug bool + Info bool +} + +// download-spec runs a query to the Elastic artifact API, retrieve the list of active artifacts +// downloads, extract and write to disk the rest-resources spec alongside a json with relevant build information. +func (c Command) Execute() (err error) { + const artifactsUrl = "https://artifacts-api.elastic.co/v1/versions" + + esBuildVersion := os.Getenv("ELASTICSEARCH_BUILD_VERSION") + if esBuildVersion == "" { + esBuildVersion = version.Client + } + + versionUrl := strings.Join([]string{artifactsUrl, esBuildVersion}, "/") + + res, err := http.Get(versionUrl) + if err != nil { + log.Fatalf(err.Error()) + } + defer res.Body.Close() + + var v Versions + dec := json.NewDecoder(res.Body) + err = dec.Decode(&v) + if err != nil { + log.Fatalf(err.Error()) + } + + if c.Debug { + log.Printf("%d builds found", len(v.Version.Builds)) + } + + var build Build + if build, err = findBuildByCommitHash(c.CommitHash, v.Version.Builds); err != nil { + build = findMostRecentBuild(v.Version.Builds) + } + if c.Debug { + log.Printf("Build found : %s", build.Projects.Elasticsearch.CommitHash) + } + + data, err := c.downloadZip(build) + if err != nil { + log.Fatalf("Cannot download zip from %s, reason : %s", build.zipfileUrl(), err) + } + + if err := c.extractZipToDest(data); err != nil { + log.Fatalf(err.Error()) + } + + d, _ := json.Marshal(build) + + err = c.writeFileToDest("elasticsearch.json", d) + if err != nil { + log.Fatalf(err.Error()) + } + + return nil +} + +func (c Command) writeFileToDest(filename string, data []byte) error { + path := filepath.Join(c.Output, filename) + if err := ioutil.WriteFile(path, data, 0644); err != nil { + return fmt.Errorf("cannot write file: %s", err) + } + if c.Debug { + log.Printf("Successfuly written file to : %s", path) + } + return nil +} + +type Versions struct { + Version struct { + Builds []Build `json:"builds"` + } `json:"version"` +} + +type PackageUrl struct { + *url.URL +} + +func (p *PackageUrl) UnmarshalJSON(data []byte) error { + if string(data) == "null" { + return nil + } + url, err := url.Parse(string(data[1 : len(data)-1])) + if err == nil { + p.URL = url + } + return err +} + +type BuildStartTime struct { + *time.Time +} + +func (t *BuildStartTime) UnmarshalJSON(data []byte) error { + if string(data) == "null" { + return nil + } + var err error + parsedTime, err := time.Parse(`"`+"Mon, 2 Jan 2006 15:04:05 MST"+`"`, string(data)) + t.Time = &parsedTime + return err +} + +type Build struct { + StartTime BuildStartTime `json:"start_time"` + Version string `json:"version"` + BuildId string `json:"build_id"` + Projects struct { + Elasticsearch struct { + Branch string `json:"branch"` + CommitHash string `json:"commit_hash"` + Packages map[string]struct { + Url PackageUrl `json:"url"` + Type string `json:"type"` + } + } `json:"elasticsearch"` + } `json:"projects"` +} + +func NewBuild() Build { + t := time.Date(1970, 0,0,0,0,0,0, time.UTC) + startTime := BuildStartTime{Time: &t} + return Build{StartTime: startTime} +} + +// zipfileUrl return the file URL for the rest-resources artifact from Build +// There should be only one artifact matching the requirements par Build. +func (b Build) zipfileUrl() string { + for _, pack := range b.Projects.Elasticsearch.Packages { + if pack.Type == "zip" && strings.Contains(pack.Url.String(), "rest-resources") { + return pack.Url.String() + } + } + return "" +} + +// extractZipToDest extract the data from a previously downloaded file loaded in memory to Output target. +func (c Command) extractZipToDest(data []byte) error { + zipReader, err := zip.NewReader(bytes.NewReader(data), int64(len(data))) + if err != nil { + return err + } + + if err = os.MkdirAll(c.Output, 0744); err != nil { + return fmt.Errorf("cannot created destination directory: %s", err) + } + + for _, file := range zipReader.File { + f, err := file.Open() + if err != nil { + return fmt.Errorf("cannot read file in zipfile: %s", err) + } + + if file.FileInfo().IsDir() { + path := filepath.Join(c.Output, file.Name) + _ = os.MkdirAll(path, 0744) + } else { + data, err := ioutil.ReadAll(f) + if err != nil { + return err + } + + if err := c.writeFileToDest(file.Name, data); err != nil { + return err + } + } + } + + if c.Debug { + log.Printf("Zipfile successfully extracted to %s", c.Output) + } + + return nil +} + +// downloadZip fetches the rest-resources artifact from a Build and return its content as []byte. +func (c Command) downloadZip(b Build) ([]byte, error) { + url := b.zipfileUrl() + if c.Debug { + log.Printf("Zipfile url : %s", b.zipfileUrl()) + } + + client := &http.Client{} + + req, err := http.NewRequest(http.MethodGet, url, nil) + if err != nil { + return nil, err + } + + req.Header.Add("Accept-Content", "gzip") + res, err := client.Do(req) + if err != nil { + return nil, err + } + defer res.Body.Close() + + data, _ := ioutil.ReadAll(res.Body) + return data, err +} + +// findMostRecentBuild iterates through the builds retrieved from the api +// and return the latest one based on the StartTime of each Build. +func findMostRecentBuild(builds []Build) Build { + var latestBuild Build + latestBuild = NewBuild() + for _, build := range builds { + if build.StartTime.After(*latestBuild.StartTime.Time) { + latestBuild = build + } + } + return latestBuild +} + +// findBuildByCommitHash iterates through the builds and returns the first occurrence of Build +// that matches the provided commitHash. +func findBuildByCommitHash(commitHash string, builds []Build) (Build, error) { + for _, build := range builds { + if build.Projects.Elasticsearch.CommitHash == commitHash { + return build, nil + } + } + return Build{}, fmt.Errorf("Build with commit hash %s not found", commitHash) +} diff --git a/internal/build/cmd/tools/commands/spec/command_test.go b/internal/build/cmd/tools/commands/spec/command_test.go new file mode 100644 index 0000000000..e394a1237a --- /dev/null +++ b/internal/build/cmd/tools/commands/spec/command_test.go @@ -0,0 +1,53 @@ +// Licensed to Elasticsearch B.V. under one or more agreements. +// Elasticsearch B.V. licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information. + +package cmd + +import ( + "encoding/json" + "testing" +) + +func TestBuild_zipfileUrl(t *testing.T) { + tests := []struct { + name string + json string + want string + }{ + { + name: "Simple test with valid url", + json: ` + { + "start_time": "Mon, 19 Apr 2021 12:15:47 GMT", + "version": "8.0.0-SNAPSHOT", + "build_id": "8.0.0-ab7cd914", + "projects": { + "elasticsearch": { + "branch": "master", + "commit_hash": "d3be79018b5b70a118ea5a897a539428b728df5a", + "Packages": { + "rest-resources-zip-8.0.0-SNAPSHOT.zip": { + "url": "https://snapshots.elastic.co/8.0.0-ab7cd914/downloads/elasticsearch/rest-resources-zip-8.0.0-SNAPSHOT.zip", + "type": "zip" + } + } + } + } + } + `, + want: "https://snapshots.elastic.co/8.0.0-ab7cd914/downloads/elasticsearch/rest-resources-zip-8.0.0-SNAPSHOT.zip", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + b := Build{} + if err := json.Unmarshal([]byte(tt.json), &b); err != nil { + t.Fatalf(err.Error()) + } + if got := b.zipfileUrl(); got != tt.want { + t.Errorf("zipfileUrl() = %v, want %v", got, tt.want) + } + }) + } +} \ No newline at end of file diff --git a/internal/build/go.mod b/internal/build/go.mod new file mode 100644 index 0000000000..ded9297327 --- /dev/null +++ b/internal/build/go.mod @@ -0,0 +1,16 @@ +module github.com/elastic/go-elasticsearch/v8/internal/build + +go 1.15 + +replace github.com/elastic/go-elasticsearch/v8 => ../../ + +require ( + github.com/alecthomas/chroma v0.8.2 + github.com/elastic/go-elasticsearch/v8 master + github.com/spf13/cobra v1.1.3 + github.com/stretchr/testify v1.4.0 // indirect + golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 + golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect + golang.org/x/tools v0.1.0 + gopkg.in/yaml.v2 v2.4.0 +) diff --git a/internal/build/go.sum b/internal/build/go.sum new file mode 100644 index 0000000000..745fec8248 --- /dev/null +++ b/internal/build/go.sum @@ -0,0 +1,341 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U= +github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= +github.com/alecthomas/chroma v0.8.2 h1:x3zkuE2lUk/RIekyAJ3XRqSCP4zwWDfcw/YJCuCAACg= +github.com/alecthomas/chroma v0.8.2/go.mod h1:sko8vR34/90zvl5QdcUdvzL3J8NKjAUx9va9jPuFNoM= +github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo= +github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0= +github.com/alecthomas/kong v0.2.4/go.mod h1:kQOmtJgV+Lb4aj+I2LEn40cbtawdWJ9Y8QLq+lElKxE= +github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 h1:p9Sln00KOTlrYkxI1zYWl1QLnEqAqEARBEYa8FQnQcY= +github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ= +github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk= +github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 h1:F5Gozwx4I1xtr/sr/8CFbb57iKi3297KFs0QDbGN60A= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/internal/build/main.go b/internal/build/main.go new file mode 100644 index 0000000000..e4338b3d9b --- /dev/null +++ b/internal/build/main.go @@ -0,0 +1,19 @@ +// Licensed to Elasticsearch B.V. under one or more agreements. +// Elasticsearch B.V. licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information. + +package main + +import ( + "github.com/elastic/go-elasticsearch/v8/internal/build/cmd" + + _ "github.com/elastic/go-elasticsearch/v8/internal/build/cmd/generate/commands/genexamples" + _ "github.com/elastic/go-elasticsearch/v8/internal/build/cmd/generate/commands/gensource" + _ "github.com/elastic/go-elasticsearch/v8/internal/build/cmd/generate/commands/genstruct" + _ "github.com/elastic/go-elasticsearch/v8/internal/build/cmd/generate/commands/gentests" + _ "github.com/elastic/go-elasticsearch/v8/internal/build/cmd/tools/commands/spec" +) + +func main() { + cmd.Execute() +} diff --git a/internal/cmd/generate/utils/chromatize.go b/internal/build/utils/chromatize.go similarity index 100% rename from internal/cmd/generate/utils/chromatize.go rename to internal/build/utils/chromatize.go diff --git a/internal/cmd/generate/utils/debug.go b/internal/build/utils/debug.go similarity index 100% rename from internal/cmd/generate/utils/debug.go rename to internal/build/utils/debug.go diff --git a/internal/cmd/generate/utils/map.go b/internal/build/utils/map.go similarity index 100% rename from internal/cmd/generate/utils/map.go rename to internal/build/utils/map.go diff --git a/internal/cmd/generate/utils/metadata.go b/internal/build/utils/metadata.go similarity index 62% rename from internal/cmd/generate/utils/metadata.go rename to internal/build/utils/metadata.go index eef36f1256..a3eb257143 100644 --- a/internal/cmd/generate/utils/metadata.go +++ b/internal/build/utils/metadata.go @@ -6,7 +6,6 @@ package utils import ( "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -14,55 +13,26 @@ import ( "strings" ) -var ( - reEsVersion = regexp.MustCompile(`elasticsearch\s+=\s+(\d+\.\d+\.\d+)`) -) +var resVersion = regexp.MustCompile(`(\d+.\d+.\d+).*`) // EsVersion returns the Elasticsearch from environment variable, Java property file, or an error. // func EsVersion(fpath string) (string, error) { if envEsVersion := os.Getenv("ELASTICSEARCH_BUILD_VERSION"); envEsVersion != "" { - return envEsVersion, nil + splitVersion := resVersion.FindStringSubmatch(envEsVersion) + return splitVersion[1], nil + } else { + return "", fmt.Errorf("ELASTICSEARCH_BUILD_VERSION is empty") } - - basePath, err := basePathFromFilepath(fpath) - if err != nil { - return "", fmt.Errorf("EsVersion: %s", err) - } - - c, err := ioutil.ReadFile(filepath.Join(basePath, "buildSrc", "version.properties")) - if err != nil { - return "", fmt.Errorf("EsVersion: %s", err) - } - - m := reEsVersion.FindSubmatch(c) - if len(m) < 2 { - return "", nil - } - return string(m[1]), nil } // GitCommit returns the Git commit from environment variable or parsing information from fpath, or an error. // func GitCommit(fpath string) (string, error) { - if gitCommitEnv := os.Getenv("ELASTICSEARCH_BUILD_HASH"); gitCommitEnv != "" { - return gitCommitEnv, nil + if esBuildHash := os.Getenv("ELASTICSEARCH_BUILD_HASH"); esBuildHash != "" { + return esBuildHash[:7], nil } - - basePath, err := basePathFromFilepath(fpath) - if err != nil { - return "", fmt.Errorf("GitCommit: %s", err) - } - - args := strings.Split("git --git-dir="+basePath+".git rev-parse --short HEAD", " ") - cmd := exec.Command(args[0:1][0], args[1:]...) - // fmt.Printf("> %s\n", strings.Join(cmd.Args, " ")) - - out, err := cmd.Output() - if err != nil { - return "", fmt.Errorf("GitCommit: %s", err) - } - return strings.TrimSpace(string(out)), nil + return "", fmt.Errorf("ELASTICSEARCH_BUILD_HASH is empty") } // GitTag returns the Git tag for fpath if available, or an error. diff --git a/internal/cmd/generate/utils/naming.go b/internal/build/utils/naming.go similarity index 100% rename from internal/cmd/generate/utils/naming.go rename to internal/build/utils/naming.go diff --git a/internal/cmd/generate/utils/strings.go b/internal/build/utils/strings.go similarity index 100% rename from internal/cmd/generate/utils/strings.go rename to internal/build/utils/strings.go diff --git a/internal/cmd/generate/utils/terminal.go b/internal/build/utils/terminal.go similarity index 100% rename from internal/cmd/generate/utils/terminal.go rename to internal/build/utils/terminal.go diff --git a/internal/cmd/generate/go.mod b/internal/cmd/generate/go.mod deleted file mode 100644 index 8616669e4f..0000000000 --- a/internal/cmd/generate/go.mod +++ /dev/null @@ -1,17 +0,0 @@ -module github.com/elastic/go-elasticsearch/v8/internal/cmd/generate - -go 1.11 - -replace github.com/elastic/go-elasticsearch/v8 => ../../../ - -require ( - github.com/alecthomas/chroma v0.6.3 - github.com/elastic/go-elasticsearch/v8 master - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/spf13/cobra v0.0.3 - github.com/spf13/pflag v1.0.3 // indirect - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 - golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect - golang.org/x/tools v0.1.0 - gopkg.in/yaml.v2 v2.2.2 -) diff --git a/internal/cmd/generate/go.sum b/internal/cmd/generate/go.sum deleted file mode 100644 index 3b8a8abaf7..0000000000 --- a/internal/cmd/generate/go.sum +++ /dev/null @@ -1,77 +0,0 @@ -github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38 h1:smF2tmSOzy2Mm+0dGI2AIUHY+w0BUc+4tn40djz7+6U= -github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod h1:r7bzyVFMNntcxPZXK3/+KdruV1H5KSlyVY0gc+NgInI= -github.com/alecthomas/chroma v0.6.3 h1:8H1D0yddf0mvgvO4JDBKnzLd9ERmzzAijBxnZXGV/FA= -github.com/alecthomas/chroma v0.6.3/go.mod h1:quT2EpvJNqkuPi6DmBHB+E33FXBgBBPzyH5++Dn1LPc= -github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VENNfmXvHbgYlbUOvpzYzvy2aZU5gXVeo= -github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0= -github.com/alecthomas/kong v0.1.15/go.mod h1:0m2VYms8rH0qbCqVB2gvGHk74bqLIq0HXjCs5bNbNQU= -github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897 h1:p9Sln00KOTlrYkxI1zYWl1QLnEqAqEARBEYa8FQnQcY= -github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ= -github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ= -github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dlclark/regexp2 v1.1.6 h1:CqB4MjHw0MFCDj+PHHjiESmHX+N7t0tJzKvC6M97BRg= -github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c h1:9WR4YuzLDuQMqEmLQrG0DiMmE2/HvX1dlrujzjmNVFg= -golang.org/x/tools v0.0.0-20200311090712-aafaee8bce8c/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/internal/cmd/generate/main.go b/internal/cmd/generate/main.go deleted file mode 100644 index 6b4844b9f0..0000000000 --- a/internal/cmd/generate/main.go +++ /dev/null @@ -1,18 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more agreements. -// Elasticsearch B.V. licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information. - -package main - -import ( - "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands" - - _ "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands/genexamples" - _ "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands/gensource" - _ "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands/genstruct" - _ "github.com/elastic/go-elasticsearch/v8/internal/cmd/generate/commands/gentests" -) - -func main() { - commands.Execute() -}